2933 Commits

Author SHA1 Message Date
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
xiekaidong
b4f2b23cb2 符文副本 2023-09-12 10:06:47 +08:00
xiekaidong
29ffd0dc36 更新资源 2023-09-12 09:35:19 +08:00
xiekaidong
5b27f2c252 更新资源 2023-09-11 20:04:28 +08:00
xiekaidong
1d12b1c1e8 符文副本 2023-09-11 20:02:19 +08:00
xiekaidong
0c3788b90d 更新协议 2023-09-11 17:32:31 +08:00
xiekaidong
026350ff6a 更新资源 2023-09-11 14:02:28 +08:00
xiekaidong
6bd690e738 更新协议 2023-09-11 12:00:21 +08:00
xiekaidong
81d593d09a buff修改 2023-09-11 10:49:35 +08:00
xiekaidong
91c0c3b104 显示问题优化 2023-09-11 10:18:31 +08:00
xiekaidong
4da792de57 更新资源 2023-09-09 16:13:44 +08:00
xiekaidong
c36cb3f9e5 资源替换 2023-09-09 15:09:31 +08:00
xiekaidong
57b1dded5f 资源替换 2023-09-09 14:06:54 +08:00
xiekaidong
ebbd97f8af 更新资源 2023-09-09 13:43:51 +08:00
xiekaidong
059c6ca56b 符文副本 2023-09-08 18:54:00 +08:00
xiekaidong
11283750f3 更新协议 2023-09-08 10:56:18 +08:00
xiekaidong
2c07878a4d 判定修复 2023-09-08 10:37:37 +08:00
xiekaidong
65bbbaa0cc 界面调整 2023-09-08 10:24:39 +08:00
Fang
a586912584 添加容错 2023-09-08 10:02:17 +08:00
xiekaidong
5fe814b753 合并符文怪物表 2023-09-08 09:38:10 +08:00
xiekaidong
dbb30676a2 符文副本主界面 2023-09-07 19:15:01 +08:00
xiekaidong
2dd0c48961 界面和资源 2023-09-07 15:21:53 +08:00
xiekaidong
d83509fc3f 资源处理 2023-09-06 18:47:40 +08:00
xiekaidong
d19f63d08a 提升版本号 v.1.2.8_android v.1.3.8_ios 2023-09-06 16:59:26 +08:00
xiekaidong
c028971870 符文副本 2023-09-06 16:57:13 +08:00