225 Commits

Author SHA1 Message Date
xiekaidong
458d03cd53 战斗调整 2023-06-29 21:14:38 +08:00
xiekaidong
4aaaf714bd 竞技场敌方自动战斗 2023-06-29 20:52:39 +08:00
xiekaidong
06191c7e8c bug修复 2023-06-21 17:16:12 +08:00
xiekaidong
e81062f43b buff回合数等于1时也显示 2023-06-19 12:03:45 +08:00
Fang
d275c58ad4 头像昵称 2023-06-19 10:57:28 +08:00
chenxi
3f855b2357 界面调整 2023-06-16 17:36:57 +08:00
xiekaidong
989a7c63e5 火蛇海蛇效果 2023-06-16 15:14:33 +08:00
xiekaidong
7f47ebdfd0 修改显示 2023-06-16 11:34:21 +08:00
chenxi
f04af250ac 编译 2023-06-16 10:37:25 +08:00
xiekaidong
402aaa1ad1 副本开启引导触发、神秘宝箱开启音效 2023-06-15 15:33:09 +08:00
xiekaidong
19084e41f4 bug修复 2023-06-15 14:07:48 +08:00
chenxi
358a41e2ed 参数以及上报 2023-06-14 21:43:46 +08:00
Fang
ee97ab1c93 Merge branch 'dev' into fang/dungeon
# Conflicts:
#	Assets/lua/app/config/item.lua.bytes
#	Assets/lua/app/config/localization/localization_global_const.lua.bytes
#	Assets/lua/app/config/skill.lua.bytes
#	Assets/lua/app/config/strings/cn/global.lua.bytes
#	Assets/lua/app/config/strings/cn/item.lua.bytes
#	Assets/lua/app/config/strings/de/item.lua.bytes
#	Assets/lua/app/config/strings/en/global.lua.bytes
#	Assets/lua/app/config/strings/en/item.lua.bytes
#	Assets/lua/app/config/strings/fr/item.lua.bytes
#	Assets/lua/app/config/strings/id/item.lua.bytes
#	Assets/lua/app/config/strings/ja/item.lua.bytes
#	Assets/lua/app/config/strings/ko/item.lua.bytes
#	Assets/lua/app/config/strings/pt/item.lua.bytes
#	Assets/lua/app/config/strings/ru/item.lua.bytes
#	Assets/lua/app/config/strings/th/item.lua.bytes
#	Assets/lua/app/config/strings/vi/item.lua.bytes
#	Assets/lua/app/config/strings/zh/global.lua.bytes
#	Assets/lua/app/config/strings/zh/item.lua.bytes
#	Assets/lua/app/module/battle/battle_const.lua.bytes
#	Assets/lua/app/module/battle/controller/battle_controller.lua.bytes
#	Assets/lua/app/ui/battle/battle_ui.lua.bytes
#	Assets/lua/app/ui/main_city/main_city_ui.lua.bytes
2023-06-14 11:42:03 +08:00
xiekaidong
7e8b46effc 技能音效 2023-06-13 17:44:37 +08:00
xiekaidong
59f0cd755b 修改每日挑战战斗界面的任务入口 2023-06-13 15:25:06 +08:00
xiekaidong
80d3f8cb17 grideffect=6的处理 2023-06-13 15:08:42 +08:00
xiekaidong
3e92da4286 界面处理 2023-06-13 10:20:17 +08:00
xiekaidong
dd104eae3f 每日挑战不显示每日buff信息 2023-06-12 09:47:25 +08:00
xiekaidong
de19bdfa8b 显示bug修复 2023-06-06 20:37:54 +08:00
xiekaidong
ffcfe93299 切换波次时自动关闭buff弹窗 2023-06-06 14:13:07 +08:00
xiekaidong
85eff9cbec 调快速度 2023-06-06 11:56:34 +08:00
Fang
bb89a17fc4 编译 2023-06-06 10:49:02 +08:00
xiekaidong
d357e0c69b Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-06 10:39:07 +08:00
xiekaidong
d56c7110d7 boss预警音效 2023-06-06 10:39:04 +08:00
CloudJ
ade6fd169a 编译 2023-06-06 10:22:05 +08:00
xiekaidong
5bc73b98ab 消除显示优化 2023-06-05 20:53:19 +08:00
xiekaidong
9040c5d2ae 特效 2023-06-05 20:07:09 +08:00
chenxi
312e1d66e9 编译 2023-06-05 19:09:06 +08:00
Fang
123128ce1f 结算界面金猪动画 2023-06-05 18:30:16 +08:00
Fang
0216eabf3b 战斗结算界面动画 2023-06-05 17:17:26 +08:00
CloudJ
ab33223ea6 编译 2023-06-05 14:10:56 +08:00
xiekaidong
e6a28c8acd 修改bug,优化战斗流程逻辑 2023-06-03 19:12:33 +08:00
xiekaidong
b60f9b1ca4 boss机制棋盘效果处理 2023-06-02 22:28:55 +08:00
xiekaidong
c65d52c8de 水泡动画 2023-06-02 19:02:18 +08:00
xiekaidong
e4d84563f9 先更新一下格子 2023-06-02 16:54:59 +08:00
chenxi
7389ba8509 只有主线战斗结算界面显示金猪 2023-06-02 12:12:09 +08:00
xiekaidong
9a32b0d721 去掉boss停帧 2023-06-02 09:37:41 +08:00
xiekaidong
88008cdf67 显示优化 2023-06-01 22:10:51 +08:00
xiekaidong
f2c54a2677 bug修复 2023-06-01 16:35:33 +08:00
xiekaidong
6142cbd292 显示问题修复 2023-06-01 10:06:54 +08:00
xiekaidong
7e25cb28cb 三消格子支持spine动画表现 2023-05-31 20:18:57 +08:00
xiekaidong
4b805302fc bug修复 2023-05-31 18:06:48 +08:00
xiekaidong
43a9d27782 调整表现 2023-05-31 16:31:16 +08:00
xiekaidong
d391f68779 显示问题 2023-05-31 14:30:41 +08:00
xiekaidong
075d7a2480 层级调整 2023-05-30 22:04:57 +08:00
chenxi
a58c63a617 ab name 2023-05-30 21:15:29 +08:00
chenxi
579515ae74 编译 2023-05-30 19:01:38 +08:00
xiekaidong
b5ec3d4eff 显示优化 2023-05-30 18:41:09 +08:00
xiekaidong
ec4c24b366 boss出场动画 2023-05-30 18:33:31 +08:00
xiekaidong
7f9bdc0508 显示bug修复 2023-05-30 18:13:01 +08:00