383 Commits

Author SHA1 Message Date
xiekaidong
1acaec8748 竞技场波次显示 2023-07-04 20:13:44 +08:00
Fang
98a14c54c2 段位图标重叠fix 2023-07-04 18:50:44 +08:00
Fang
91efb4bf35 fix and 替图 2023-07-04 18:34:41 +08:00
xiekaidong
3c66b5c3da 取消连线 2023-07-04 18:05:41 +08:00
xiekaidong
2f01e53cba 资源问题 2023-07-04 15:41:12 +08:00
Fang
829a6e65b0 fix 2023-07-04 15:15:36 +08:00
Fang
813af1dff1 替图 2023-07-03 14:15:22 +08:00
CloudJ
4adea4f216 更换战令图片 2023-07-03 10:28:11 +08:00
Fang
0e7f765ca2 fix 2023-07-03 09:51:15 +08:00
Fang
aae1ec0c8c 完善逻辑 2023-06-29 16:10:22 +08:00
CloudJ
c55f297bec 战令替换spine 2023-06-29 10:42:14 +08:00
Fang
764645f4d5 逻辑补充 2023-06-28 18:36:07 +08:00
Fang
80c02c4c82 竞技场 2023-06-27 18:27:38 +08:00
Fang
7c79623e92 超框处理 2023-06-20 18:43:08 +08:00
xiekaidong
bb0b9a6673 bug修复,上传资源 2023-06-20 17:51:19 +08:00
chenxi
622d9918d3 ab name 2023-06-20 14:32:36 +08:00
chenxi
d9befbff7a 开几个语言 2023-06-20 10:08:24 +08:00
Fang
d275c58ad4 头像昵称 2023-06-19 10:57:28 +08:00
chenxi
3791c54170 ab name 2023-06-16 21:55:12 +08:00
chenxi
7a82aff2db 界面调整 2023-06-16 17:36:27 +08:00
chenxi
f976a8ae70 技能图标 2023-06-16 17:21:55 +08:00
chenxi
0c06bb7b7e 界面调整 2023-06-16 17:16:39 +08:00
xiekaidong
092ed027e1 更新图集 2023-06-16 16:24:27 +08:00
chenxi
e0c176b6f0 图集 2023-06-16 15:39:02 +08:00
xiekaidong
187dab8ee6 bug修复,更新图集 2023-06-16 10:59:00 +08:00
chenxi
c485c58962 设置和兑换码 2023-06-15 16:40:17 +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
Fang
656f096c03 ui资源补充替换 2023-06-13 16:16:29 +08:00
xiekaidong
59f0cd755b 修改每日挑战战斗界面的任务入口 2023-06-13 15:25:06 +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
CloudJ
ee24231070 替换界面 2023-06-06 10:16:30 +08:00
chenxi
83363f4694 主城资源 2023-06-05 19:54:50 +08:00
chenxi
d1ec620837 资源自动处理和ab name 2023-06-05 19:19:17 +08:00
chenxi
2f6f2861b8 金猪动画 2023-06-05 15:08:25 +08:00
CloudJ
ab33223ea6 编译 2023-06-05 14:10:56 +08:00
CloudJ
aa04bc028b 编译 2023-06-05 10:58:59 +08:00
CloudJ
4258abd474 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
#	Assets/arts/atlas/ui/shop.asset
2023-06-05 10:58:33 +08:00
CloudJ
4d5ad2f87a 替换UI 2023-06-05 10:58:24 +08:00
chenxi
509194f3cb 资源替换 2023-06-05 10:40:23 +08:00
chenxi
07613ca215 购买体力界面 2023-06-05 10:26:33 +08:00
chenxi
4582299d87 英雄展示界面 2023-06-05 10:24:53 +08:00
chenxi
d286327501 资源处理 2023-06-05 10:03:45 +08:00
chenxi
2fa49ed069 邮箱 2023-06-03 23:54:18 +08:00
chenxi
759bcedf74 任务界面 2023-06-03 20:30:20 +08:00
chenxi
900bea3586 英雄列表界面 2023-06-03 19:59:22 +08:00
chenxi
8f740dd397 账号删除界面 2023-06-03 19:50:26 +08:00
chenxi
8c1e33d0b8 选择语言界面替换 2023-06-03 19:47:22 +08:00