chenxi
|
585bd539c5
|
从任务跳转去战令，一定要弹出购买弹窗
|
2023-05-29 11:16:21 +08:00 |
|
chenxi
|
56e27bfd3f
|
基金界面
|
2023-05-24 19:26:13 +08:00 |
|
chenxi
|
7b03b79e66
|
基金
|
2023-05-24 19:24:16 +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 |
|
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 |
|
chenxi
|
7443442ca1
|
购买体力以及邮箱初版
|
2023-05-19 18:33:51 +08:00 |
|
chenxi
|
fae19ebd8c
|
挂机
|
2023-05-18 15:40:07 +08:00 |
|
chenxi
|
a297d7f290
|
战令
|
2023-05-16 18:17:45 +08:00 |
|
chenxi
|
805508fd96
|
更新common资源
|
2023-05-12 21:28:23 +08:00 |
|
chenxi
|
9ef8b91821
|
商城
|
2023-05-12 21:07:35 +08:00 |
|
chenxi
|
4eabd3c088
|
任务
|
2023-05-12 10:45:45 +08:00 |
|
chenxi
|
b7b1aa2b54
|
任务
|
2023-05-11 14:14:46 +08:00 |
|
chenxi
|
9319231178
|
任务
|
2023-05-09 17:42:07 +08:00 |
|
chenxi
|
9fb7063c1e
|
语言
|
2023-05-09 11:05:35 +08:00 |
|
chenxi
|
9e218fa88a
|
ui
|
2023-05-08 20:10:51 +08:00 |
|
chenxi
|
e41df86c09
|
主城
|
2023-05-05 22:04:24 +08:00 |
|
chenxi
|
97aa700c8d
|
转菊花动画
|
2023-05-05 18:15:45 +08:00 |
|
chenxi
|
25b5f350d0
|
ab name
|
2023-04-24 22:01:05 +08:00 |
|
xiekaidong
|
1efbea9a7f
|
简单处理一下引导
|
2023-04-24 20:27:22 +08:00 |
|
xiekaidong
|
79f39ede70
|
界面调整
|
2023-04-24 14:21:23 +08:00 |
|
xiekaidong
|
9184710970
|
显示优化
|
2023-04-24 14:16:44 +08:00 |
|
chenxi
|
1cf51cc739
|
资源处理和ab name
|
2023-04-21 22:55:50 +08:00 |
|
xiekaidong
|
8744238499
|
替换资源
|
2023-04-21 14:28:42 +08:00 |
|
xiekaidong
|
af244ed017
|
Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-unity into dev
# Conflicts:
# Assets/prefabs/ui/battle/cell/grid_cell.prefab
|
2023-04-20 18:14:27 +08:00 |
|
chenxi
|
494852cadb
|
toast
|
2023-04-20 18:08:11 +08:00 |
|
xiekaidong
|
eb26827515
|
界面调整
|
2023-04-20 17:03:09 +08:00 |
|
xiekaidong
|
06749eaaeb
|
战斗节奏调整
|
2023-04-19 18:38:25 +08:00 |
|
chenxi
|
42d59d6045
|
界面替换
|
2023-04-19 17:56:21 +08:00 |
|
xiekaidong
|
7db3de04d5
|
更新资源
|
2023-04-19 09:54:56 +08:00 |
|
xiekaidong
|
a442b8ffb1
|
战斗暂停、技能选择、战斗结算、通用奖励获取等界面的处理
|
2023-04-14 15:19:49 +08:00 |
|
xiekaidong
|
e448d3318d
|
英雄养成
|
2023-04-13 21:14:19 +08:00 |
|
xiekaidong
|
4049830098
|
reward显示
|
2023-04-12 21:46:25 +08:00 |
|
xiekaidong
|
13a433d321
|
棋盘新的读取方式
|
2023-04-12 15:17:21 +08:00 |
|
chenxi
|
7c3bf48beb
|
编译
|
2023-04-11 21:58:49 +08:00 |
|
chenxi
|
fd33ffa4ae
|
英雄界面
|
2023-04-10 21:55:46 +08:00 |
|
chenxi
|
4809253845
|
Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev
# Conflicts:
# Assets/arts/textures/ui/common.meta
# Assets/arts/textures/ui/common/common_alpha.png.meta
# Assets/arts/textures/ui/common/common_arrow_3.png
# Assets/arts/textures/ui/common/common_arrow_3.png.meta
# Assets/arts/textures/ui/common/common_arrow_4.png
# Assets/arts/textures/ui/common/common_arrow_4.png.meta
# Assets/arts/textures/ui/common/common_bg_0.png.meta
# Assets/arts/textures/ui/common/common_bg_3.png
# Assets/arts/textures/ui/common/common_bg_3.png.meta
# Assets/arts/textures/ui/common/common_board_10.png
# Assets/arts/textures/ui/common/common_board_10.png.meta
# Assets/arts/textures/ui/common/common_board_6.png
# Assets/arts/textures/ui/common/common_board_6.png.meta
# Assets/arts/textures/ui/common/common_board_7.png
# Assets/arts/textures/ui/common/common_board_7.png.meta
# Assets/arts/textures/ui/common/common_btn_2.png
# Assets/arts/textures/ui/common/common_btn_2.png.meta
# Assets/arts/textures/ui/common/common_btn_3.png
# Assets/arts/textures/ui/common/common_btn_3.png.meta
# Assets/arts/textures/ui/common/common_check_1.png
# Assets/arts/textures/ui/common/common_check_1.png.meta
# Assets/arts/textures/ui/common/common_chest_1.png
# Assets/arts/textures/ui/common/common_chest_1.png.meta
# Assets/arts/textures/ui/common/common_dec_1.png
# Assets/arts/textures/ui/common/common_dec_1.png.meta
# Assets/arts/textures/ui/common/common_hp.png
# Assets/arts/textures/ui/common/common_hp.png.meta
# Assets/arts/textures/ui/common/common_inf.png
# Assets/arts/textures/ui/common/common_inf.png.meta
# Assets/arts/textures/ui/common/common_lock_2.png
# Assets/arts/textures/ui/common/common_lock_2.png.meta
# Assets/arts/textures/ui/common/common_progress_4.png
# Assets/arts/textures/ui/common/common_progress_4.png.meta
|
2023-04-07 15:27:09 +08:00 |
|
chenxi
|
f2ba5705ef
|
ui
|
2023-04-07 15:24:16 +08:00 |
|
xiekaidong
|
28d9843708
|
棋盘
|
2023-04-07 11:24:06 +08:00 |
|
xiekaidong
|
e6ecab4ee4
|
棋盘
|
2023-04-06 10:39:26 +08:00 |
|