542 Commits

Author SHA1 Message Date
xiekaidong
60cb67ca4d bug修复 2023-09-19 18:13:11 +08:00
xiekaidong
1d74ee3b77 bug修复 2023-09-19 17:17:18 +08:00
Fang
0b59c2d77d 符文动画、属性fix 2023-09-19 15:03:02 +08:00
xiekaidong
9ca3f79c89 bug修复 2023-09-19 14:30:19 +08:00
Fang
505a7cb8fb fix 2023-09-19 11:22:05 +08:00
Fang
6f5f4d94e9 自动淬炼加同步 2023-09-19 10:51:20 +08:00
xiekaidong
8b235c7e3a 优化 2023-09-19 09:27:16 +08:00
xiekaidong
f4a61a5cbd bug修复 2023-09-18 21:35:23 +08:00
xiekaidong
c58757a314 优化 2023-09-18 21:29:17 +08:00
xiekaidong
41434625e2 bug修复 2023-09-18 20:52:32 +08:00
xiekaidong
c30e9d729c 优化和容错 2023-09-18 20:07:37 +08:00
Fang
b92f858295 界面优化 2023-09-18 16:38:04 +08:00
xiekaidong
188a85d723 Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-unity into dev_20230919 2023-09-18 16:04:06 +08:00
xiekaidong
9b95508c42 优化 2023-09-18 16:04:03 +08:00
Fang
448aa0659e 符文自动淬炼修改、特效完善 2023-09-18 14:57:00 +08:00
xiekaidong
c54a6c48b9 更新图集,编译lua 2023-09-18 14:53:41 +08:00
xiekaidong
b6345dce5a Merge branch 'master' into dev_20230919
# Conflicts:
#	Assets/arts/atlas/ui/common.asset
#	Assets/arts/textures/ui/common/common_lock_1.png
#	Assets/arts/textures/ui/common/common_lock_1.png.meta
#	Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
#	Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes
#	Assets/lua/app/userdata/battle/battle_base_data.lua.bytes
2023-09-18 14:51:32 +08:00
xiekaidong
b0ca1e6132 循环活动的一些处理 2023-09-18 14:43:39 +08:00
xiekaidong
b044273afc bug修复 2023-09-18 12:00:41 +08:00
xiekaidong
79c4fd7907 优化显示 2023-09-18 11:40:53 +08:00
xiekaidong
33e84e5cc1 优化显示 2023-09-18 11:21:37 +08:00
xiekaidong
c0aeccf71a 显示优化 2023-09-18 10:52:38 +08:00
xiekaidong
b3f490c9ac bug修复 2023-09-18 10:38:18 +08:00
xiekaidong
1cf27e1a54 编译lua 2023-09-16 20:26:20 +08:00
Fang
0d50692a4f 请求优化 2023-09-15 20:54:35 +08:00
Fang
769cfbe34d 圆月活动 2023-09-15 19:23:25 +08:00
xiekaidong
cccce0625e pvp战斗取消元素随机加权 2023-09-15 17:41:37 +08:00
Fang
a86dbc2116 新用户报错fix 2023-09-14 12:05:04 +08:00
Fang
575a7a90f7 编译 2023-09-14 11:08:40 +08:00
Fang
2b78eb4cc0 显示fix 2023-09-14 11:08:09 +08:00
Fang
0679e04395 属性fix 2023-09-13 18:24:56 +08:00
Fang
9345d10d6c 符文属性加成修改 2023-09-13 17:59:30 +08:00
xiekaidong
96f2d2fae8 bug修复 2023-09-13 16:28:01 +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
75abb7d2bb 一些优化和审核模式处理 2023-09-13 14:56:25 +08:00
Fang
0a231c3f94 自动铸造开启等级 2023-09-13 11:03:18 +08:00
Fang
a6d3bb1803 bug fix 2023-09-12 18:44:00 +08:00
Fang
862e9200e7 容错 2023-09-12 17:59:54 +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
9ff6dbeee0 战斗优化调整 2023-09-12 12:23:40 +08:00
xiekaidong
57131fb59b 调整 2023-09-12 11:40:45 +08:00
Fang
6eeff31530 符文功能 2023-09-12 10:41:44 +08:00
xiekaidong
35193331ef 符文副本 2023-09-12 10:09:29 +08:00
xiekaidong
81d593d09a buff修改 2023-09-11 10:49:35 +08:00
Fang
a586912584 添加容错 2023-09-08 10:02:17 +08:00