diff --git a/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll b/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll index a171dd6bd4..a217d0e800 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/Common/DataProcess/elementdataman.cs b/Assets/PerfectWorld/Scripts/Common/DataProcess/elementdataman.cs index a04b82e2a3..4f215c16fd 100644 --- a/Assets/PerfectWorld/Scripts/Common/DataProcess/elementdataman.cs +++ b/Assets/PerfectWorld/Scripts/Common/DataProcess/elementdataman.cs @@ -586,11 +586,11 @@ namespace ModelRenderer.Scripts.GameData add_id_data(ID_SPACE.ID_SPACE_ESSENCE, item.id, item); } - foreach (var item in unionscroll_essence_array) - { - add_id_index(ID_SPACE.ID_SPACE_ESSENCE, item.id, DATA_TYPE.DT_UNIONSCROLL_ESSENCE); - add_id_data(ID_SPACE.ID_SPACE_ESSENCE, item.id, item); - } + //foreach (var item in unionscroll_essence_array) + //{ + // add_id_index(ID_SPACE.ID_SPACE_ESSENCE, item.id, DATA_TYPE.DT_UNIONSCROLL_ESSENCE); + // add_id_data(ID_SPACE.ID_SPACE_ESSENCE, item.id, item); + //} } public void SaveDataToTextFile() diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs b/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs index fdc45082cc..5dd1940d3f 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs @@ -124,22 +124,22 @@ namespace PerfectWorld.Scripts.Managers GameController.Instance.InitCharacter(info); }; string nameScene = "NPCRender"; - /* UnityGameSession.Instance.LoadScene(nameScene, LoadSceneMode.Single, (value) => + UnityGameSession.Instance.LoadScene(nameScene, LoadSceneMode.Single, (value) => { isDoneNPCRender = value; actLoadChar?.Invoke(); }); nameScene = "WorldRender"; UnityGameSession.Instance.LoadScene(nameScene, LoadSceneMode.Additive, (value) => - { - isDoneWorldRender = value; - actLoadChar?.Invoke(); - });*/ - UnityGameSession.Instance.LoadScene("HoangTest", LoadSceneMode.Single, (value) => { isDoneWorldRender = value; actLoadChar?.Invoke(); }); + //UnityGameSession.Instance.LoadScene("HoangTest", LoadSceneMode.Single, (value) => + //{ + // isDoneWorldRender = value; + // actLoadChar?.Invoke(); + //}); return true; } @@ -191,7 +191,7 @@ namespace PerfectWorld.Scripts.Managers { var ob = GameController.Instance.InitCharacter(info); EC_ElsePlayer elsePlayer = ob.AddComponent(); - elsePlayer.GetComponent().enabled = false; + elsePlayer.GetComponent().enabled = false; //init elsePlayer.Init(roleInfo, info); return elsePlayer; diff --git a/Assets/Prefabs/HostPlayer.prefab b/Assets/Prefabs/HostPlayer.prefab index 21128662e4..8edd55e729 100644 --- a/Assets/Prefabs/HostPlayer.prefab +++ b/Assets/Prefabs/HostPlayer.prefab @@ -107,7 +107,7 @@ MonoBehaviour: joystick: {fileID: 0} btnJump: {fileID: 0} btnRun: {fileID: 0} - parentModel: {fileID: 0} + parentModel: {fileID: 78581589932911603} extraGroundDistance: 0.05 radiusEpsilon: 0.005 groundMask: diff --git a/Assets/Scripts/CECHostPlayer.cs b/Assets/Scripts/CECHostPlayer.cs index 04d99612a5..3be2d7435c 100644 --- a/Assets/Scripts/CECHostPlayer.cs +++ b/Assets/Scripts/CECHostPlayer.cs @@ -8,12 +8,12 @@ using System; using System.IO; using System.Text; using TMPro; -using UnityEditor.SearchService; using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.SceneManagement; using UnityEngine.UI; using Scene = UnityEngine.SceneManagement.Scene; +using PerfectWorld.Scripts.Managers; public class CECHostPlayer : MonoBehaviour {