404 Commits

Author SHA1 Message Date
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
Fang
d9494aa87b 【玩家升级】界面表现动效 2023-06-01 16:12:06 +08:00
Fang
5727d67a28 主界面成长礼包图标动画添加 2023-06-01 11:12:18 +08:00
CloudJ
56dc3d8c2f 编译 2023-06-01 10:01:04 +08:00
chenxi
6d8fd7bf5e 功能解锁图标 2023-05-31 20:55:01 +08:00
chenxi
59cfb77e28 账号删除 2023-05-31 17:54:31 +08:00
Fang
0546bb0de9 调整每日挑战界面布局 2023-05-31 14:56:15 +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
9a7e0c48f7 资源重命名 2023-05-30 21:09:45 +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
xiekaidong
7f9bdc0508 显示bug修复 2023-05-30 18:13:01 +08:00
chenxi
7232c65937 更新任务界面 2023-05-30 17:30:35 +08:00
chenxi
e8a737bec6 基金展示 2023-05-30 17:24:34 +08:00
chenxi
02b776eaf9 英雄解锁 2023-05-30 12:17:31 +08:00
Fang
75d132c7c3 Merge remote-tracking branch 'origin/dev' into fang/daily_challenge 2023-05-30 10:35:24 +08:00
chenxi
4ab5ab8364 Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev 2023-05-30 10:19:00 +08:00
chenxi
b1d4cc7728 英雄解锁界面 2023-05-30 10:18:57 +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