Fix merge conflict

Assets/PerfectWorld/Scripts/Managers/EC_InventoryUI.cs

@@ -9,6 +9,7 @@ using BrewMonster.Network;
 using BrewMonster;
 using BrewMonster.Common;
 using ModelRenderer.Scripts.GameData;
+using PerfectWorld.Scripts.Managers;
 
 namespace BrewMonster.Scripts.Managers
 {

Assets/PerfectWorld/Scripts/Managers/EC_IvtrEquip.cs

@@ -9,6 +9,7 @@ using BrewMonster.Network;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Reflection;
+using BrewMonster.Scripts.Managers;
 
 namespace PerfectWorld.Scripts.Managers
 {

Assets/PerfectWorld/Scripts/UI/ShopItemPanel.cs

@@ -1,3 +1,4 @@
+using BrewMonster.Scripts.Managers;
 using UnityEngine;
 using UnityEngine.UI;
 using TMPro;

Assets/Scenes/NPCRender.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a104c7e42c2924c12843255c6bab3a8b
+guid: 6951bf1cf31a2e440a0131d79978f2f5
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Scripts/CECHostPlayer.cs

@@ -17,6 +17,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text;
+using BrewMonster.Managers;
 using TMPro;
 using UnityEngine;
 using UnityEngine.InputSystem;
@@ -100,7 +101,7 @@ public class CECHostPlayer : CECPlayer
     public void SetModelHostPlayer()
     {
         _pPlayerModel = NPCManager.Instance.GetModelPlayer();
-        Scene scene = SceneManager.GetSceneByName("WorldRender");
+        Scene scene = SceneManager.GetSceneByName("a61");
         SceneManager.MoveGameObjectToScene(_pPlayerModel, scene);
         _pPlayerModel.transform.SetParent(parentModel);
         _pPlayerModel.transform.localPosition = Vector3.zero;
@@ -655,16 +656,16 @@ public class CECHostPlayer : CECPlayer
                 }
             case CommandID.OWN_IVTR_DETAIL_DATA:
             {
-                PerfectWorld.Scripts.Managers.EC_Inventory.LogInventoryPacket("OWN_IVTR_DETAIL_DATA", data, hostId);
+                EC_Inventory.LogInventoryPacket("OWN_IVTR_DETAIL_DATA", data, hostId);
                 // Parse and store
                 if (data != null && data.Length >= 6)
                 {
                     byte byPackage = data[0];
                     byte ivtrSize = data[1];
-                    if (PerfectWorld.Scripts.Managers.EC_IvtrItem.TryParseInventoryDetail(data, out var pkg,
+                    if (EC_IvtrItem.TryParseInventoryDetail(data, out var pkg,
                             out var size, out var items))
                     {
-                        PerfectWorld.Scripts.Managers.EC_Inventory.UpdatePack(pkg, size, items);
+                        EC_Inventory.UpdatePack(pkg, size, items);
                     }
                 }
 
@@ -677,7 +678,7 @@ public class CECHostPlayer : CECPlayer
                     try
                     {
                         var money = GPDataTypeHelper.FromBytes<CSNetwork.GPDataType.cmd_get_own_money>(data);
-                        var ui = GameObject.FindFirstObjectByType<PerfectWorld.Scripts.Managers.EC_InventoryUI>();
+                        var ui = GameObject.FindFirstObjectByType<EC_InventoryUI>();
                         if (ui != null)
                         {
                             ui.UpdateMoney(money.amount, money.max_amount);
@@ -697,7 +698,7 @@ public class CECHostPlayer : CECPlayer
                     try
                     {
                         var cash = GPDataTypeHelper.FromBytes<CSNetwork.GPDataType.player_cash>(data);
-                        var ui = GameObject.FindFirstObjectByType<PerfectWorld.Scripts.Managers.EC_InventoryUI>();
+                        var ui = GameObject.FindFirstObjectByType<EC_InventoryUI>();
                         if (ui != null)
                         {
                             ui.UpdateCash(cash.cash_amount);