115 Commits

Author SHA1 Message Date
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
xiekaidong
0aaf9d8a92 每日挑战任务 2023-05-26 15:43:40 +08:00
Fang
55268c367e 图集更新 2023-05-26 15:43:40 +08:00
xiekaidong
ae9ae03618 每日挑战战斗部分 2023-05-26 15:43:40 +08:00
chenxi
cb42d1531b 七天乐 2023-05-26 11:40:00 +08:00
chenxi
56e27bfd3f 基金界面 2023-05-24 19:26:13 +08:00
chenxi
7b03b79e66 基金 2023-05-24 19:24:16 +08:00
xiekaidong
665e23cf30 Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev 2023-05-23 20:09:39 +08:00
xiekaidong
6200fe5432 反击表现 2023-05-23 20:09:36 +08:00