diff --git a/Assets/NetworkLib.meta b/Assets/NetworkLib.meta new file mode 100644 index 0000000000..5b4e6dc27e --- /dev/null +++ b/Assets/NetworkLib.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 95c82a23114631b428b9fff51c373a39 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NetworkLib/Debug.meta b/Assets/NetworkLib/Debug.meta new file mode 100644 index 0000000000..a8ef706c49 --- /dev/null +++ b/Assets/NetworkLib/Debug.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bac3638b875256b479fb1e463c6e213d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NetworkLib/Debug/netstandard2.1.meta b/Assets/NetworkLib/Debug/netstandard2.1.meta new file mode 100644 index 0000000000..d87e17ade3 --- /dev/null +++ b/Assets/NetworkLib/Debug/netstandard2.1.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 464b57f0bb61a1143a27580c5fe83dca +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.deps.json b/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.deps.json new file mode 100644 index 0000000000..4e00fa23a5 --- /dev/null +++ b/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.deps.json @@ -0,0 +1,130 @@ +{ + "runtimeTarget": { + "name": ".NETStandard,Version=v2.1/", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETStandard,Version=v2.1": {}, + ".NETStandard,Version=v2.1/": { + "CSNetwork/1.0.0": { + "dependencies": { + "System.Reflection.Metadata": "9.0.8" + }, + "runtime": { + "CSNetwork.dll": {} + } + }, + "System.Buffers/4.5.1": { + "runtime": { + "lib/netstandard2.0/System.Buffers.dll": { + "assemblyVersion": "4.0.3.0", + "fileVersion": "4.6.28619.1" + } + } + }, + "System.Collections.Immutable/9.0.8": { + "dependencies": { + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + }, + "runtime": { + "lib/netstandard2.0/System.Collections.Immutable.dll": { + "assemblyVersion": "9.0.0.0", + "fileVersion": "9.0.825.36511" + } + } + }, + "System.Memory/4.5.5": { + "dependencies": { + "System.Buffers": "4.5.1", + "System.Numerics.Vectors": "4.4.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + }, + "runtime": { + "lib/netstandard2.0/System.Memory.dll": { + "assemblyVersion": "4.0.1.2", + "fileVersion": "4.6.31308.1" + } + } + }, + "System.Numerics.Vectors/4.4.0": { + "runtime": { + "lib/netstandard2.0/System.Numerics.Vectors.dll": { + "assemblyVersion": "4.1.3.0", + "fileVersion": "4.6.25519.3" + } + } + }, + "System.Reflection.Metadata/9.0.8": { + "dependencies": { + "System.Collections.Immutable": "9.0.8", + "System.Memory": "4.5.5" + }, + "runtime": { + "lib/netstandard2.0/System.Reflection.Metadata.dll": { + "assemblyVersion": "9.0.0.0", + "fileVersion": "9.0.825.36511" + } + } + }, + "System.Runtime.CompilerServices.Unsafe/6.0.0": { + "runtime": { + "lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll": { + "assemblyVersion": "6.0.0.0", + "fileVersion": "6.0.21.52210" + } + } + } + } + }, + "libraries": { + "CSNetwork/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "System.Buffers/4.5.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==", + "path": "system.buffers/4.5.1", + "hashPath": "system.buffers.4.5.1.nupkg.sha512" + }, + "System.Collections.Immutable/9.0.8": { + "type": "package", + "serviceable": true, + "sha512": "sha512-Eje6exD7AGKPg5SIkmjyWTBq0KK6SpfTBfdFUmpGG07mNbYimFJ+jyVnILcs0ikFOXoYTBpBOxKYgAk2hhjYOw==", + "path": "system.collections.immutable/9.0.8", + "hashPath": "system.collections.immutable.9.0.8.nupkg.sha512" + }, + "System.Memory/4.5.5": { + "type": "package", + "serviceable": true, + "sha512": "sha512-XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "path": "system.memory/4.5.5", + "hashPath": "system.memory.4.5.5.nupkg.sha512" + }, + "System.Numerics.Vectors/4.4.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==", + "path": "system.numerics.vectors/4.4.0", + "hashPath": "system.numerics.vectors.4.4.0.nupkg.sha512" + }, + "System.Reflection.Metadata/9.0.8": { + "type": "package", + "serviceable": true, + "sha512": "sha512-oJQezcASFomKvSp+06pzvSFRTnzdUJtiO19peAdZ9RwiqZinBV56u7zW5fEGf2/VrQFL3qZSV7UapgG31XRWQA==", + "path": "system.reflection.metadata/9.0.8", + "hashPath": "system.reflection.metadata.9.0.8.nupkg.sha512" + }, + "System.Runtime.CompilerServices.Unsafe/6.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==", + "path": "system.runtime.compilerservices.unsafe/6.0.0", + "hashPath": "system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.deps.json.meta b/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.deps.json.meta new file mode 100644 index 0000000000..8a5f87f538 --- /dev/null +++ b/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.deps.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9117d707eb63a6442b7b36c6b7669bf3 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll b/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll new file mode 100644 index 0000000000..753c88efd5 Binary files /dev/null and b/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll differ diff --git a/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll.meta b/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll.meta new file mode 100644 index 0000000000..fb396d45e8 --- /dev/null +++ b/Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3b9d74e7123c6e144ae35ceb982d00de \ No newline at end of file diff --git a/Assets/PerfectWorld.meta b/Assets/PerfectWorld.meta new file mode 100644 index 0000000000..5a35eec569 --- /dev/null +++ b/Assets/PerfectWorld.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4510d940b62093f428895c71d54201a3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PerfectWorld/Scripts.meta b/Assets/PerfectWorld/Scripts.meta new file mode 100644 index 0000000000..bef81135b2 --- /dev/null +++ b/Assets/PerfectWorld/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f4ed9c123c3c17647a58138714220529 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PerfectWorld/Scripts/Managers.meta b/Assets/PerfectWorld/Scripts/Managers.meta new file mode 100644 index 0000000000..f26ebe927a --- /dev/null +++ b/Assets/PerfectWorld/Scripts/Managers.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5422b092e4214c6ba93e047bc551938d +timeCreated: 1757145890 \ No newline at end of file diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs b/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs new file mode 100644 index 0000000000..5f4639a771 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs @@ -0,0 +1,64 @@ +using CSNetwork; +using CSNetwork.GPDataType; +using System; +using System.Runtime.InteropServices; + +namespace PerfectWorld.Scripts.Managers +{ + namespace BrewMonster.Managers + { + public class EC_ManPlayer : IMsgHandler + { + public int HandlerId => (int)MANAGER_INDEX.MAN_PLAYER; + public bool ProcessMessage(ECMSG Msg) + { + if (Msg.iSubID == 0) + { + + } + else if (Msg.iSubID < 0) + { + switch ((int)Msg.dwMsg) + { + case int value when value == EC_MsgDef.MSG_PM_PLAYERINFO: + { + OnMsgPlayerInfo(Msg); + break; + } + } + } + else + { + + } + return true; + } + + public void OnMsgPlayerInfo(ECMSG Msg) + { + int iHostID = (int)Msg.dwParam3; + int lenghtByte = Marshal.SizeOf(); + byte[] byteArray = new byte[lenghtByte]; + byte[] data = (byte[])Msg.dwParam1; + for (int i = 0; i < lenghtByte; i++) + { + byteArray[i] = data[i]; + } + int cid = BitConverter.ToInt32(byteArray); + switch (Convert.ToInt32(Msg.dwParam2)) + { + case CommandID.PLAYER_INFO_1: + case CommandID.PLAYER_ENTER_WORLD: + case CommandID.PLAYER_ENTER_SLICE: + { + if (cid != iHostID) + { + GameController.Instance.Log("ElsePlayer has join"); + } + break; + } + } + } + } + } +} \ No newline at end of file diff --git a/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs.meta b/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs.meta new file mode 100644 index 0000000000..782b456924 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/Managers/EC_ManPlayer.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c6724bce59c34aa1bd3743616e212661 +timeCreated: 1757145906 \ No newline at end of file diff --git a/Assets/PerfectWorld/Scripts/Network.meta b/Assets/PerfectWorld/Scripts/Network.meta new file mode 100644 index 0000000000..ff169a7e8f --- /dev/null +++ b/Assets/PerfectWorld/Scripts/Network.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5159197c50a65464eb35a4d47fb91016 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PerfectWorld/Scripts/Network/EC_ManMessageMono.cs b/Assets/PerfectWorld/Scripts/Network/EC_ManMessageMono.cs new file mode 100644 index 0000000000..b9f88e7d88 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/Network/EC_ManMessageMono.cs @@ -0,0 +1,22 @@ +using System; +using UnityEngine; +using CSNetwork; +using PerfectWorld.Scripts.Managers.BrewMonster.Managers; + +namespace BrewMonster +{ + public class EC_ManMessageMono : MonoBehaviour + { + private void Awake() + { + //TODO: Remove later + EC_ManMessage.RegisterHandler(new EC_ManPlayer()); + } + + + private void Update() + { + EC_ManMessage.Tick(); + } + } +} \ No newline at end of file diff --git a/Assets/PerfectWorld/Scripts/Network/EC_ManMessageMono.cs.meta b/Assets/PerfectWorld/Scripts/Network/EC_ManMessageMono.cs.meta new file mode 100644 index 0000000000..fc0a9477d9 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/Network/EC_ManMessageMono.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 96073aa22df0eda49b4d56c0580aa806 \ No newline at end of file diff --git a/Assets/PerfectWorld/Scripts/Players.meta b/Assets/PerfectWorld/Scripts/Players.meta new file mode 100644 index 0000000000..4c9f3da9b4 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/Players.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8511a50fc48e2cf4bbd9a6bf91442d50 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs b/Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs new file mode 100644 index 0000000000..9885ebb9d4 --- /dev/null +++ b/Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +public class EC_ElsePlayer : MonoBehaviour +{ + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs.meta b/Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs.meta new file mode 100644 index 0000000000..f991a743ac --- /dev/null +++ b/Assets/PerfectWorld/Scripts/Players/EC_ElsePlayer.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0feb504dc7975e84dab03230dd3277a8 \ No newline at end of file diff --git a/Assets/Plugins/CSNetwork.dll b/Assets/Plugins/CSNetwork.dll deleted file mode 100644 index a0f4abacf2..0000000000 Binary files a/Assets/Plugins/CSNetwork.dll and /dev/null differ diff --git a/Assets/Plugins/CSNetwork.dll.meta b/Assets/Plugins/CSNetwork.dll.meta deleted file mode 100644 index 2653c55e32..0000000000 --- a/Assets/Plugins/CSNetwork.dll.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 59ad7e94a88d0524eb66a45875b486b3 \ No newline at end of file diff --git a/Assets/Prefabs/Character.prefab b/Assets/Prefabs/Character.prefab index 696b4208ee..1648a595dd 100644 --- a/Assets/Prefabs/Character.prefab +++ b/Assets/Prefabs/Character.prefab @@ -11,9 +11,9 @@ GameObject: - component: {fileID: 3412441340983701579} - component: {fileID: 4963688309523522575} - component: {fileID: 8371471143466595520} - - component: {fileID: 8750866330409519469} - - component: {fileID: 2579337816850146009} - component: {fileID: 7639115115142978997} + - component: {fileID: 8960181021787475507} + - component: {fileID: 1591670752219322405} m_Layer: 0 m_Name: Character m_TagString: Untagged @@ -90,8 +90,26 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!136 &8750866330409519469 -CapsuleCollider: +--- !u!114 &7639115115142978997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013293210786114121} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c0525de198450e14f9f6ad854b95ec99, type: 3} + m_Name: + m_EditorClassIdentifier: + txtName: {fileID: 0} + controller: {fileID: 8960181021787475507} + animator: {fileID: 1591670752219322405} + joystick: {fileID: 0} + btnJump: {fileID: 0} + btnRun: {fileID: 0} +--- !u!143 &8960181021787475507 +CharacterController: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -105,54 +123,38 @@ CapsuleCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 - m_Radius: 0.5 + serializedVersion: 3 m_Height: 2 - m_Direction: 1 + m_Radius: 0.5 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 m_Center: {x: 0, y: 0, z: 0} ---- !u!54 &2579337816850146009 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2013293210786114121} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &7639115115142978997 -MonoBehaviour: +--- !u!95 &1591670752219322405 +Animator: + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2013293210786114121} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dd1a1ec750c69604fafb72e91fd8e7b4, type: 3} - m_Name: - m_EditorClassIdentifier: - txtName: {fileID: 2889286251427577339} + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &5363758751412688596 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Demo.unity b/Assets/Scenes/Demo.unity index 45597f6d74..b75ea6a022 100644 --- a/Assets/Scenes/Demo.unity +++ b/Assets/Scenes/Demo.unity @@ -2966,6 +2966,7 @@ GameObject: m_Component: - component: {fileID: 1018020456} - component: {fileID: 1018020457} + - component: {fileID: 1018020458} m_Layer: 0 m_Name: Game m_TagString: Untagged @@ -2987,6 +2988,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 626090657} + - {fileID: 2034856886} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1018020457 @@ -3003,6 +3005,18 @@ MonoBehaviour: m_EditorClassIdentifier: characterPrefab: {fileID: 7639115115142978997, guid: 633f7b514d73bdb459636883927e2b1b, type: 3} ground: {fileID: 626090657} +--- !u!114 &1018020458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1018020455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 96073aa22df0eda49b4d56c0580aa806, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1137567878 GameObject: m_ObjectHideFlags: 0 @@ -3786,6 +3800,75 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 98} m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &2034856885 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1018020456} + m_Modifications: + - target: {fileID: 2013293210786114121, guid: 633f7b514d73bdb459636883927e2b1b, type: 3} + propertyPath: m_Name + value: Character + objectReference: {fileID: 0} + - target: {fileID: 2013293210786114121, guid: 633f7b514d73bdb459636883927e2b1b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3412441340983701579, guid: 633f7b514d73bdb459636883927e2b1b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3412441340983701579, guid: 633f7b514d73bdb459636883927e2b1b, type: 3} + propertyPath: m_LocalPosition.y + value: 2.73 + objectReference: {fileID: 0} + - target: {fileID: 3412441340983701579, guid: 633f7b514d73bdb459636883927e2b1b, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3412441340983701579, guid: 633f7b514d73bdb459636883927e2b1b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3412441340983701579, guid: 633f7b514d73bdb459636883927e2b1b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3412441340983701579, guid: 633f7b514d73bdb459636883927e2b1b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3412441340983701579, guid: 633f7b514d73bdb459636883927e2b1b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3412441340983701579, guid: 633f7b514d73bdb459636883927e2b1b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3412441340983701579, guid: 633f7b514d73bdb459636883927e2b1b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3412441340983701579, guid: 633f7b514d73bdb459636883927e2b1b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5363758751412688596, guid: 633f7b514d73bdb459636883927e2b1b, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + m_SourcePrefab: {fileID: 100100000, guid: 633f7b514d73bdb459636883927e2b1b, type: 3} +--- !u!4 &2034856886 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3412441340983701579, guid: 633f7b514d73bdb459636883927e2b1b, type: 3} + m_PrefabInstance: {fileID: 2034856885} + m_PrefabAsset: {fileID: 0} --- !u!1 &2082488502 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameController.cs b/Assets/Scripts/GameController.cs index 494a0a5aac..5098a43ea9 100644 --- a/Assets/Scripts/GameController.cs +++ b/Assets/Scripts/GameController.cs @@ -1,18 +1,47 @@ using CSNetwork.Protocols.RPCData; using System.Data; +using Unity.VisualScripting; using UnityEngine; public class GameController : MonoBehaviour { + private static GameController instance; + [SerializeField] private CharacterCtrl characterPrefab; [SerializeField] private Transform ground; Camera camera; + + public static GameController Instance + { + get + { + if (instance == null) + { + instance = new GameController(); + } + return instance; + } + } + + private void Awake() + { + if(instance == null) + { + instance = this; + } + } + private void Start() { camera = Camera.main; } + public void Log(string s) + { + Debug.LogError(s); + } + public void InitCharacter(RoleInfo roleInfo) { CharacterCtrl character = Instantiate(characterPrefab, transform);