204 Commits

Author SHA1 Message Date
xiekaidong
3b67015da8 bug修复 2023-07-06 17:42:19 +08:00
xiekaidong
a048f7d2d9 编译lua 2023-07-06 10:42:17 +08:00
xiekaidong
483d505cbd 显示 2023-07-05 18:36:06 +08:00
xiekaidong
3405a1b1ae Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-07-05 17:55:15 +08:00
xiekaidong
7bedad109d bug修复 2023-07-05 17:55:12 +08:00
Fang
4c45a9db92 修改头像框界面布局、竞技场赛季刷新fix等 2023-07-05 17:49:39 +08:00
Fang
1d337ed62f 显示修复 2023-07-05 15:56:46 +08:00
Fang
0767c6eae5 编译 2023-07-05 15:04:42 +08:00
Fang
48293f54c1 竞技场宝箱功能补全 2023-07-05 14:54:34 +08:00
xiekaidong
37c4da852d bug修复 2023-07-05 14:45:49 +08:00
xiekaidong
de21e7b5d7 显示问题修复 2023-07-05 14:26:04 +08:00
xiekaidong
2ce21cba6d 连击提示 2023-07-05 11:23:19 +08:00
Fang
7000dff1bb 竞技场fix 2023-07-05 10:52:36 +08:00
xiekaidong
2e605fabc0 适配 2023-07-05 10:42:39 +08:00
xiekaidong
c5ec2e1853 竞技场任务 2023-07-05 10:16:00 +08:00
xiekaidong
0320ef81bd prefab资源检查,更新字体 2023-07-04 20:16:20 +08:00
Fang
91efb4bf35 fix and 替图 2023-07-04 18:34:41 +08:00
xiekaidong
cc0b2c05f8 战斗速度 2023-07-04 18:25:20 +08:00
xiekaidong
3c66b5c3da 取消连线 2023-07-04 18:05:41 +08:00
Fang
829a6e65b0 fix 2023-07-04 15:15:36 +08:00
xiekaidong
d2a75b56d1 竞技场节奏调整 2023-07-04 10:55:31 +08:00
xiekaidong
efb2fc57ba 竞技场弹窗礼包 2023-07-03 20:02:46 +08:00
Fang
efe355a0c4 完善细节 2023-07-03 18:35:49 +08:00
Fang
007e810cf2 动效添加、替图 2023-07-03 17:17:36 +08:00
Fang
0e7f765ca2 fix 2023-07-03 09:51:15 +08:00
xiekaidong
f7c7f3ad27 bug修复 2023-06-30 17:54:39 +08:00
xiekaidong
03cce7d521 战斗处理 2023-06-30 16:04:26 +08:00
xiekaidong
ad57cef6ea 竞技场节奏调整 2023-06-30 14:46:02 +08:00
xiekaidong
cbca95b111 战斗bug修复 2023-06-29 21:25:44 +08:00
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