1377 Commits

Author SHA1 Message Date
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
e0e91933e8 编译lua 2023-09-12 16:04:33 +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
34953bab97 回合数提示 2023-09-12 14:32:16 +08:00
xiekaidong
9ff6dbeee0 战斗优化调整 2023-09-12 12:23:40 +08:00
xiekaidong
57131fb59b 调整 2023-09-12 11:40:45 +08:00
xiekaidong
1e1e4835d3 更新配置 2023-09-12 11:23:24 +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
81d593d09a buff修改 2023-09-11 10:49:35 +08:00
xiekaidong
91c0c3b104 显示问题优化 2023-09-11 10:18:31 +08:00
xiekaidong
2c07878a4d 判定修复 2023-09-08 10:37:37 +08:00
Fang
a586912584 添加容错 2023-09-08 10:02:17 +08:00
xiekaidong
5fe814b753 合并符文怪物表 2023-09-08 09:38:10 +08:00
Fang
de30482954 礼包红点刷新fix 2023-09-06 16:54:20 +08:00
xiekaidong
581c9a8f6e 更新配置 2023-09-06 16:49:56 +08:00
xiekaidong
980d92839d 魅惑、免疫buff,被控状态下,技能cd不递减 2023-09-06 16:28:01 +08:00
Fang
fd2c59552e 兑换红点修改 2023-09-06 10:16:30 +08:00
xiekaidong
5587b000e9 显示修复 2023-09-05 23:44:20 +08:00
chenxi
82dbf388e5 编译 2023-09-05 22:29:20 +08:00
xiekaidong
e936d45746 设置abname 2023-09-05 20:55:51 +08:00
xiekaidong
eead0cc118 更新配置 2023-09-05 20:53:27 +08:00
xiekaidong
58c151899f 更新配置 2023-09-05 20:24:42 +08:00
xiekaidong
e8b7ee6f1e 更新配置 2023-09-05 20:23:01 +08:00
xiekaidong
32fd1db301 bug修复 2023-09-05 20:19:56 +08:00
xiekaidong
81d9203fed 皮肤问题修复 2023-09-05 19:59:02 +08:00
xiekaidong
3d439234a4 更新配置 2023-09-05 18:00:45 +08:00
xiekaidong
ac9253f074 编译lua 2023-09-05 17:36:54 +08:00
xiekaidong
27be90073a buff数值上线 2023-09-05 17:15:27 +08:00
xiekaidong
4bc0e14cdf 等级修改 2023-09-05 15:32:34 +08:00
xiekaidong
ea75430a03 bug修复 2023-09-05 15:28:33 +08:00
xiekaidong
4dc5debc7c 优化 2023-09-05 12:02:00 +08:00
xiekaidong
0e962c43ff bug修复 2023-09-05 11:54:38 +08:00
xiekaidong
6f0a9720b2 bug修复和优化 2023-09-05 11:47:58 +08:00
xiekaidong
0d901aff71 bug修复 2023-09-05 10:48:55 +08:00
xiekaidong
68614b6ba8 bug修复 2023-09-05 10:06:59 +08:00
xiekaidong
cbf95861d6 bug修复 2023-09-05 10:00:11 +08:00
xiekaidong
d1d8b37743 字段名修复 2023-09-05 09:25:20 +08:00
xiekaidong
1cd3210514 bug修复 2023-09-04 20:21:33 +08:00
xiekaidong
df9fb7cabb bug修复 2023-09-04 20:06:58 +08:00
xiekaidong
284fbe9bc3 bug修复 2023-09-04 19:27:03 +08:00
xiekaidong
5666c71d2b 修复一些bug 2023-09-04 18:21:26 +08:00
xiekaidong
29f0e84ee0 14天丢图问题 2023-09-04 17:50:47 +08:00
xiekaidong
8089bc6e16 倒计时优化 2023-09-04 17:25:39 +08:00