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 |
|
chenxi
|
3b47c0dc1a
|
编译
|
2023-05-23 19:03:11 +08:00 |
|
chenxi
|
02634ab2b9
|
金猪和邮件
|
2023-05-23 17:04:22 +08:00 |
|
xiekaidong
|
1d657e3128
|
boss入场动画
|
2023-05-22 20:32:26 +08:00 |
|
chenxi
|
14bf5e913d
|
编译
|
2023-05-19 21:58:07 +08:00 |
|
chenxi
|
48f22d6749
|
邮箱界面
|
2023-05-19 20:15:24 +08:00 |
|
chenxi
|
7443442ca1
|
购买体力以及邮箱初版
|
2023-05-19 18:33:51 +08:00 |
|
chenxi
|
fae19ebd8c
|
挂机
|
2023-05-18 15:40:07 +08:00 |
|
chenxi
|
4a1a187694
|
主城战令
|
2023-05-16 22:40:02 +08:00 |
|
xiekaidong
|
38577a5ae8
|
Merge branch 'battle' into dev
|
2023-05-16 19:13:51 +08:00 |
|
chenxi
|
a297d7f290
|
战令
|
2023-05-16 18:17:45 +08:00 |
|
xiekaidong
|
54fc7ff7e3
|
更新图集
|
2023-05-15 16:21:11 +08:00 |
|
chenxi
|
d3ed858a5d
|
商城资源
|
2023-05-12 21:32:56 +08:00 |
|
chenxi
|
805508fd96
|
更新common资源
|
2023-05-12 21:28:23 +08:00 |
|
chenxi
|
9ef8b91821
|
商城
|
2023-05-12 21:07:35 +08:00 |
|
chenxi
|
96addecefc
|
战令
|
2023-05-12 15:33:31 +08:00 |
|
chenxi
|
4eabd3c088
|
任务
|
2023-05-12 10:45:45 +08:00 |
|
chenxi
|
b7b1aa2b54
|
任务
|
2023-05-11 14:14:46 +08:00 |
|
chenxi
|
2f5f37f546
|
图集
|
2023-05-09 19:48:09 +08:00 |
|
chenxi
|
9319231178
|
任务
|
2023-05-09 17:42:07 +08:00 |
|
chenxi
|
9fb7063c1e
|
语言
|
2023-05-09 11:05:35 +08:00 |
|
chenxi
|
74ef9a6069
|
主城UI
|
2023-05-09 09:44:58 +08:00 |
|
chenxi
|
f055493dff
|
设置界面
|
2023-05-08 21:46:27 +08:00 |
|
chenxi
|
b781f3a483
|
设置
|
2023-05-08 20:40:33 +08:00 |
|
chenxi
|
9e218fa88a
|
ui
|
2023-05-08 20:10:51 +08:00 |
|
chenxi
|
ac0e788824
|
主城侧边栏
|
2023-05-06 11:35:54 +08:00 |
|
chenxi
|
e41df86c09
|
主城
|
2023-05-05 22:04:24 +08:00 |
|
chenxi
|
97aa700c8d
|
转菊花动画
|
2023-05-05 18:15:45 +08:00 |
|
chenxi
|
eb9de90fe8
|
金猪界面
|
2023-05-05 12:00:13 +08:00 |
|
chenxi
|
625ee62361
|
一些界面
|
2023-05-05 10:33:32 +08:00 |
|
chenxi
|
a7b2e951f5
|
资源
|
2023-04-26 22:37:16 +08:00 |
|
chenxi
|
ee1f0b99e2
|
连击效果
|
2023-04-26 22:24:35 +08:00 |
|
chenxi
|
e81de3ea03
|
连击效果
|
2023-04-26 20:48:06 +08:00 |
|
chenxi
|
ea4e20f41f
|
登录i
|
2023-04-26 14:18:13 +08:00 |
|
xiekaidong
|
9e03ce63fc
|
章节障碍物和棋盘地图
|
2023-04-25 18:39:02 +08:00 |
|
chenxi
|
a284c7e243
|
资源
|
2023-04-24 21:54:37 +08:00 |
|
xiekaidong
|
1efbea9a7f
|
简单处理一下引导
|
2023-04-24 20:27:22 +08:00 |
|