13 Commits

Author SHA1 Message Date
kai
986b121df4 升级引擎 2025-04-30 23:12:28 +08:00
xiekaidong
00e53beccd 设置abname 2023-09-20 17:44:40 +08:00
xiekaidong
07c3c5334a 替换资源 2023-09-20 17:24:21 +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
Fang
ebf9ec6209 导入符文解锁图片资源 2023-09-15 15:29:24 +08:00
xiekaidong
4da792de57 更新资源 2023-09-09 16:13:44 +08:00
xiekaidong
0cbb46e649 设置adName 2023-07-25 22:15:06 +08:00
xiekaidong
a3ab8f74fa 副本引导 2023-07-24 17:10:59 +08:00
xiekaidong
84ae5c96c6 出包前得资源检查和设置abName 2023-07-07 16:04:44 +08:00
xiekaidong
18f5489ddb 更新资源 2023-07-05 15:35:59 +08:00
CloudJ
ab33223ea6 编译 2023-06-05 14:10:56 +08:00
chenxi
9679058a5f ab name 2023-06-01 20:42:28 +08:00
chenxi
6d8fd7bf5e 功能解锁图标 2023-05-31 20:55:01 +08:00