duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update show elesplayer after merge from develop.

Browse Source
This commit is contained in:
Tungdv
2025-09-13 16:48:27 +07:00
parent 0252370c2b
commit 864dee7196
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll
BIN
View File
Binary file not shown.
Assets/PerfectWorld/Scripts/Common/DataProcess/elementdataman.cs
+5 -5
View File
@@ -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()
Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs
+7 -7
View File
@@ -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<EC_ElsePlayer>();
elsePlayer.GetComponent<CharacterCtrl>().enabled = false;
elsePlayer.GetComponent<CECHostPlayer>().enabled = false;
//init
elsePlayer.Init(roleInfo, info);
return elsePlayer;
Assets/Prefabs/HostPlayer.prefab
+1 -1
View File
@@ -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:
Assets/Scripts/CECHostPlayer.cs
+1 -1
View File
@@ -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
{