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
|
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 |
|
chenxi
|
1ba57376b7
|
战斗资源上传
|
2023-06-03 18:48:11 +08:00 |
|
CloudJ
|
30388af01b
|
编译
|
2023-06-02 20:26:57 +08:00 |
|
CloudJ
|
a52fae7a7e
|
替换主界面
|
2023-06-02 19:32:52 +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 |
|
Fang
|
d9494aa87b
|
【玩家升级】界面表现动效
|
2023-06-01 16:12:06 +08:00 |
|
Fang
|
5727d67a28
|
主界面成长礼包图标动画添加
|
2023-06-01 11:12:18 +08:00 |
|
CloudJ
|
75114aace7
|
更新图集
|
2023-06-01 10:07:54 +08:00 |
|
CloudJ
|
56dc3d8c2f
|
编译
|
2023-06-01 10:01:04 +08:00 |
|
chenxi
|
48262bcb48
|
金猪bug
|
2023-05-31 21:22:14 +08:00 |
|
chenxi
|
6d8fd7bf5e
|
功能解锁图标
|
2023-05-31 20:55:01 +08:00 |
|
CloudJ
|
de67799f89
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-31 09:45:57 +08:00 |
|
chenxi
|
a58c63a617
|
ab name
|
2023-05-30 21:15:29 +08:00 |
|
chenxi
|
a05dac0974
|
图集
|
2023-05-30 21:12:52 +08:00 |
|
CloudJ
|
4fbdaa31e5
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-30 19:35:25 +08:00 |
|
CloudJ
|
d1ab31227b
|
替换首充界面
|
2023-05-30 19:35:02 +08:00 |
|
chenxi
|
42395ab955
|
七天乐天数不够时的表现
|
2023-05-30 19:14:56 +08:00 |
|
chenxi
|
e8a737bec6
|
基金展示
|
2023-05-30 17:24:34 +08:00 |
|
Fang
|
9a0d2fc84d
|
材质丢失fix
|
2023-05-29 18:32:09 +08:00 |
|
Fang
|
c5ca672020
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
# Conflicts:
# Assets/arts/atlas/ui/battle.spriteatlas
# Assets/arts/atlas/ui/common.asset
# Assets/arts/textures/ui/common/common_board_23.png.meta
# Assets/arts/textures/ui/common/common_board_24.png.meta
# Assets/arts/textures/ui/common/common_board_25.png.meta
# Assets/arts/textures/ui/common/common_dec_12.png.meta
# Assets/arts/textures/ui/common/common_title_9.png.meta
# Assets/arts/textures/ui/common/common_toast_2.png.meta
|
2023-05-29 18:23:09 +08:00 |
|
CloudJ
|
2850b01d5b
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-29 18:07:53 +08:00 |
|
xiekaidong
|
7bf8af7f73
|
更新资源
|
2023-05-29 17:36:44 +08:00 |
|
CloudJ
|
b25a43efbf
|
更新首充界面
|
2023-05-29 17:16:00 +08:00 |
|
CloudJ
|
35af04e42d
|
compile
|
2023-05-26 19:58:22 +08:00 |
|