This commit is contained in:
VDH
2025-10-09 14:06:12 +07:00
parent c71e943ab7
commit 7c5652ec2e
19 changed files with 255 additions and 46 deletions
+1 -2
View File
@@ -18,7 +18,7 @@ using UnityEngine.SceneManagement;
using UnityEngine.UI;
using Scene = UnityEngine.SceneManagement.Scene;
public class CECHostPlayer : EC_Player
public class CECHostPlayer : CECPlayer
{
[SerializeField] private TextMeshPro txtName;
[SerializeField] private CharacterController controller;
@@ -468,7 +468,6 @@ public class CECHostPlayer : EC_Player
if (txtName != null) txtName.text = roleName;
transform.position = pos;
SetModelHostPlayer();
Debug.LogError("Pos Character = " + pos);
joystick = FindAnyObjectByType<Joystick>();
EventBus.Subscribe<JoystickRealeaseEvent>(JoystickRelease);
EventBus.Subscribe<JoystickPressEvent>(JoystickStartDrag);
+1 -1
View File
@@ -4,7 +4,7 @@ using System;
using System.Collections;
using System.Runtime.InteropServices;
using UnityEngine;
using static EC_Player;
using static CECPlayer;
public static class EC_Utility
{
+1 -1
View File
@@ -54,7 +54,7 @@ public class GameController : MonoBehaviour
Debug.LogError("null prefab");
return;
}
EC_Player.InitStaticRes();
CECPlayer.InitStaticRes();
hostPlayer = Instantiate(characterPrefab, transform);
hostPlayer.InitCharacter(info);
cinemachineCamera.Follow = hostPlayer.transform;
+2 -2
View File
@@ -5,11 +5,11 @@ public class InitializePlayer /*: IAutoInitialize*/
{
public void Dispose()
{
EC_Player.Dispose();
CECPlayer.Dispose();
}
public void Initialize()
{
EC_Player.InitStaticRes();
CECPlayer.InitStaticRes();
}
}
@@ -46,6 +46,9 @@ public abstract class EC_Player : CECObject
public bool IsDead(){ return (m_dwStates & PlayerNPCState.GP_STATE_CORPSE) != 0; }
public bool IsValidAction(int iIndex) { return (iIndex >= 0 && iIndex < (int)PLAYER_ACTION_TYPE.ACT_MAX) ? true : false; }
public int GetCharacterID() { return m_PlayerInfo.cid; }
private static void BuildActionList()
{
if (_default_actions == null)
+2
View File
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 041192bec8f11c747a80df312c2df184
-2
View File
@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: be4a22babee7846459b0421234a44c99
@@ -1,5 +1,5 @@
using UnityEngine;
using static EC_Player;
using static CECPlayer;
public class PlayerIdleState : PlayerState
{
@@ -1,5 +1,5 @@
using UnityEngine;
using static EC_Player;
using static CECPlayer;
public class PlayerMoveState : PlayerState
{
+1 -1
View File
@@ -23,7 +23,7 @@ public class PlayerVisual : MonoBehaviour
BrewMonster.BMLogger.LogError("animancer == null");
return;
}
var player = GetComponentInParent<EC_Player>();
var player = GetComponentInParent<CECPlayer>();
if(player == null)
{
BrewMonster.BMLogger.LogError("player == null");