diff --git a/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll b/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll index bef3baecb2..e70f2e7371 100644 Binary files a/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll and b/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll differ diff --git a/Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs b/Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs index da3250d343..f2dc05e6cb 100644 --- a/Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs +++ b/Assets/PerfectWorld/Scripts/UI/Login/LoginScreenUI.cs @@ -49,8 +49,8 @@ namespace BrewMonster.UI #if UNITY_EDITOR if (Input.GetKeyUp(KeyCode.LeftAlt)) { - _usernameInputField.text = "dddd"; - _passwordInputField.text = "dddd"; + _usernameInputField.text = "test025"; + _passwordInputField.text = "123456"; } #endif } diff --git a/Assets/Scripts/CECHostPlayer.cs b/Assets/Scripts/CECHostPlayer.cs index acb4b15b73..90060ecd48 100644 --- a/Assets/Scripts/CECHostPlayer.cs +++ b/Assets/Scripts/CECHostPlayer.cs @@ -3,18 +3,19 @@ using CSNetwork; using CSNetwork.GPDataType; using CSNetwork.Protocols; using CSNetwork.Protocols.RPCData; +using PerfectWorld.Scripts.Managers; +using PerfectWorld.Scripts.Task; using System; using System.IO; +using System.Runtime.InteropServices; using System.Text; using TMPro; +using Unity.VisualScripting; using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.SceneManagement; using UnityEngine.UI; using Scene = UnityEngine.SceneManagement.Scene; -using System.Runtime.InteropServices; -using Unity.VisualScripting; -using PerfectWorld.Scripts.Managers; public class CECHostPlayer : EC_Player { @@ -196,7 +197,8 @@ public class CECHostPlayer : EC_Player public void ProcessMessage(in ECMSG Msg) { Debug.LogWarning("HoangDev : ProcessMessageProcessMessageProcessMessage"); - switch ((int)Msg.dwMsg) + var msg = (int)Msg.dwMsg; + switch (msg) { case int value when value == EC_MsgDef.MSG_HST_CORRECTPOS: OnMsgHstCorrectPos(Msg); break; case int value when value == EC_MsgDef.MSG_HST_GOTO: OnMsgHstGoto(Msg); break; @@ -210,6 +212,13 @@ public class CECHostPlayer : EC_Player OnMsgHstOwnItemInfo(Msg); break; } + + case int value when value == EC_MsgDef.MSG_HST_TASKDATA: + { + OnMsgHstTaskData(Msg); + Debug.LogError("[Dat]- OnMsgHstTaskData"); + break; + } } } public void OnMsgHstOwnItemInfo(ECMSG Msg) @@ -336,6 +345,83 @@ public class CECHostPlayer : EC_Player SetModelHostPlayer(); Debug.LogError("Pos Character = " + pos); } + + #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); + + 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 } public enum StateAnim diff --git a/Assets/Scripts/Task/ATaskTemplMan.cs b/Assets/Scripts/Task/ATaskTemplMan.cs index e6e86a2a4c..363c3d3fa1 100644 --- a/Assets/Scripts/Task/ATaskTemplMan.cs +++ b/Assets/Scripts/Task/ATaskTemplMan.cs @@ -1,5 +1,6 @@ -using System.IO; +using ModelRenderer.Scripts.GameData; using System.Collections.Generic; +using System.IO; using UnityEngine; namespace PerfectWorld.Scripts.Task @@ -30,9 +31,15 @@ namespace PerfectWorld.Scripts.Task private List m_SkillTaskLst = new List(); private List m_TmLmtChkLst = new List(); + private elementdataman m_pEleDataMan; + public void Release() { + } + public void Init(elementdataman pMan) + { + m_pEleDataMan = pMan; } public bool LoadTasksFromPack(string szPackPath, bool bLoadDescript) {