682 Commits

Author SHA1 Message Date
xiekaidong
187dab8ee6 bug修复,更新图集 2023-06-16 10:59:00 +08:00
DESKTOP-5E92U9B\BigFoot
a4b3033473 新角色上传 2023-06-16 10:08:01 +08:00
xiekaidong
f2f50e2610 spine 2023-06-16 09:56:49 +08:00
xiekaidong
859f8d24f3 更新资源 2023-06-16 09:26:33 +08:00
xiekaidong
d522aaa8bf 更新spine 2023-06-16 09:23:46 +08:00
xiekaidong
62f45a0392 战斗支持血量换皮肤 2023-06-15 18:56:07 +08:00
chenxi
c485c58962 设置和兑换码 2023-06-15 16:40:17 +08:00
xiekaidong
402aaa1ad1 副本开启引导触发、神秘宝箱开启音效 2023-06-15 15:33:09 +08:00
xiekaidong
e42970fcc0 资源修改 2023-06-15 15:17:20 +08:00
Fang
238135a95a 更新图集 2023-06-14 11:45:40 +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
5edd97178e 上传音效 2023-06-14 09:42:03 +08:00
DESKTOP-5E92U9B\BigFoot
1bcd6926bd 伤害字体动画修改 2023-06-13 18:30:53 +08:00
xiekaidong
7e8b46effc 技能音效 2023-06-13 17:44:37 +08:00
Fang
656f096c03 ui资源补充替换 2023-06-13 16:16:29 +08:00
xiekaidong
59f0cd755b 修改每日挑战战斗界面的任务入口 2023-06-13 15:25:06 +08:00
chenxi
e86d257330 merge 2023-06-13 10:45:07 +08:00
chenxi
c64dcdf8f9 苹果账号绑定界面 2023-06-13 10:41:58 +08:00
xiekaidong
3e92da4286 界面处理 2023-06-13 10:20:17 +08:00
Fang
6aa23549f5 活动副本 2023-06-12 15:40:03 +08:00
a13ae659ab Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-07 11:15:55 +08:00
fdd78904af 1 2023-06-07 11:07:18 +08:00
chenxi
1fcad3fab3 ab 2023-06-06 21:37:55 +08:00
xiekaidong
1996dbf284 界面处理 2023-06-06 21:26:48 +08:00
xiekaidong
942014ce6e 替换资源 2023-06-06 20:18:45 +08:00
xiekaidong
ef7d56d981 替换资源 2023-06-06 19:57:28 +08:00
chenxi
3c75dcf7c2 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-06 18:52:10 +08:00
chenxi
c6e4978ff6 spine设置 2023-06-06 18:52:04 +08:00
dbaaf7a5ec Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-06 18:46:09 +08:00
chenxi
4e8ba9e38c ab name 2023-06-06 18:45:15 +08:00
7b47be3fd9 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-06 18:45:15 +08:00
5b0cdcfd6c 111111 2023-06-06 18:45:00 +08:00
chenxi
88cb8a8538 字体 2023-06-06 18:42:02 +08:00
xiekaidong
7d605b1a26 资源改名 2023-06-06 14:22:14 +08:00
chenxi
c2b8fb84e2 loading 2023-06-06 11:56:03 +08:00
CloudJ
f170e50ed8 宝箱UI还原 2023-06-06 11:46:16 +08:00
chenxi
f91872672a 音效和ab 2023-06-06 11:30:15 +08:00
xiekaidong
a6f88ab4ad Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/arts/sounds/sfx/ui/ui_summon_start.wav.meta
2023-06-06 11:08:41 +08:00
CloudJ
f413a2fadb 音效 2023-06-06 11:09:18 +08:00
xiekaidong
e487a6aaba 资源上传 2023-06-06 11:08:19 +08:00
xiekaidong
77d06b3e1e Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
#	Assets/lua/app/ui/main_city/component/main_comp.lua.bytes
2023-06-06 11:02:55 +08:00
xiekaidong
b2f8e11059 音效 2023-06-06 11:01:33 +08:00
801ad5ee4f Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-06-06 11:01:17 +08:00
ed3e988e03 1111 2023-06-06 11:01:05 +08:00
Fang
a320979c7e 替换结算界面失败动画 2023-06-06 11:00:16 +08:00
DESKTOP-5E92U9B\BigFoot
a4e64d1eab 主角修改 2023-06-06 10:53:49 +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
chenxi
b409ab7e86 资源 2023-06-06 10:35:12 +08:00
CloudJ
ee24231070 替换界面 2023-06-06 10:16:30 +08:00