175 Commits

Author SHA1 Message Date
chenxi
c485c58962 设置和兑换码 2023-06-15 16:40:17 +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
chenxi
b409ab7e86 资源 2023-06-06 10:35:12 +08:00
CloudJ
ee24231070 替换界面 2023-06-06 10:16:30 +08:00
chenxi
d00eef7856 ab name 2023-06-05 21:33:26 +08:00
chenxi
e8cbf8ebc6 ui 2023-06-05 21:05:24 +08:00
chenxi
12ace817dd 战令 2023-06-05 20:08:57 +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
7963b91bbd 七天乐换界面 2023-06-05 17:57:32 +08:00
xiekaidong
dbc4b35bdd 更新资源 2023-06-05 15:42:41 +08:00
chenxi
2f6f2861b8 金猪动画 2023-06-05 15:08:25 +08:00
CloudJ
4661996247 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-05 14:10:59 +08:00
CloudJ
ab33223ea6 编译 2023-06-05 14:10:56 +08:00
Fang
4d914f84b0 每日挑战替图 2023-06-05 11:47:32 +08:00
CloudJ
9fc8ad0a0b 替换UI 2023-06-05 11:46:29 +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
07613ca215 购买体力界面 2023-06-05 10:26:33 +08:00
chenxi
d286327501 资源处理 2023-06-05 10:03:45 +08:00
chenxi
33edfece08 替换战令界面 2023-06-04 22:38:12 +08:00
chenxi
e879baf47b 替换ui 2023-06-04 22:19:28 +08:00
chenxi
2fa49ed069 邮箱 2023-06-03 23:54:18 +08:00
chenxi
c55be49f22 战斗几个底板替换 2023-06-03 21:09:37 +08:00
chenxi
03f10ca7c1 重新拉九宫格 2023-06-03 21:07:24 +08:00
chenxi
759bcedf74 任务界面 2023-06-03 20:30:20 +08:00
chenxi
900bea3586 英雄列表界面 2023-06-03 19:59:22 +08:00
chenxi
43d8b62b4d tips 2023-06-03 19:52:13 +08:00
chenxi
8f740dd397 账号删除界面 2023-06-03 19:50:26 +08:00
chenxi
8c1e33d0b8 选择语言界面替换 2023-06-03 19:47:22 +08:00
chenxi
e2a21e9164 战斗法阵 2023-06-03 18:50:13 +08:00
chenxi
1ba57376b7 战斗资源上传 2023-06-03 18:48:11 +08:00
chenxi
0270759629 调整界面 2023-06-02 21:23:00 +08:00
CloudJ
30388af01b 编译 2023-06-02 20:26:57 +08:00
CloudJ
a52fae7a7e 替换主界面 2023-06-02 19:32:52 +08:00
xiekaidong
61496db4cb 资源更新 2023-06-02 15:32:20 +08:00
chenxi
00472c3c92 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-06-02 10:22:47 +08:00
CloudJ
5781fe9bff 替换ui 2023-06-02 09:46:26 +08:00
chenxi
570af5a807 替换界面 2023-06-01 22:12:22 +08:00
CloudJ
ae21941b99 编译 2023-06-01 21:09:57 +08:00
chenxi
925dc49910 设置界面 2023-06-01 20:58:17 +08:00
chenxi
aba414d587 merge 2023-06-01 20:53:21 +08:00
chenxi
f369f5f8b5 替换设置界面 2023-06-01 20:51:49 +08:00
CloudJ
a1b9dcbf2e 替换一波ui 2023-06-01 20:47:43 +08:00
chenxi
9679058a5f ab name 2023-06-01 20:42:28 +08:00