32 Commits

Author SHA1 Message Date
puxuan
cdae7019c7 邮箱 2025-10-27 11:51:58 +08:00
puxuan
6f3d42635e 资源整理 2025-10-24 12:02:08 +08:00
puxuan
2dc4bdae98 res 2025-10-23 17:17:49 +08:00
puxuan
418dd48412 资源整理 2025-10-23 17:14:08 +08:00
puxuan
0e44ceaff7 资源整理 2025-10-23 16:10:53 +08:00
puxuan
049a754327 副本 2025-10-22 11:14:43 +08:00
puxuan
c09deb3f35 res 2025-10-20 14:47:37 +08:00
puxuan
2ee6438cfc fix bug 2025-10-15 20:04:36 +08:00
puxuan
6d5a74b44c fix bug 2025-10-13 18:23:24 +08:00
puxuan
a3771c610b 升级 2025-10-09 17:29:10 +08:00
puxuan
b95a8b1378 hero 2025-10-08 10:55:47 +08:00
puxuan
e91c3d797d 冲刺活动 2025-09-25 20:13:36 +08:00
puxuan
08d3ed2d7e 商店 2025-09-24 16:23:21 +08:00
puxuan
2c8a5f70e5 res 2025-08-08 14:19:46 +08:00
puxuan
4ce72abeb5 res 2025-08-04 18:49:43 +08:00
kai
4fb30c128d 每日挑战 2025-07-16 21:56:44 +08:00
kai
4429fb0e24 竞技场 2025-07-13 23:09:23 +08:00
kai
986b121df4 升级引擎 2025-04-30 23:12:28 +08:00
xiekaidong
16d550aefa 设置abname 2023-10-09 16:01:10 +08:00
Fang
e1a49e73d9 波次锦标赛 2023-09-27 18:54:16 +08:00
xiekaidong
00e53beccd 设置abname 2023-09-20 17:44:40 +08:00
xiekaidong
6cfbfbbe50 资源替换 2023-09-19 16:43: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
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
Fang
769cfbe34d 圆月活动 2023-09-15 19:23:25 +08:00
xiekaidong
1c44759790 资源 2023-09-15 17:27:22 +08:00
xiekaidong
00c9bd3bfe 还原资源 2023-09-13 10:46:12 +08:00
xiekaidong
bd58628e2d 更新资源 2023-09-12 14:41:23 +08:00
xiekaidong
4da792de57 更新资源 2023-09-09 16:13:44 +08:00
xiekaidong
e936d45746 设置abname 2023-09-05 20:55:51 +08:00
xiekaidong
29f0e84ee0 14天丢图问题 2023-09-04 17:50:47 +08:00
xiekaidong
81d7dc4bd0 资源和界面 2023-08-31 17:05:18 +08:00