From 271bb0d787a45478bd5c009eab268f128c073beb Mon Sep 17 00:00:00 2001
From: MinhHai <minh.hai@playsync.net>
Date: Wed, 12 Nov 2025 17:14:39 +0700
Subject: [PATCH] fix conflict

---
 Assets/PerfectWorld/Scripts/Move/CECPlayer.cs |  2 +-
 Assets/Scripts/CECHostPlayer.Task.cs          |  8 +-
 Assets/Scripts/CECHostPlayer.cs               | 76 +------------------
 3 files changed, 9 insertions(+), 77 deletions(-)

diff --git a/Assets/PerfectWorld/Scripts/Move/CECPlayer.cs b/Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
index ed5c055d9e..a7e9ab9284 100644
--- a/Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
+++ b/Assets/PerfectWorld/Scripts/Move/CECPlayer.cs
@@ -16,7 +16,7 @@ using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
-public abstract class CECPlayer : CECObject
+public abstract partial class CECPlayer : CECObject
 {
     [SerializeField] protected Transform parentModel;
     [SerializeField] protected TextMeshProUGUI txtName;
diff --git a/Assets/Scripts/CECHostPlayer.Task.cs b/Assets/Scripts/CECHostPlayer.Task.cs
index b7f9f1ad64..a4c9e519f9 100644
--- a/Assets/Scripts/CECHostPlayer.Task.cs
+++ b/Assets/Scripts/CECHostPlayer.Task.cs
@@ -21,10 +21,11 @@ public struct CONTRIB_INFO
 	// }
 }
 
-	public partial class CECHostPlayer 
+public partial class CECHostPlayer 
 {
     private int				m_idTradePlayer;	//	ID of player who is trading with us
     private CECTaskInterface m_pTaskInterface;
+    private int				m_iBoothState;		//	Booth state. 0, none; 1, prepare; 2, open booth; 3, visite other's booth
     private CONTRIB_INFO m_contribInfo;
     
     public CECTaskInterface GetTaskInterface()
@@ -40,6 +41,11 @@ public struct CONTRIB_INFO
         return m_contribInfo;
     }
     
+    public int GetBoothState()
+	{
+		return m_iBoothState;
+	}
+    
     private void OnMsgHstTaskData(ECMSG Msg)
     {
 	    // decode header to distinguish TASK_DATA vs TASK_VAR_DATA
diff --git a/Assets/Scripts/CECHostPlayer.cs b/Assets/Scripts/CECHostPlayer.cs
index f55887d34c..dc3676ce73 100644
--- a/Assets/Scripts/CECHostPlayer.cs
+++ b/Assets/Scripts/CECHostPlayer.cs
@@ -1170,81 +1170,7 @@ public partial class CECHostPlayer : CECPlayer
 
     #region Task
 
-    public void OnMsgHstTaskData(ECMSG Msg)
-    {
-        int cmd = Convert.ToInt32(Msg.dwParam2);
-        if (cmd == CommandID.TASK_DATA)
-        {
-            //Debug.Log("[Dat]- OnMsgHstTaskData- TASK_DATA");
-            //a_LogOutput(1, "[Dat]- EC_HostMsg- OnMsgHstTaskData- TASK_DATA");
-            //cmd_task_data* pCmd = (cmd_task_data*)Msg.dwParam1;
-            //ASSERT(pCmd);
-
-            //int iActiveListSize = (int)pCmd.active_list_size;
-            //BYTE* pData = (BYTE*)pCmd + sizeof(size_t);
-            //void* pActiveListbuf = pData;
-            //pData += iActiveListSize;
-
-            //int iFinishedListSize = *(int*)pData;
-            //pData += sizeof(int);
-            //void* pFinishedListBuf = pData;
-            //pData += iFinishedListSize;
-
-            //int iFinishTimeListSize = *(int*)pData;
-            //pData += sizeof(int);
-            //void* pFinishTimeListBuf = pData;
-            //pData += iFinishTimeListSize;
-
-            //int iFinishedCountListSize = *(int*)pData;
-            //pData += sizeof(int);
-            //void* pFinishedCountListBuf = pData;
-            //pData += iFinishedCountListSize;
-
-            //int iStorageTasksListSize = *(int*)pData;
-            //pData += sizeof(int);
-            //void* pStorageTaskListBuf = pData;
-            //pData += iStorageTasksListSize;
-
-            //A3DRELEASE(m_pTaskInterface);
-
-            //todo
-            //var m_pTaskInterface = new CECTaskInterface(this);
-
-            //if (!m_pTaskInterface.Init(null, 0, null, 0,
-            //                            null, 0, null, 0, null, 0))
-            //{
-            //    //a_LogOutput(1, "CECHostPlayer::OnMsgHstTaskData, failed to initialize task interface");
-            //    return;
-            //}
-
-            //m_pTaskInterface.CheckPQEnterWorldInit();
-
-            ////  check if player has equipped goblin 
-            //if (m_pEquipPack.GetItem(EQUIPIVTR_GOBLIN) != NULL)
-            //{
-            //    CECIvtrGoblin* pIvtrGoblin = (CECIvtrGoblin*)m_pEquipPack.GetItem(EQUIPIVTR_GOBLIN);
-            //    m_pGoblin = new CECHostGoblin();
-            //    m_pGoblin.Init(pIvtrGoblin.GetTemplateID(), pIvtrGoblin, this);
-            //}
-
-            ////	Note: this command now is also used as the end flag of responding
-            ////		for GET_ALL_DATA request
-            //g_pGame.GetGameSession().LoadConfigData();
-
-            ////	¸ù¾Ý×°±¸°ü¹ü¸üÐÂ×°±¸¼¼Äܵ½¼¼ÄÜÁбí
-            //if (UpdateEquipSkills())
-            //    UpdateEquipSkillCoolDown();
-        }
-        else if (cmd == CommandID.TASK_VAR_DATA)
-        {
-            //cmd_task_var_data* pCmd = (cmd_task_var_data*)Msg.dwParam1;
-            //ASSERT(pCmd);
-            //if (m_pTaskInterface)
-            //    OnServerNotify(m_pTaskInterface, pCmd.data, pCmd.size);
-            //else
-            //    ASSERT(m_pTaskInterface);
-        }
-    }
+    
 
     #endregion