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 |
|
xiekaidong
|
1f6c432163
|
界面调整
|
2023-08-23 17:37:07 +08:00 |
|
xiekaidong
|
6441196517
|
一些描述
|
2023-08-18 18:36:08 +08:00 |
|
xiekaidong
|
02481f50b4
|
英雄基金
|
2023-08-18 18:08:58 +08:00 |
|
xiekaidong
|
cd3a75c78f
|
英雄基金
|
2023-08-18 11:38:26 +08:00 |
|
xiekaidong
|
f8c3dc9bb0
|
界面和协议
|
2023-08-17 18:15:39 +08:00 |
|
xiekaidong
|
81f6b85711
|
界面
|
2023-08-16 18:08:49 +08:00 |
|
xiekaidong
|
44becf62dd
|
设置abName
|
2023-08-15 21:43:21 +08:00 |
|
Fang
|
1e7440d170
|
夏日活动上报
|
2023-08-15 20:32:37 +08:00 |
|
xiekaidong
|
3527846c69
|
资源检查
|
2023-08-15 19:51:06 +08:00 |
|
xiekaidong
|
c597e71285
|
优化
|
2023-08-15 19:41:11 +08:00 |
|
Fang
|
3b4a03cde8
|
多语言遮挡处理
|
2023-08-15 16:17:49 +08:00 |
|
xiekaidong
|
cc6508dc20
|
金猪界面
|
2023-08-14 14:54:21 +08:00 |
|
Fang
|
0aba4ec004
|
更表
|
2023-08-14 09:50:16 +08:00 |
|
Fang
|
d8c5fb61a3
|
资源替换
|
2023-08-11 17:02:46 +08:00 |
|
Fang
|
51891b4d27
|
夏日活动功能
|
2023-08-11 12:00:11 +08:00 |
|
xiekaidong
|
519bda505a
|
金猪
|
2023-08-09 10:21:52 +08:00 |
|
Fang
|
7afa4042e6
|
超框处理
|
2023-06-20 18:03:33 +08:00 |
|
chenxi
|
8d9b16604b
|
资源修复
|
2023-06-16 21:53:59 +08:00 |
|
chenxi
|
14167e5736
|
金猪倒计时
|
2023-06-13 12:00:06 +08:00 |
|
chenxi
|
d1ec620837
|
资源自动处理和ab name
|
2023-06-05 19:19:17 +08:00 |
|
chenxi
|
54919c6898
|
七天乐界面
|
2023-06-05 18:08:18 +08:00 |
|
chenxi
|
7963b91bbd
|
七天乐换界面
|
2023-06-05 17:57:32 +08:00 |
|
chenxi
|
2f6f2861b8
|
金猪动画
|
2023-06-05 15:08:25 +08:00 |
|
chenxi
|
86a321a568
|
七天乐界面调整
|
2023-05-31 10:12:26 +08:00 |
|
chenxi
|
8834252c36
|
七天乐宝箱
|
2023-05-31 10:00:52 +08:00 |
|
chenxi
|
e6e294b949
|
七天乐
|
2023-05-30 22:23:55 +08:00 |
|
chenxi
|
a58c63a617
|
ab name
|
2023-05-30 21:15:29 +08:00 |
|
chenxi
|
3b85a8f27d
|
资源纠正
|
2023-05-30 21:12:21 +08:00 |
|
chenxi
|
42395ab955
|
七天乐天数不够时的表现
|
2023-05-30 19:14:56 +08:00 |
|
chenxi
|
cb42d1531b
|
七天乐
|
2023-05-26 11:40:00 +08:00 |
|
chenxi
|
02634ab2b9
|
金猪和邮件
|
2023-05-23 17:04:22 +08:00 |
|
chenxi
|
f34a609721
|
邮件
|
2023-05-22 21:24:03 +08:00 |
|
chenxi
|
9e218fa88a
|
ui
|
2023-05-08 20:10:51 +08:00 |
|