陈希
|
11b199ad84
|
Merge branch 'fang/daily_challenge' into 'dev'
每日挑战
See merge request b6-client/b6-unity!1
|
2023-05-30 03:38:31 +00:00 |
|
xiekaidong
|
d62a8edbe0
|
提交资源
|
2023-05-30 11:33:36 +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
|
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
|
b25a43efbf
|
更新首充界面
|
2023-05-29 17:16:00 +08:00 |
|
Fang
|
14a560d54e
|
美术素材导入
|
2023-05-26 15:43:39 +08:00 |
|
chenxi
|
cb42d1531b
|
七天乐
|
2023-05-26 11:40:00 +08:00 |
|
chenxi
|
1cc0b387de
|
更新资源
|
2023-05-25 09:47:19 +08:00 |
|
chenxi
|
c1fee8ff75
|
战斗场景
|
2023-05-24 20:51:28 +08:00 |
|
chenxi
|
7b03b79e66
|
基金
|
2023-05-24 19:24:16 +08:00 |
|
chenxi
|
320b535e94
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-22 21:24:06 +08:00 |
|
chenxi
|
f34a609721
|
邮件
|
2023-05-22 21:24:03 +08:00 |
|
xiekaidong
|
1d657e3128
|
boss入场动画
|
2023-05-22 20:32:26 +08:00 |
|
xiekaidong
|
8811c4bebe
|
弹窗
|
2023-05-22 10:25:01 +08:00 |
|
chenxi
|
168c556b6d
|
挂机
|
2023-05-17 22:28:55 +08:00 |
|
chenxi
|
82f8030d2f
|
战令
|
2023-05-17 14:41:30 +08:00 |
|
chenxi
|
a297d7f290
|
战令
|
2023-05-16 18:17:45 +08:00 |
|
chenxi
|
5c4d3ecf3d
|
战令
|
2023-05-15 21:33:07 +08:00 |
|
chenxi
|
aff4fe1757
|
商城
|
2023-05-15 09:37:20 +08:00 |
|
chenxi
|
986d7dc9f3
|
更新商城资源
|
2023-05-12 21:30:02 +08:00 |
|
chenxi
|
9ef8b91821
|
商城
|
2023-05-12 21:07:35 +08:00 |
|
chenxi
|
edd4314ed6
|
ab name
|
2023-04-26 14:25:15 +08:00 |
|
chenxi
|
b41e6ab5c3
|
登录界面
|
2023-04-26 11:01:20 +08:00 |
|
xiekaidong
|
fed6c5f070
|
增加一个生效对象
|
2023-04-25 18:13:00 +08:00 |
|
macmini
|
5ef9faadda
|
资源
|
2023-04-25 15:38:00 +08:00 |
|
xiekaidong
|
1efbea9a7f
|
简单处理一下引导
|
2023-04-24 20:27:22 +08:00 |
|
xiekaidong
|
f4f5059bfe
|
资源替换
|
2023-04-24 18:04:05 +08:00 |
|
chenxi
|
1cf51cc739
|
资源处理和ab name
|
2023-04-21 22:55:50 +08:00 |
|
xiekaidong
|
ff1da8c1b6
|
战斗引导
|
2023-04-21 16:11:13 +08:00 |
|
chenxi
|
ff211bb284
|
更新资源
|
2023-04-20 15:23:43 +08:00 |
|
xiekaidong
|
ca8519d154
|
英雄解锁和强制上阵的判定
|
2023-04-19 22:20:44 +08:00 |
|
chenxi
|
db8b4c583e
|
改名
|
2023-04-19 20:20:26 +08:00 |
|
chenxi
|
3ab65f99ae
|
战斗章节资源
|
2023-04-19 20:17:09 +08:00 |
|
chenxi
|
f9f9a749bb
|
更新资源
|
2023-04-19 20:09:29 +08:00 |
|
xiekaidong
|
06749eaaeb
|
战斗节奏调整
|
2023-04-19 18:38:25 +08:00 |
|
chenxi
|
42d59d6045
|
界面替换
|
2023-04-19 17:56:21 +08:00 |
|
xiekaidong
|
a442b8ffb1
|
战斗暂停、技能选择、战斗结算、通用奖励获取等界面的处理
|
2023-04-14 15:19:49 +08:00 |
|
xiekaidong
|
2cffcebcb4
|
技能回收和吐出来
|
2023-04-12 21:03:55 +08:00 |
|
chenxi
|
4896490c00
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-04-10 21:55:49 +08:00 |
|
chenxi
|
fd33ffa4ae
|
英雄界面
|
2023-04-10 21:55:46 +08:00 |
|
xiekaidong
|
d6f9943820
|
一些技能的实现
|
2023-04-10 21:13:47 +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 |
|