陈希
|
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
|
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
|
1637802fe4
|
资源
|
2023-05-29 18:00:04 +08:00 |
|
xiekaidong
|
fda6a5cb08
|
bug修复
|
2023-05-29 17:54:21 +08:00 |
|
xiekaidong
|
16c79f867e
|
更新资源
|
2023-05-29 17:49:45 +08:00 |
|
xiekaidong
|
f8bc9a6663
|
更新资源
|
2023-05-29 17:48:23 +08:00 |
|
xiekaidong
|
7bf8af7f73
|
更新资源
|
2023-05-29 17:36:44 +08:00 |
|
CloudJ
|
b25a43efbf
|
更新首充界面
|
2023-05-29 17:16:00 +08:00 |
|
chenxi
|
2ffcb82122
|
更新skill_rouge资源
|
2023-05-29 14:33:18 +08:00 |
|
chenxi
|
585bd539c5
|
从任务跳转去战令，一定要弹出购买弹窗
|
2023-05-29 11:16:21 +08:00 |
|
chenxi
|
934e2970b0
|
更新icon
|
2023-05-29 10:33:01 +08:00 |
|
chenxi
|
19a27cbdc2
|
更新美术资源
|
2023-05-29 10:29:20 +08:00 |
|
CloudJ
|
35af04e42d
|
compile
|
2023-05-26 19:58:22 +08:00 |
|
chenxi
|
41d946549b
|
技能图标
|
2023-05-26 19:02:46 +08:00 |
|
chenxi
|
9a5d50b728
|
调整界面
|
2023-05-26 19:01:36 +08:00 |
|
Fang
|
bfd463fd88
|
Merge remote-tracking branch 'origin/dev' into fang/daily_challenge
|
2023-05-26 18:26:39 +08:00 |
|
Fang
|
58ee5fbd2f
|
更新协议、每日挑战任务icon替换
|
2023-05-26 17:38:41 +08:00 |
|
chenxi
|
f5a1cf0f31
|
英雄icon
|
2023-05-26 17:14:47 +08:00 |
|
Fang
|
ee234a3efd
|
tips等预制体修改
|
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 |
|
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
|
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
|
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 |
|
CloudJ
|
11492fbc32
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-23 14:18:08 +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 |
|
CloudJ
|
51876cb295
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-22 16:15:07 +08:00 |
|
chenxi
|
61ebfcf99f
|
空邮件的表现
|
2023-05-22 12:01:21 +08:00 |
|
chenxi
|
2edef87063
|
先屏蔽金猪
|
2023-05-22 11:22:45 +08:00 |
|
xiekaidong
|
8811c4bebe
|
弹窗
|
2023-05-22 10:25:01 +08:00 |
|
CloudJ
|
e62e42c62a
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-22 09:59:32 +08:00 |
|
chenxi
|
48f22d6749
|
邮箱界面
|
2023-05-19 20:15:24 +08:00 |
|
CloudJ
|
e1d162f918
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
|
2023-05-19 20:04:45 +08:00 |
|
CloudJ
|
098207b6a4
|
tmp
|
2023-05-19 20:04:43 +08:00 |
|
xiekaidong
|
d718880622
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
# Assets/lua/app/module/mail.meta
# Assets/lua/app/module/mail/mail_const.lua.bytes.meta
# Assets/lua/app/module/mail/mail_manager.lua.bytes.meta
# Assets/lua/app/ui/mail.meta
# Assets/lua/app/ui/mail/cell.meta
# Assets/lua/app/ui/mail/cell/mail_cell.lua.bytes.meta
# Assets/lua/app/ui/mail/mail_detail_ui.lua.bytes.meta
# Assets/lua/app/ui/mail/mail_ui.lua.bytes.meta
# Assets/lua/app/userdata/mail.meta
# Assets/lua/app/userdata/mail/mail_data.lua.bytes.meta
# Assets/lua/app/userdata/mail/mail_entity.lua.bytes.meta
|
2023-05-19 20:01:08 +08:00 |
|