85 Commits

Author SHA1 Message Date
xiekaidong
16d550aefa 设置abname 2023-10-09 16:01:10 +08:00
xiekaidong
8304af85ef 资源检查 2023-10-09 15:57:20 +08:00
Fang
06cecef8fc 超框 2023-10-09 09:42:40 +08:00
Fang
2c40d73a0e 锦标赛战令进度条显示修改,帮助文案修改 2023-10-08 16:57:44 +08:00
Fang
8722d4b433 竞技场锦标赛 2023-09-28 11:07:20 +08:00
Fang
e1a49e73d9 波次锦标赛 2023-09-27 18:54:16 +08:00
xiekaidong
00e53beccd 设置abname 2023-09-20 17:44:40 +08:00
Fang
f40b937012 更表、超框处理 2023-09-19 18:31:31 +08:00
xiekaidong
0942c88d19 设置 2023-09-19 11:24:01 +08:00
xiekaidong
03956d8ecb 资源检查 2023-09-19 09:52:01 +08:00
xiekaidong
7d6398835a 优化显示 2023-09-18 21:05:52 +08:00
xiekaidong
a2ff24f5a6 帮助界面 2023-09-18 20:22:02 +08:00
xiekaidong
c30e9d729c 优化和容错 2023-09-18 20:07:37 +08:00
Fang
29526815ba ui布局调整 2023-09-18 18:03:54 +08:00
Fang
b92f858295 界面优化 2023-09-18 16:38:04 +08:00
xiekaidong
94f5ea647f 界面调整 2023-09-18 12:02:52 +08:00
xiekaidong
8a7e4ec47c 调整 2023-09-18 11:22:40 +08:00
xiekaidong
33e84e5cc1 优化显示 2023-09-18 11:21:37 +08:00
xiekaidong
b3f490c9ac bug修复 2023-09-18 10:38:18 +08:00
xiekaidong
f78213bce1 界面调整 2023-09-16 20:24:32 +08:00
xiekaidong
91dc07f589 帮助界面 2023-09-16 20:17:20 +08:00
xiekaidong
7eed36b812 选择界面表现 2023-09-16 19:39:51 +08:00
xiekaidong
ca342100a2 升级表现 2023-09-16 19:17:54 +08:00
xiekaidong
1ecdf0cd14 界面优化 2023-09-16 18:45:58 +08:00
xiekaidong
2a8107ddce 第一版梦魇酒馆,差表现 2023-09-16 18:08:26 +08:00
xiekaidong
83a5666725 Merge branch 'dev_20230919' into limit_pvp
# Conflicts:
#	Assets/arts/atlas/ui/act_common.asset
#	Assets/arts/atlas/ui/act_common.spriteatlas
#	Assets/arts/atlas/ui/common.asset
#	Assets/arts/atlas/ui/common.spriteatlas
#	Assets/proto/protocol.bytes
2023-09-16 17:56:32 +08:00
xiekaidong
a022065ef5 界面 2023-09-16 17:52:04 +08:00
xiekaidong
bcb9e60c73 界面调整 2023-09-15 21:00:29 +08:00
xiekaidong
e528334190 界面处理 2023-09-15 20:46:35 +08:00
Fang
769cfbe34d 圆月活动 2023-09-15 19:23:25 +08:00
xiekaidong
1c44759790 资源 2023-09-15 17:27:22 +08:00
xiekaidong
1275c6494f 界面 2023-09-14 21:13:25 +08:00
Fang
845c800565 替换资源 2023-09-14 09:39:46 +08:00
xiekaidong
d9110872bf 拼界面 2023-09-13 20:41:45 +08:00
xiekaidong
e936d45746 设置abname 2023-09-05 20:55:51 +08:00
xiekaidong
1ac93875aa 资源检查 2023-09-05 20:52:02 +08:00
xiekaidong
20802d3bea 优化 2023-09-05 18:26:28 +08:00
xiekaidong
aa3f69a043 显示优化 2023-09-05 18:24:14 +08:00
xiekaidong
29f0e84ee0 14天丢图问题 2023-09-04 17:50:47 +08:00
xiekaidong
c15bf48f06 图集,资源修改 2023-09-04 09:46:55 +08:00
xiekaidong
f7fe141786 Merge branch 'dev_20230905' into boss_rush
# Conflicts:
#	Assets/arts/atlas/icon/item.asset
#	Assets/arts/atlas/ui/act_common.asset
#	Assets/arts/atlas/ui/act_common.asset.meta
#	Assets/arts/atlas/ui/act_common.spriteatlas
#	Assets/arts/atlas/ui/act_common.spriteatlas.meta
#	Assets/arts/atlas/ui/common.asset
#	Assets/arts/spines/ui/ui_act_boss_rush_pop.meta
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.atlas.txt.meta
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.png.meta
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.skel.bytes
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.skel.bytes.meta
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_atlas.asset
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_atlas.asset.meta
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_material.mat
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_material.mat.meta
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_skeletondata.asset
#	Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_skeletondata.asset.meta
#	Assets/arts/textures/icon/item/51.png.meta
#	Assets/arts/textures/ui/act_common.meta
#	Assets/arts/textures/ui/act_common/act_common_3.png.meta
#	Assets/arts/textures/ui/act_common/act_common_bg_1.png.meta
#	Assets/arts/textures/ui/act_common/act_common_bg_2.png.meta
#	Assets/arts/textures/ui/act_common/act_common_bg_3.png.meta
#	Assets/arts/textures/ui/act_common/act_common_bg_4.png.meta
#	Assets/arts/textures/ui/act_common/act_common_bg_5.png.meta
#	Assets/arts/textures/ui/act_common/act_common_bg_6.png.meta
#	Assets/arts/textures/ui/act_common/act_common_board_1.png.meta
#	Assets/arts/textures/ui/act_common/act_common_board_2.png.meta
#	Assets/arts/textures/ui/act_common/act_common_board_3.png.meta
#	Assets/arts/textures/ui/act_common/act_common_board_4.png.meta
#	Assets/arts/textures/ui/act_common/act_common_board_5.png.meta
#	Assets/arts/textures/ui/act_common/act_common_dec_1.png.meta
#	Assets/arts/textures/ui/act_common/act_common_line_1.png.meta
#	Assets/arts/textures/ui/act_common/act_common_line_2.png.meta
#	Assets/arts/textures/ui/act_common/act_common_progress_1.png.meta
#	Assets/arts/textures/ui/act_common/act_common_progress_bg.png.meta
#	Assets/arts/textures/ui/act_common/act_common_select.png.meta
#	Assets/arts/textures/ui/act_common/act_fourteen_dec_1.png.meta
#	Assets/arts/textures/ui/act_common/act_fourteen_dec_2.png.meta
#	Assets/arts/textures/ui/common/common_board_126.png.meta
#	Assets/proto/protocol.bytes
2023-09-01 21:19:26 +08:00
xiekaidong
f0889cb678 首领公开赛 2023-09-01 21:10:25 +08:00
Fang
9d6334e76e 新手14天乐 2023-09-01 15:35:31 +08:00
xiekaidong
b9ee339355 界面调整 2023-08-31 20:18:23 +08:00
xiekaidong
81d7dc4bd0 资源和界面 2023-08-31 17:05:18 +08:00
xiekaidong
82b8c6a181 boss_rush 2023-08-30 19:11:51 +08:00
xiekaidong
cd1cea12fa bug修复 2023-08-29 21:04:37 +08:00
xiekaidong
3a690240f9 首领入侵活动界面 2023-08-29 19:03:40 +08:00
xiekaidong
44d66bb6c2 资源检查 2023-08-29 12:23:18 +08:00
xiekaidong
d716440747 界面处理 2023-08-23 17:46:57 +08:00