diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs b/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs index 5f4639a771..56cf86dbab 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs +++ b/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs @@ -22,7 +22,7 @@ namespace PerfectWorld.Scripts.Managers { case int value when value == EC_MsgDef.MSG_PM_PLAYERINFO: { - OnMsgPlayerInfo(Msg); + OnMsgPlayerInfo(Msg); break; } } diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs.meta b/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs.meta index 782b456924..619444ef80 100644 --- a/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs.meta +++ b/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs.meta @@ -1,3 +1,2 @@ fileFormatVersion: 2 -guid: c6724bce59c34aa1bd3743616e212661 -timeCreated: 1757145906 \ No newline at end of file +guid: be722834fd1fd9d49a39b91b5d19bfdb \ No newline at end of file diff --git a/Assets/PerfectWorld/Scripts/Network/EC_ManMessageMono.cs b/Assets/PerfectWorld/Scripts/Network/EC_ManMessageMono.cs index b9f88e7d88..f575b38747 100644 --- a/Assets/PerfectWorld/Scripts/Network/EC_ManMessageMono.cs +++ b/Assets/PerfectWorld/Scripts/Network/EC_ManMessageMono.cs @@ -13,7 +13,6 @@ namespace BrewMonster EC_ManMessage.RegisterHandler(new EC_ManPlayer()); } - private void Update() { EC_ManMessage.Tick(); diff --git a/Assets/Prefabs/HostPlayer.prefab b/Assets/Prefabs/HostPlayer.prefab new file mode 100644 index 0000000000..64253e1ac2 --- /dev/null +++ b/Assets/Prefabs/HostPlayer.prefab @@ -0,0 +1,116 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5826062684364525110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 78581589932911603} + m_Layer: 3 + m_Name: Model + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &78581589932911603 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5826062684364525110} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5695237227048099898} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6513559496054861882 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5695237227048099898} + - component: {fileID: 2967440448469171042} + - component: {fileID: 2038764726549499828} + m_Layer: 3 + m_Name: HostPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5695237227048099898 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6513559496054861882} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -769.91, y: 45.8, z: -258.54} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 78581589932911603} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!143 &2967440448469171042 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6513559496054861882} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Height: 1.85 + m_Radius: 0.35 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.02 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 0.9, z: 0} +--- !u!114 &2038764726549499828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6513559496054861882} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0525de198450e14f9f6ad854b95ec99, type: 3} + m_Name: + m_EditorClassIdentifier: + txtName: {fileID: 0} + controller: {fileID: 2967440448469171042} + animator: {fileID: 0} + joystick: {fileID: 0} + btnJump: {fileID: 0} + btnRun: {fileID: 0} + extraGroundDistance: 0.05 + radiusEpsilon: 0.005 + groundMask: + serializedVersion: 2 + m_Bits: 1 + slopeToleranceDeg: 2 diff --git a/Assets/Prefabs/HostPlayer.prefab.meta b/Assets/Prefabs/HostPlayer.prefab.meta new file mode 100644 index 0000000000..d31222bcd5 --- /dev/null +++ b/Assets/Prefabs/HostPlayer.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1f80fef119a826b4a826baf52a8f92d7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/NPCRender.unity b/Assets/Scenes/NPCRender.unity index 0118dbc426..a1bdd1873a 100644 --- a/Assets/Scenes/NPCRender.unity +++ b/Assets/Scenes/NPCRender.unity @@ -6531,6 +6531,37 @@ Transform: - {fileID: 1528166630} m_Father: {fileID: 555039865} m_LocalEulerAnglesHint: {x: 0.188637, y: 12.439334, z: 2.6068187} +--- !u!1 &94992906 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 94992907} + m_Layer: 3 + m_Name: Model + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &94992907 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 94992906} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 618584484} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &95687290 GameObject: m_ObjectHideFlags: 0 @@ -47098,6 +47129,89 @@ Texture2D: offset: 0 size: 0 path: +--- !u!1 &618584481 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 618584484} + - component: {fileID: 618584483} + - component: {fileID: 618584482} + m_Layer: 3 + m_Name: HostPlayer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &618584482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 618584481} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0525de198450e14f9f6ad854b95ec99, type: 3} + m_Name: + m_EditorClassIdentifier: + txtName: {fileID: 0} + controller: {fileID: 618584483} + animator: {fileID: 0} + joystick: {fileID: 828724102} + btnJump: {fileID: 0} + btnRun: {fileID: 0} + extraGroundDistance: 0.05 + radiusEpsilon: 0.005 + groundMask: + serializedVersion: 2 + m_Bits: 1 + slopeToleranceDeg: 2 +--- !u!143 &618584483 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 618584481} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Height: 1.85 + m_Radius: 0.35 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.02 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 0.9, z: 0} +--- !u!4 &618584484 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 618584481} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -769.91, y: 45.8, z: -258.54} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 94992907} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &618638715 GameObject: m_ObjectHideFlags: 0 @@ -77248,8 +77362,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 19544887} - {fileID: 864245633} + - {fileID: 19544887} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!143 &960760105 @@ -77295,12 +77409,12 @@ MonoBehaviour: joystick: {fileID: 828724102} btnJump: {fileID: 0} btnRun: {fileID: 0} - isGrounded: 0 extraGroundDistance: 0.05 radiusEpsilon: 0.005 groundMask: serializedVersion: 2 m_Bits: 1 + slopeToleranceDeg: 2 --- !u!1 &961990122 GameObject: m_ObjectHideFlags: 0 @@ -162500,7 +162614,8 @@ SceneRoots: - {fileID: 1044981097} - {fileID: 1448496991} - {fileID: 519894255} - - {fileID: 960760104} - {fileID: 1801883899} - {fileID: 1755699698} - {fileID: 96894795} + - {fileID: 960760104} + - {fileID: 618584484} diff --git a/Assets/Scripts/CharacterCtrl.cs b/Assets/Scripts/CharacterCtrl.cs index 7595db959c..28639d1475 100644 --- a/Assets/Scripts/CharacterCtrl.cs +++ b/Assets/Scripts/CharacterCtrl.cs @@ -24,8 +24,9 @@ public class CharacterCtrl : MonoBehaviour float gravityValue = -9.81f; StateAnim stateAnim = StateAnim.Idle; Vector3 playerVelocity; - [SerializeField] bool isGrounded = false; + bool isGrounded = false; bool isRun = false; + GameObject modle; // ====== Ground cast config ====== [Header("Ground Cast")] @@ -53,8 +54,12 @@ public class CharacterCtrl : MonoBehaviour ccRadius = controller.radius; ccSkin = controller.skinWidth; } + SetModelHostPlayer(); + } + public void SetModelHostPlayer() + { + //modle = } - private void Start() { playerStateMachine.InitState(moveState);