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
|
47e09a5249
|
红点逻辑
|
2023-05-29 18:08:29 +08:00 |
|
chenxi
|
a47d2ea405
|
按钮设置
|
2023-05-29 15:50:08 +08:00 |
|
Fang
|
bfd463fd88
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
|
2023-05-26 18:26:39 +08:00 |
|
Fang
|
fd15e1f423
|
每日挑战boss台子加火
|
2023-05-26 18:12:08 +08:00 |
|
chenxi
|
1d27a51c7a
|
侧边栏红点
|
2023-05-26 17:02:16 +08:00 |
|
Fang
|
ee234a3efd
|
tips等预制体修改
|
2023-05-26 15:43:40 +08:00 |
|
Fang
|
952913d89a
|
预制体修改
|
2023-05-26 15:43:40 +08:00 |
|
Fang
|
d03f02f537
|
美术素材导入
|
2023-05-26 15:43:40 +08:00 |
|
Fang
|
e5e9f9d4ea
|
每日挑战
|
2023-05-26 15:43:40 +08:00 |
|
Fang
|
14a560d54e
|
美术素材导入
|
2023-05-26 15:43:39 +08:00 |
|
Fang
|
0f51b3d174
|
每日挑战
|
2023-05-26 15:43:39 +08:00 |
|
chenxi
|
f72c92e5ce
|
紧急
|
2023-05-25 17:08:25 +08:00 |
|
chenxi
|
b7f1dd92e0
|
金猪完成
|
2023-05-23 18:22:06 +08:00 |
|
chenxi
|
9c2d1e7599
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-17 20:25:34 +08:00 |
|
chenxi
|
b71f9c6327
|
界面调整
|
2023-05-17 20:25:31 +08:00 |
|
xiekaidong
|
6eff2eda52
|
宝箱显示
|
2023-05-17 20:18:13 +08:00 |
|
chenxi
|
4a1a187694
|
主城战令
|
2023-05-16 22:40:02 +08:00 |
|
chenxi
|
9ef8b91821
|
商城
|
2023-05-12 21:07:35 +08:00 |
|
chenxi
|
96addecefc
|
战令
|
2023-05-12 15:33:31 +08:00 |
|
chenxi
|
ac0e788824
|
主城侧边栏
|
2023-05-06 11:35:54 +08:00 |
|
chenxi
|
c26d68e555
|
大小不一致的问题
|
2023-05-05 22:06:03 +08:00 |
|
chenxi
|
e41df86c09
|
主城
|
2023-05-05 22:04:24 +08:00 |
|
chenxi
|
ac9baffa44
|
主城界面
|
2023-05-05 20:56:39 +08:00 |
|
chenxi
|
625ee62361
|
一些界面
|
2023-05-05 10:33:32 +08:00 |
|
chenxi
|
fb0544d956
|
删除不用的资源
|
2023-05-04 11:33:11 +08:00 |
|
xiekaidong
|
8ebcad8898
|
界面调整和gm修改
|
2023-04-26 18:25:25 +08:00 |
|
chenxi
|
ff2ed0265b
|
资源
|
2023-04-26 14:23:22 +08:00 |
|
xiekaidong
|
dced47ecf3
|
英雄升级红点
|
2023-04-26 11:43:27 +08:00 |
|
xiekaidong
|
b2a34825cb
|
主界面宝箱
|
2023-04-26 10:37:06 +08:00 |
|
xiekaidong
|
3c16846842
|
更新资源
|
2023-04-24 18:44:33 +08:00 |
|
xiekaidong
|
f4f5059bfe
|
资源替换
|
2023-04-24 18:04:05 +08:00 |
|
xiekaidong
|
461cc41ac4
|
修改主界面
|
2023-04-24 17:38:44 +08:00 |
|
xiekaidong
|
9801e68bf5
|
下边页签动效
|
2023-04-24 16:12:46 +08:00 |
|
xiekaidong
|
06d9d3168f
|
宝箱修改
|
2023-04-24 11:21:46 +08:00 |
|
chenxi
|
1cf51cc739
|
资源处理和ab name
|
2023-04-21 22:55:50 +08:00 |
|
chenxi
|
18f974d5b8
|
主城箭头
|
2023-04-20 18:02:15 +08:00 |
|
xiekaidong
|
ca8519d154
|
英雄解锁和强制上阵的判定
|
2023-04-19 22:20:44 +08:00 |
|
chenxi
|
42d59d6045
|
界面替换
|
2023-04-19 17:56:21 +08:00 |
|
xiekaidong
|
707b3d2cda
|
处理一下主界面
|
2023-04-12 17:55:18 +08:00 |
|
chenxi
|
c92b1b1b9b
|
主界面阵容
|
2023-04-11 20:11:54 +08:00 |
|
chenxi
|
20f87dc4de
|
资源
|
2023-04-11 18:26:10 +08:00 |
|
chenxi
|
fd33ffa4ae
|
英雄界面
|
2023-04-10 21:55:46 +08:00 |
|
chenxi
|
5c05e888c9
|
章节
|
2023-04-07 20:50:58 +08:00 |
|
chenxi
|
f2ba5705ef
|
ui
|
2023-04-07 15:24:16 +08:00 |
|
xiekaidong
|
e6ecab4ee4
|
棋盘
|
2023-04-06 10:39:26 +08:00 |
|
xiekaidong
|
87af2478d9
|
整理项目
|
2023-04-03 11:04:31 +08:00 |
|