3061 Commits

Author SHA1 Message Date
xiekaidong
22b2cadb96 资源资源 2023-09-13 15:59:47 +08:00
xiekaidong
7f05bf4024 兼容处理 2023-09-13 15:53:14 +08:00
Fang
f409368faa bug fix 2023-09-13 15:45:27 +08:00
xiekaidong
760e3878f4 bug修复 2023-09-13 15:34:58 +08:00
xiekaidong
178c761583 提升版本号 2023-09-13 14:59:27 +08:00
xiekaidong
d84ffd490d 资源检查更新图集 2023-09-13 14:58:54 +08:00
xiekaidong
75abb7d2bb 一些优化和审核模式处理 2023-09-13 14:56:25 +08:00
xiekaidong
ad6e8b1402 Merge branch 'master' into master_ios_assets_update 2023-09-13 14:23:35 +08:00
Fang
0a231c3f94 自动铸造开启等级 2023-09-13 11:03:18 +08:00
xiekaidong
00c9bd3bfe 还原资源 2023-09-13 10:46:12 +08:00
xiekaidong
47d4ccd4a6 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-13 09:43:43 +08:00
xiekaidong
96a0a976e6 优化 2023-09-13 09:43:41 +08:00
zhangpengfei
771b713f6d 新角色上传 2023-09-13 09:28:52 +08:00
xiekaidong
4ef44130e9 优化和上传特效 2023-09-13 09:19:18 +08:00
xiekaidong
00e06273ad 优化 2023-09-12 20:34:37 +08:00
xiekaidong
bcf3982203 显示bug修复 2023-09-12 20:27:00 +08:00
xiekaidong
eaed3e859e 资源调整 2023-09-12 20:13:37 +08:00
xiekaidong
17a349c66d 优化点击 2023-09-12 20:12:12 +08:00
xiekaidong
2a8cfe31e9 点击优化 2023-09-12 20:10:19 +08:00
xiekaidong
ce6127b71d 显示优化 2023-09-12 20:08:08 +08:00
xiekaidong
9f0fd56ab4 修复bug 2023-09-12 19:46:47 +08:00
xiekaidong
da10987311 更新资源 2023-09-12 19:20:54 +08:00
Fang
a6d3bb1803 bug fix 2023-09-12 18:44:00 +08:00
Fang
97ce41a1e3 更新配置 2023-09-12 18:11:58 +08:00
Fang
862e9200e7 容错 2023-09-12 17:59:54 +08:00
63c531b066 5英雄 2023-09-12 17:49:00 +08:00
xiekaidong
6bfab0547f bug修复 2023-09-12 16:32:07 +08:00
xiekaidong
f49e729db2 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-12 16:22:29 +08:00
xiekaidong
27308ff7fd bug修复 2023-09-12 16:22:26 +08:00
Fang
1e970493b3 优化 2023-09-12 16:17:22 +08:00
xiekaidong
6ea9e710b0 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-12 16:05:55 +08:00
xiekaidong
e0e91933e8 编译lua 2023-09-12 16:04:33 +08:00
Fang
f0e3749794 显示fix 2023-09-12 16:03:48 +08:00
Fang
dc1b6c9838 显示fix 2023-09-12 15:27:50 +08:00
Fang
37bd501110 容错处理 2023-09-12 15:05:52 +08:00
陈希
4094f79f7b Merge branch 'fang/runes' into 'dev_20230919'
符文功能

See merge request b6-client/b6-unity!17
2023-09-12 06:50:32 +00:00
xiekaidong
06f81a091a Merge branch 'master' into dev_20230919
# Conflicts:
#	Assets/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua.bytes
2023-09-12 14:41:48 +08:00
xiekaidong
bd58628e2d 更新资源 2023-09-12 14:41:23 +08:00
xiekaidong
34953bab97 回合数提示 2023-09-12 14:32:16 +08:00
xiekaidong
9ff6dbeee0 战斗优化调整 2023-09-12 12:23:40 +08:00
xiekaidong
8638d3f2e2 提升版本号 v.1.2.9_android v.1.3.9_ios 2023-09-12 11:59:13 +08:00
xiekaidong
0dcdf0fe9d Merge branch 'dev_20230912_hotupdate' of http://git.juzugame.com/b6-client/b6-unity into dev_20230912_hotupdate 2023-09-12 11:40:48 +08:00
xiekaidong
57131fb59b 调整 2023-09-12 11:40:45 +08:00
Fang
8dadc9e37d 添加容错 2023-09-12 11:26:29 +08:00
xiekaidong
1e1e4835d3 更新配置 2023-09-12 11:23:24 +08:00
xiekaidong
b5f498ad7c 优化 2023-09-12 11:17:46 +08:00
Fang
6eeff31530 符文功能 2023-09-12 10:41:44 +08:00
xiekaidong
c715f838f8 bug修复 2023-09-12 10:24:46 +08:00
xiekaidong
35193331ef 符文副本 2023-09-12 10:09:29 +08:00
xiekaidong
b8d0930d6c Merge branch 'dungeon_rune' into dev_20230919
# Conflicts:
#	Assets/proto/protocol.bytes
2023-09-12 10:08:56 +08:00