fix merge

2025-11-24 11:09:11 +07:00
parent ae94300b0f
commit 1e34f48215
3 changed files with 2453 additions and 2382 deletions
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:Assets/PerfectWorld/Editor.meta
-guid: 75a0cc0fd8902794a883916febf9855b
+guid: 7b6ba20c81b136a4aac2dfea2b936886
 ========
 guid: f0e041e8264a83545bf6e555757c9851
 >>>>>>>> develop:Assets/PerfectWorld/Config.meta
@@ -98,8 +98,6 @@ namespace BrewMonster


                m_pTaskInterface.CheckPQEnterWorldInit();
-#endif
-
                // check if player has equipped goblin (not yet implemented in C#)
                // TODO: implement goblin initialization when equipment system is ready