puxuan
|
00b2a50ddb
|
Merge branch 'dev' into dev_spine
|
2025-05-18 22:39:37 +08:00 |
|
puxuan
|
43222b0299
|
主界面
|
2025-05-13 00:12:08 +08:00 |
|
puxuan
|
54843c5417
|
spine
|
2025-05-06 20:44:39 +08:00 |
|
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
|
1b3c0bc18b
|
帮助界面滚动fix
|
2023-09-28 15:26: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
|
4f9e75da7a
|
显示fix
|
2023-09-20 16:52:02 +08:00 |
|
xiekaidong
|
f93c89c162
|
修改
|
2023-09-20 11:46:41 +08:00 |
|
xiekaidong
|
71b7f13375
|
更新资源
|
2023-09-20 09:36:28 +08:00 |
|
Fang
|
22a2bb1a5e
|
新号圆月活动请求fix、符文材料个数显示修改
|
2023-09-19 20:53:05 +08:00 |
|
Fang
|
4756312d3c
|
超框处理
|
2023-09-19 18:45:28 +08:00 |
|
Fang
|
f40b937012
|
更表、超框处理
|
2023-09-19 18:31:31 +08:00 |
|
xiekaidong
|
0942c88d19
|
设置
|
2023-09-19 11:24:01 +08:00 |
|
Fang
|
299b03213f
|
1
|
2023-09-19 10:44:56 +08:00 |
|
Fang
|
6266224727
|
预制体修改
|
2023-09-19 10:42:33 +08:00 |
|
Fang
|
e4b953c193
|
导入资源
|
2023-09-19 10:40:16 +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
|
37ec3978b5
|
fix
|
2023-09-18 18:40:27 +08:00 |
|
Fang
|
29526815ba
|
ui布局调整
|
2023-09-18 18:03:54 +08:00 |
|
Fang
|
b92f858295
|
界面优化
|
2023-09-18 16:38:04 +08:00 |
|
Fang
|
448aa0659e
|
符文自动淬炼修改、特效完善
|
2023-09-18 14:57:00 +08:00 |
|
xiekaidong
|
b6345dce5a
|
Merge branch 'master' into dev_20230919
# Conflicts:
# Assets/arts/atlas/ui/common.asset
# Assets/arts/textures/ui/common/common_lock_1.png
# Assets/arts/textures/ui/common/common_lock_1.png.meta
# Assets/lua/app/module/battle/controller/battle_base_controller.lua.bytes
# Assets/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua.bytes
# Assets/lua/app/userdata/battle/battle_base_data.lua.bytes
|
2023-09-18 14:51:32 +08:00 |
|
xiekaidong
|
94f5ea647f
|
界面调整
|
2023-09-18 12:02:52 +08:00 |
|
xiekaidong
|
79c4fd7907
|
优化显示
|
2023-09-18 11:40:53 +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
|
bdcf3f995b
|
优化
|
2023-09-16 18:13:32 +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
|
ab0c8d0559
|
buff层级
|
2023-09-15 17:43:23 +08:00 |
|
xiekaidong
|
1c44759790
|
资源
|
2023-09-15 17:27:22 +08:00 |
|
xiekaidong
|
1275c6494f
|
界面
|
2023-09-14 21:13:25 +08:00 |
|