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 |
|
xiekaidong
|
747c85556f
|
资源提交
|
2023-05-30 09:37:14 +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
|
47e09a5249
|
红点逻辑
|
2023-05-29 18:08:29 +08:00 |
|
CloudJ
|
b25a43efbf
|
更新首充界面
|
2023-05-29 17:16:00 +08:00 |
|
chenxi
|
866e5ff242
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-29 15:50:11 +08:00 |
|
chenxi
|
a47d2ea405
|
按钮设置
|
2023-05-29 15:50:08 +08:00 |
|
CloudJ
|
821c1f0365
|
字体
|
2023-05-29 15:12:47 +08:00 |
|
chenxi
|
809fda8619
|
基金重命名
|
2023-05-29 10:54:43 +08:00 |
|
chenxi
|
6c59617e8d
|
战令滑动区域
|
2023-05-26 22:44:39 +08:00 |
|
chenxi
|
9a5d50b728
|
调整界面
|
2023-05-26 19:01:36 +08:00 |
|
chenxi
|
706fec62f4
|
奖励图标
|
2023-05-26 18:48:02 +08:00 |
|
Fang
|
bfd463fd88
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
|
2023-05-26 18:26:39 +08:00 |
|
chenxi
|
049900685c
|
调整英雄头像
|
2023-05-26 18:17:37 +08:00 |
|
Fang
|
fd15e1f423
|
每日挑战boss台子加火
|
2023-05-26 18:12:08 +08:00 |
|
chenxi
|
1d27a51c7a
|
侧边栏红点
|
2023-05-26 17:02:16 +08:00 |
|
CloudJ
|
0733170660
|
成长礼包
|
2023-05-26 15:45:11 +08:00 |
|
Fang
|
ee234a3efd
|
tips等预制体修改
|
2023-05-26 15:43:40 +08:00 |
|
xiekaidong
|
0aaf9d8a92
|
每日挑战任务
|
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 |
|
xiekaidong
|
ae9ae03618
|
每日挑战战斗部分
|
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
|
b8652d1bbc
|
七天乐
|
2023-05-26 14:52:05 +08:00 |
|
chenxi
|
cb42d1531b
|
七天乐
|
2023-05-26 11:40:00 +08:00 |
|
chenxi
|
f72c92e5ce
|
紧急
|
2023-05-25 17:08:25 +08:00 |
|
chenxi
|
edf3b503a4
|
编译
|
2023-05-24 21:46:18 +08:00 |
|
chenxi
|
69d39b03d7
|
等级基金
|
2023-05-24 21:06:11 +08:00 |
|
chenxi
|
7b03b79e66
|
基金
|
2023-05-24 19:24:16 +08:00 |
|
CloudJ
|
7eb30359a3
|
编译
|
2023-05-24 16:01:10 +08:00 |
|
xiekaidong
|
bc18f560d5
|
显示调整
|
2023-05-24 14:27:13 +08:00 |
|
CloudJ
|
a889ce6860
|
编译
|
2023-05-24 10:44:43 +08:00 |
|
xiekaidong
|
e79fd79b95
|
技能刷新接入联网
|
2023-05-24 10:01:20 +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 |
|
chenxi
|
3b47c0dc1a
|
编译
|
2023-05-23 19:03:11 +08:00 |
|
chenxi
|
db92c0bb37
|
英雄详情界面
|
2023-05-23 18:42:04 +08:00 |
|
CloudJ
|
beb55a1705
|
compile
|
2023-05-23 18:37:34 +08:00 |
|
chenxi
|
b7f1dd92e0
|
金猪完成
|
2023-05-23 18:22:06 +08:00 |
|
chenxi
|
0408ee77d0
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-23 17:04:31 +08:00 |
|
chenxi
|
02634ab2b9
|
金猪和邮件
|
2023-05-23 17:04:22 +08:00 |
|
xiekaidong
|
5991c49c26
|
Merge branch 'battle' into dev
|
2023-05-23 16:40:17 +08:00 |
|
xiekaidong
|
91dd99811c
|
格挡动作表现、反击界面表现
|
2023-05-23 16:39:42 +08:00 |
|
CloudJ
|
ac5a050dc5
|
提交一波
|
2023-05-23 16:37:17 +08:00 |
|
CloudJ
|
11492fbc32
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-23 14:18:08 +08:00 |
|