216 Commits

Author SHA1 Message Date
xiekaidong
ccab76a58b buff回合数等于1时也显示 2023-06-19 12:03:13 +08:00
Fang
29e2e33888 结算界面相同奖励合并 2023-06-19 10:25:40 +08:00
chenxi
bd6aa57fa1 界面调整 2023-06-16 17:15:58 +08:00
xiekaidong
7dae3a6ab5 火蛇海蛇效果 2023-06-16 15:13:38 +08:00
xiekaidong
2f3bf147d1 修改显示 2023-06-16 11:33:20 +08:00
xiekaidong
f2047f1833 战斗内相应安卓返回键 2023-06-16 10:14:20 +08:00
xiekaidong
e8b6534d3b 副本开启引导触发 2023-06-15 15:32:27 +08:00
xiekaidong
f215a8124a bug修复 2023-06-15 14:07:10 +08:00
xiekaidong
2807860d92 容错 2023-06-14 19:09:26 +08:00
Fang
98206fea34 Merge branch 'dev' into fang/dungeon
# Conflicts:
#	lua/app/config/avatar.lua.meta
#	lua/app/config/avatar_frame.lua.meta
#	lua/app/config/skill.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/avatar.lua.meta
#	lua/app/config/strings/cn/avatar_frame.lua.meta
#	lua/app/config/strings/cn/hero.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/avatar.lua.meta
#	lua/app/config/strings/de/avatar_frame.lua.meta
#	lua/app/config/strings/en/avatar.lua.meta
#	lua/app/config/strings/en/avatar_frame.lua.meta
#	lua/app/config/strings/fr/avatar.lua.meta
#	lua/app/config/strings/fr/avatar_frame.lua.meta
#	lua/app/config/strings/id/avatar.lua.meta
#	lua/app/config/strings/id/avatar_frame.lua.meta
#	lua/app/config/strings/ja/avatar.lua.meta
#	lua/app/config/strings/ja/avatar_frame.lua.meta
#	lua/app/config/strings/ko/avatar.lua.meta
#	lua/app/config/strings/ko/avatar_frame.lua.meta
#	lua/app/config/strings/pt/avatar.lua.meta
#	lua/app/config/strings/pt/avatar_frame.lua.meta
#	lua/app/config/strings/ru/avatar.lua.meta
#	lua/app/config/strings/ru/avatar_frame.lua.meta
#	lua/app/config/strings/th/avatar.lua.meta
#	lua/app/config/strings/th/avatar_frame.lua.meta
#	lua/app/config/strings/vi/avatar.lua.meta
#	lua/app/config/strings/vi/avatar_frame.lua.meta
#	lua/app/config/strings/zh/avatar.lua.meta
#	lua/app/config/strings/zh/avatar_frame.lua.meta
2023-06-14 11:41:12 +08:00
xiekaidong
e010700340 技能音效 2023-06-13 17:43:55 +08:00
xiekaidong
ee6a38b813 修改每日挑战战斗界面的任务入口 2023-06-13 15:24:48 +08:00
xiekaidong
4846a97b75 grideffect=6的处理 2023-06-13 15:08:02 +08:00
xiekaidong
90bd77a4b7 显示调整 2023-06-13 10:36:44 +08:00
xiekaidong
43826faab8 界面处理 2023-06-13 10:16:58 +08:00
xiekaidong
225fa8ad1f 每日挑战不显示每日buff信息 2023-06-12 09:46:51 +08:00
xiekaidong
1c89ec147b 显示bug修复 2023-06-06 20:37:32 +08:00
xiekaidong
0867e84815 切换波次时自动关闭buff弹窗 2023-06-06 14:12:50 +08:00
xiekaidong
6a821f718a 调快速度 2023-06-06 11:55:59 +08:00
Fang
0ba73d34ed 健壮性 2023-06-06 10:47:51 +08:00
xiekaidong
61b9ef3ae0 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev 2023-06-06 10:38:46 +08:00
xiekaidong
2dbf06a3b0 boss预警音效 2023-06-06 10:38:43 +08:00
Fang
2df5f6a66c 结算界面、功能解锁界面dotween代码优化 2023-06-06 10:14:00 +08:00
xiekaidong
cc77a77193 消除显示优化 2023-06-05 20:51:50 +08:00
xiekaidong
0c420e840b 特效 2023-06-05 20:06:51 +08:00
Fang
9bead326d2 结算界面动画替换 2023-06-05 19:07:07 +08:00
Fang
404fa2ca30 结算界面金猪动画 2023-06-05 18:29:22 +08:00
Fang
d41a0f7744 战斗结算界面动画 2023-06-05 17:15:51 +08:00
chenxi
447456612e 金猪bug 2023-06-05 12:03:37 +08:00
xiekaidong
eb2872b7ee 修改bug,优化战斗流程逻辑 2023-06-03 19:11:19 +08:00
xiekaidong
44ff406135 boss机制棋盘效果处理 2023-06-02 22:28:22 +08:00
xiekaidong
14f51d2900 水泡动画 2023-06-02 19:01:33 +08:00
xiekaidong
5a9558184b 火箭动画 2023-06-02 17:58:18 +08:00
xiekaidong
eb1354f807 先更新一下格子 2023-06-02 16:54:16 +08:00
chenxi
b609f796ba 只有主线关卡战斗结算显示金猪 2023-06-02 12:11:29 +08:00
xiekaidong
3b36d944c9 去掉boss停帧 2023-06-02 09:37:09 +08:00
xiekaidong
09e4b06ccd 显示优化 2023-06-01 22:10:01 +08:00
xiekaidong
9429f79a1e bug修复 2023-06-01 16:35:23 +08:00
xiekaidong
2bc46d2d30 优化战斗中的table 2023-06-01 16:29:01 +08:00
xiekaidong
f76520f9e5 显示问题修复 2023-06-01 10:05:58 +08:00
xiekaidong
3259281fe8 修复bug 2023-05-31 20:18:22 +08:00
xiekaidong
694ef22777 格子支持一下spine 2023-05-31 20:11:00 +08:00
xiekaidong
4c4ae980dc bug修复 2023-05-31 18:06:16 +08:00
xiekaidong
85688b535c 调整表现 2023-05-31 16:30:40 +08:00
xiekaidong
fabf2372d4 显示问题 2023-05-31 14:30:17 +08:00
xiekaidong
c3c2e63ed6 层级调整 2023-05-30 22:04:32 +08:00
chenxi
3121b7b59a 功能开启 2023-05-30 19:01:04 +08:00
xiekaidong
063df7972b 显示优化 2023-05-30 18:40:48 +08:00
xiekaidong
5213236c5c boss出场动画 2023-05-30 18:32:46 +08:00
xiekaidong
676ea6bfe8 显示bug修复 2023-05-30 18:12:39 +08:00