From d90d6f083e71baeb27e622acd3703881d49b4e7a Mon Sep 17 00:00:00 2001 From: GraphicEdit Date: Tue, 2 Jan 2024 15:53:29 +0000 Subject: [PATCH] fixes --- .../1_Mutant/Mutant@Hard Landing.fbx.meta | 5 +- .../Erika Archer@Falling To Roll.fbx.meta | 3 +- .../Assets/Characters/3_Abe/Kicking.fbx.meta | 3 +- .../4_Michelle/Butterfly Twirl.fbx.meta | 2 +- DarkFlow/Assets/Editor/StartupSceneLoader.cs | 48 ------------------- DarkFlow/Assets/Plugins/.keep | 0 .../Plugins/ParrelSync/ScriptableObjects.meta | 8 ---- .../ParrelSyncProjectSettings.asset | 15 ------ .../ParrelSyncProjectSettings.asset.meta | 8 ---- DarkFlow/Assets/Scenes/systemTest.unity | 11 +++-- .../ParrelSync.meta => Scripts/AI.meta} | 2 +- DarkFlow/Assets/Scripts/AI/NPC.cs.meta | 11 +++++ .../Scripts/CharacterSystems/CharacterMain.cs | 6 ++- .../Assets/Scripts/ClientNetworkAnimator.cs | 14 ------ .../Assets/Scripts/ClientNetworkTransform.cs | 13 ----- .../Assets/Scripts/ClientPlayerSetings.cs | 44 ----------------- DarkFlow/Assets/{ => Scripts}/Editor.meta | 0 .../Scripts/Editor/StartupSceneLoader.cs | 32 +++++++++++++ .../Editor/StartupSceneLoader.cs.meta | 0 DarkFlow/Assets/Scripts/Matchplayer.cs | 39 --------------- .../{ => Networking}/CharacterSpawner.cs | 1 + .../{ => Networking}/CharacterSpawner.cs.meta | 0 .../Networking/ClientNetworkAnimator.cs | 14 ++++++ .../ClientNetworkAnimator.cs.meta | 0 .../Networking/ClientNetworkTransform.cs | 15 ++++++ .../ClientNetworkTransform.cs.meta | 0 .../Scripts/Networking/ClientPlayerSetings.cs | 46 ++++++++++++++++++ .../ClientPlayerSetings.cs.meta | 0 .../Assets/Scripts/Networking/Matchplayer.cs | 40 ++++++++++++++++ .../{ => Networking}/Matchplayer.cs.meta | 0 DarkFlow/Packages/manifest.json | 1 - DarkFlow/Packages/packages-lock.json | 7 --- 32 files changed, 177 insertions(+), 211 deletions(-) delete mode 100644 DarkFlow/Assets/Editor/StartupSceneLoader.cs create mode 100644 DarkFlow/Assets/Plugins/.keep delete mode 100644 DarkFlow/Assets/Plugins/ParrelSync/ScriptableObjects.meta delete mode 100644 DarkFlow/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset delete mode 100644 DarkFlow/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset.meta rename DarkFlow/Assets/{Plugins/ParrelSync.meta => Scripts/AI.meta} (77%) create mode 100644 DarkFlow/Assets/Scripts/AI/NPC.cs.meta delete mode 100644 DarkFlow/Assets/Scripts/ClientNetworkAnimator.cs delete mode 100644 DarkFlow/Assets/Scripts/ClientNetworkTransform.cs delete mode 100644 DarkFlow/Assets/Scripts/ClientPlayerSetings.cs rename DarkFlow/Assets/{ => Scripts}/Editor.meta (100%) create mode 100644 DarkFlow/Assets/Scripts/Editor/StartupSceneLoader.cs rename DarkFlow/Assets/{ => Scripts}/Editor/StartupSceneLoader.cs.meta (100%) delete mode 100644 DarkFlow/Assets/Scripts/Matchplayer.cs rename DarkFlow/Assets/Scripts/{ => Networking}/CharacterSpawner.cs (99%) rename DarkFlow/Assets/Scripts/{ => Networking}/CharacterSpawner.cs.meta (100%) create mode 100644 DarkFlow/Assets/Scripts/Networking/ClientNetworkAnimator.cs rename DarkFlow/Assets/Scripts/{ => Networking}/ClientNetworkAnimator.cs.meta (100%) create mode 100644 DarkFlow/Assets/Scripts/Networking/ClientNetworkTransform.cs rename DarkFlow/Assets/Scripts/{ => Networking}/ClientNetworkTransform.cs.meta (100%) create mode 100644 DarkFlow/Assets/Scripts/Networking/ClientPlayerSetings.cs rename DarkFlow/Assets/Scripts/{ => Networking}/ClientPlayerSetings.cs.meta (100%) create mode 100644 DarkFlow/Assets/Scripts/Networking/Matchplayer.cs rename DarkFlow/Assets/Scripts/{ => Networking}/Matchplayer.cs.meta (100%) diff --git a/DarkFlow/Assets/Characters/1_Mutant/Mutant@Hard Landing.fbx.meta b/DarkFlow/Assets/Characters/1_Mutant/Mutant@Hard Landing.fbx.meta index a47526f..76efa47 100644 --- a/DarkFlow/Assets/Characters/1_Mutant/Mutant@Hard Landing.fbx.meta +++ b/DarkFlow/Assets/Characters/1_Mutant/Mutant@Hard Landing.fbx.meta @@ -21,8 +21,7 @@ ModelImporter: optimizeGameObjects: 0 removeConstantScaleCurves: 0 motionNodeName: - rigImportErrors: "Invalid Avatar Rig Configuration. Missing or invalid transform:\n\tRequired - human bone 'LeftHand' not found\n" + rigImportErrors: rigImportWarnings: animationImportErrors: animationImportWarnings: @@ -84,7 +83,7 @@ ModelImporter: blendShapeNormalImportMode: 1 normalSmoothingSource: 0 referencedClips: [] - importAnimation: 1 + importAnimation: 0 humanDescription: serializedVersion: 3 human: [] diff --git a/DarkFlow/Assets/Characters/2_Erika/Erika Archer@Falling To Roll.fbx.meta b/DarkFlow/Assets/Characters/2_Erika/Erika Archer@Falling To Roll.fbx.meta index ef21773..d84b5d3 100644 --- a/DarkFlow/Assets/Characters/2_Erika/Erika Archer@Falling To Roll.fbx.meta +++ b/DarkFlow/Assets/Characters/2_Erika/Erika Archer@Falling To Roll.fbx.meta @@ -40,6 +40,7 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -77,7 +78,7 @@ ModelImporter: blendShapeNormalImportMode: 1 normalSmoothingSource: 0 referencedClips: [] - importAnimation: 1 + importAnimation: 0 humanDescription: serializedVersion: 3 human: [] diff --git a/DarkFlow/Assets/Characters/3_Abe/Kicking.fbx.meta b/DarkFlow/Assets/Characters/3_Abe/Kicking.fbx.meta index 018970c..49bbff1 100644 --- a/DarkFlow/Assets/Characters/3_Abe/Kicking.fbx.meta +++ b/DarkFlow/Assets/Characters/3_Abe/Kicking.fbx.meta @@ -40,6 +40,7 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 + importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -77,7 +78,7 @@ ModelImporter: blendShapeNormalImportMode: 1 normalSmoothingSource: 0 referencedClips: [] - importAnimation: 1 + importAnimation: 0 humanDescription: serializedVersion: 3 human: [] diff --git a/DarkFlow/Assets/Characters/4_Michelle/Butterfly Twirl.fbx.meta b/DarkFlow/Assets/Characters/4_Michelle/Butterfly Twirl.fbx.meta index ee1036c..cd5b516 100644 --- a/DarkFlow/Assets/Characters/4_Michelle/Butterfly Twirl.fbx.meta +++ b/DarkFlow/Assets/Characters/4_Michelle/Butterfly Twirl.fbx.meta @@ -78,7 +78,7 @@ ModelImporter: blendShapeNormalImportMode: 1 normalSmoothingSource: 0 referencedClips: [] - importAnimation: 1 + importAnimation: 0 humanDescription: serializedVersion: 3 human: [] diff --git a/DarkFlow/Assets/Editor/StartupSceneLoader.cs b/DarkFlow/Assets/Editor/StartupSceneLoader.cs deleted file mode 100644 index 3bd4c9a..0000000 --- a/DarkFlow/Assets/Editor/StartupSceneLoader.cs +++ /dev/null @@ -1,48 +0,0 @@ -using UnityEditor; -using UnityEngine; -using UnityEditor.SceneManagement; -using Unity.Services.Authentication; -#if UNITY_EDITOR -using ParrelSync; -#endif - -[InitializeOnLoadAttribute] -public static class StartupSceneLoader -{ - static StartupSceneLoader() - { - -#if UNITY_EDITOR - - - if (ClonesManager.IsClone()) - { - string customArgument = ParrelSync.ClonesManager.GetArgument(); - AuthenticationService.Instance.SwitchProfile($"Clone_{customArgument}_Profile"); - Debug.Log("_______" + AuthenticationService.Instance.GetPlayerNameAsync()); - } -#endif - - EditorApplication.playModeStateChanged += LoadStartupScene; - - - } - - static void LoadStartupScene(PlayModeStateChange state) - { - if (state == PlayModeStateChange.ExitingEditMode) - { - EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo(); - } - - if (state == PlayModeStateChange.EnteredPlayMode) - { - if (EditorSceneManager.GetActiveScene().buildIndex != 0 && EditorSceneManager.GetActiveScene().name != "systemTest") - { - EditorSceneManager.LoadScene(0); - - - } - } - } -} \ No newline at end of file diff --git a/DarkFlow/Assets/Plugins/.keep b/DarkFlow/Assets/Plugins/.keep new file mode 100644 index 0000000..e69de29 diff --git a/DarkFlow/Assets/Plugins/ParrelSync/ScriptableObjects.meta b/DarkFlow/Assets/Plugins/ParrelSync/ScriptableObjects.meta deleted file mode 100644 index e852134..0000000 --- a/DarkFlow/Assets/Plugins/ParrelSync/ScriptableObjects.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 66a5f2bf4fd34ae499365e8516d51368 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/DarkFlow/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset b/DarkFlow/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset deleted file mode 100644 index 0ec926c..0000000 --- a/DarkFlow/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset +++ /dev/null @@ -1,15 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c0011418c9d75434988a06b6df93b283, type: 3} - m_Name: ParrelSyncProjectSettings - m_EditorClassIdentifier: - m_OptionalSymbolicLinkFolders: [] diff --git a/DarkFlow/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset.meta b/DarkFlow/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset.meta deleted file mode 100644 index 2319624..0000000 --- a/DarkFlow/Assets/Plugins/ParrelSync/ScriptableObjects/ParrelSyncProjectSettings.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 985cddfe9204ce5489c345cd2b2bf195 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/DarkFlow/Assets/Scenes/systemTest.unity b/DarkFlow/Assets/Scenes/systemTest.unity index fcb3870..8743f6a 100644 --- a/DarkFlow/Assets/Scenes/systemTest.unity +++ b/DarkFlow/Assets/Scenes/systemTest.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -411,17 +411,18 @@ MonoBehaviour: m_GameObject: {fileID: 518869412} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa1cd3d59b877b84aa6a7258c317c615, type: 3} + m_Script: {fileID: 11500000, guid: 5ac29fa319c8230458f11f733c334933, type: 3} m_Name: m_EditorClassIdentifier: npcName: Billy NPC desc: A guy who just AIs for fun. isHostile: 0 NPCText: Hey there. I bet you didn't think I could talk yet! + dropOnDeath: {fileID: 0} audioSource: {fileID: 0} - health: {fileID: 518869414} - npcNameBox: {fileID: 1860595803} - npcChatBox: {fileID: 1324247241} + health: {fileID: 0} + npcNameBox: {fileID: 0} + npcChatBox: {fileID: 0} --- !u!136 &518869416 CapsuleCollider: m_ObjectHideFlags: 0 diff --git a/DarkFlow/Assets/Plugins/ParrelSync.meta b/DarkFlow/Assets/Scripts/AI.meta similarity index 77% rename from DarkFlow/Assets/Plugins/ParrelSync.meta rename to DarkFlow/Assets/Scripts/AI.meta index adc02be..85b2f03 100644 --- a/DarkFlow/Assets/Plugins/ParrelSync.meta +++ b/DarkFlow/Assets/Scripts/AI.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fd3d3a9aa2fb29f4597ecde75f0c5fb5 +guid: 22678994d6fe68c4bab0b8e7733a5f49 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/DarkFlow/Assets/Scripts/AI/NPC.cs.meta b/DarkFlow/Assets/Scripts/AI/NPC.cs.meta new file mode 100644 index 0000000..1628176 --- /dev/null +++ b/DarkFlow/Assets/Scripts/AI/NPC.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5ac29fa319c8230458f11f733c334933 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/DarkFlow/Assets/Scripts/CharacterSystems/CharacterMain.cs b/DarkFlow/Assets/Scripts/CharacterSystems/CharacterMain.cs index 660ac24..4d9aa64 100644 --- a/DarkFlow/Assets/Scripts/CharacterSystems/CharacterMain.cs +++ b/DarkFlow/Assets/Scripts/CharacterSystems/CharacterMain.cs @@ -1,6 +1,8 @@ using UnityEngine; using UnityEngine.InputSystem; + + public class CharacterMain : MonoBehaviour { private bool isJumping; @@ -16,7 +18,7 @@ public class CharacterMain : MonoBehaviour private void Start() { - + } private void Update() @@ -63,4 +65,4 @@ private void HandleMovement() */ } -} \ No newline at end of file +} diff --git a/DarkFlow/Assets/Scripts/ClientNetworkAnimator.cs b/DarkFlow/Assets/Scripts/ClientNetworkAnimator.cs deleted file mode 100644 index a724f0e..0000000 --- a/DarkFlow/Assets/Scripts/ClientNetworkAnimator.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using Unity.Netcode.Components; -using UnityEngine; - -[DisallowMultipleComponent] -public class ClientNetworkAnimator : NetworkAnimator -{ - protected override bool OnIsServerAuthoritative() - { - return false; - } -} - diff --git a/DarkFlow/Assets/Scripts/ClientNetworkTransform.cs b/DarkFlow/Assets/Scripts/ClientNetworkTransform.cs deleted file mode 100644 index a7793a6..0000000 --- a/DarkFlow/Assets/Scripts/ClientNetworkTransform.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using Unity.Netcode.Components; -using UnityEngine; - -[DisallowMultipleComponent] -public class ClientNetworkTransform : NetworkTransform -{ - protected override bool OnIsServerAuthoritative() - { - return false; - } -} diff --git a/DarkFlow/Assets/Scripts/ClientPlayerSetings.cs b/DarkFlow/Assets/Scripts/ClientPlayerSetings.cs deleted file mode 100644 index 9c1066d..0000000 --- a/DarkFlow/Assets/Scripts/ClientPlayerSetings.cs +++ /dev/null @@ -1,44 +0,0 @@ -using Cinemachine; -using StarterAssets; -using Unity.Netcode; -using UnityEngine; -using UnityEngine.InputSystem; - -public class ClientPlayerSetings : NetworkBehaviour -{ - - [SerializeField] - CharacterController m_CharacterController; - - [SerializeField] - ThirdPersonController m_ThirdPersonController; - - [SerializeField] - Transform m_CameraFollow; - - [SerializeField] - PlayerInput m_PlayerInput; - - - public override void OnNetworkSpawn() - { - Invoke("Initialize", .5f); - } - - void Initialize() - //void Update() - { - //Debug.Log(".......... ClientPlayerSeting 1"); - if (!IsOwner) { return; } - // player input is only enabled on owning players - m_PlayerInput.enabled = true; - m_ThirdPersonController.enabled = true; - m_CharacterController.enabled = true; - GetComponent()._mainCamera = GameObject.FindGameObjectWithTag("MainCamera"); - FindObjectOfType().Follow = m_CameraFollow; - //if (IsSpawned) { return; } - //Debug.Log(".......... ClientPlayerSeting 2"); - - } - -} diff --git a/DarkFlow/Assets/Editor.meta b/DarkFlow/Assets/Scripts/Editor.meta similarity index 100% rename from DarkFlow/Assets/Editor.meta rename to DarkFlow/Assets/Scripts/Editor.meta diff --git a/DarkFlow/Assets/Scripts/Editor/StartupSceneLoader.cs b/DarkFlow/Assets/Scripts/Editor/StartupSceneLoader.cs new file mode 100644 index 0000000..27aade8 --- /dev/null +++ b/DarkFlow/Assets/Scripts/Editor/StartupSceneLoader.cs @@ -0,0 +1,32 @@ +using UnityEditor; +using UnityEngine; +using UnityEditor.SceneManagement; + +namespace DarkFlow.Editor +{ + [InitializeOnLoadAttribute] + public static class StartupSceneLoader + { + static StartupSceneLoader() + { + EditorApplication.playModeStateChanged += LoadStartupScene; + } + + static void LoadStartupScene(PlayModeStateChange state) + { + if (state == PlayModeStateChange.ExitingEditMode) + { + EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo(); + } + + if (state == PlayModeStateChange.EnteredPlayMode) + { + if (EditorSceneManager.GetActiveScene().buildIndex != 0 && EditorSceneManager.GetActiveScene().name != "systemTest") + { + EditorSceneManager.LoadScene(0); + + } + } + } + } +} \ No newline at end of file diff --git a/DarkFlow/Assets/Editor/StartupSceneLoader.cs.meta b/DarkFlow/Assets/Scripts/Editor/StartupSceneLoader.cs.meta similarity index 100% rename from DarkFlow/Assets/Editor/StartupSceneLoader.cs.meta rename to DarkFlow/Assets/Scripts/Editor/StartupSceneLoader.cs.meta diff --git a/DarkFlow/Assets/Scripts/Matchplayer.cs b/DarkFlow/Assets/Scripts/Matchplayer.cs deleted file mode 100644 index d002efc..0000000 --- a/DarkFlow/Assets/Scripts/Matchplayer.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using Unity.Netcode; - -public class Matchplayer : NetworkBehaviour -{ - public static event Action OnServerPlayerSpawned; - public static event Action OnServerPlayerDespawned; - - private void Awake() - { - DontDestroyOnLoad(gameObject); - } - - public override void OnNetworkSpawn() - { - if (IsServer) - { - OnServerPlayerSpawned?.Invoke(this); - } - - if (IsClient) - { - ClientSingleton.Instance.Manager.AddMatchPlayer(this); - } - } - - public override void OnNetworkDespawn() - { - if (IsServer) - { - OnServerPlayerDespawned?.Invoke(this); - } - - if (IsClient) - { - ClientSingleton.Instance.Manager.RemoveMatchPlayer(this); - } - } -} diff --git a/DarkFlow/Assets/Scripts/CharacterSpawner.cs b/DarkFlow/Assets/Scripts/Networking/CharacterSpawner.cs similarity index 99% rename from DarkFlow/Assets/Scripts/CharacterSpawner.cs rename to DarkFlow/Assets/Scripts/Networking/CharacterSpawner.cs index 4d55b54..0b0437f 100644 --- a/DarkFlow/Assets/Scripts/CharacterSpawner.cs +++ b/DarkFlow/Assets/Scripts/Networking/CharacterSpawner.cs @@ -31,3 +31,4 @@ void OnServerSpawnPlayer() } } } + diff --git a/DarkFlow/Assets/Scripts/CharacterSpawner.cs.meta b/DarkFlow/Assets/Scripts/Networking/CharacterSpawner.cs.meta similarity index 100% rename from DarkFlow/Assets/Scripts/CharacterSpawner.cs.meta rename to DarkFlow/Assets/Scripts/Networking/CharacterSpawner.cs.meta diff --git a/DarkFlow/Assets/Scripts/Networking/ClientNetworkAnimator.cs b/DarkFlow/Assets/Scripts/Networking/ClientNetworkAnimator.cs new file mode 100644 index 0000000..4604e59 --- /dev/null +++ b/DarkFlow/Assets/Scripts/Networking/ClientNetworkAnimator.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using Unity.Netcode.Components; +using UnityEngine; + + [DisallowMultipleComponent] + public class ClientNetworkAnimator : NetworkAnimator + { + protected override bool OnIsServerAuthoritative() + { + return false; + } + } + diff --git a/DarkFlow/Assets/Scripts/ClientNetworkAnimator.cs.meta b/DarkFlow/Assets/Scripts/Networking/ClientNetworkAnimator.cs.meta similarity index 100% rename from DarkFlow/Assets/Scripts/ClientNetworkAnimator.cs.meta rename to DarkFlow/Assets/Scripts/Networking/ClientNetworkAnimator.cs.meta diff --git a/DarkFlow/Assets/Scripts/Networking/ClientNetworkTransform.cs b/DarkFlow/Assets/Scripts/Networking/ClientNetworkTransform.cs new file mode 100644 index 0000000..538282b --- /dev/null +++ b/DarkFlow/Assets/Scripts/Networking/ClientNetworkTransform.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using Unity.Netcode.Components; +using UnityEngine; + + + [DisallowMultipleComponent] + public class ClientNetworkTransform : NetworkTransform + { + protected override bool OnIsServerAuthoritative() + { + return false; + } + } + diff --git a/DarkFlow/Assets/Scripts/ClientNetworkTransform.cs.meta b/DarkFlow/Assets/Scripts/Networking/ClientNetworkTransform.cs.meta similarity index 100% rename from DarkFlow/Assets/Scripts/ClientNetworkTransform.cs.meta rename to DarkFlow/Assets/Scripts/Networking/ClientNetworkTransform.cs.meta diff --git a/DarkFlow/Assets/Scripts/Networking/ClientPlayerSetings.cs b/DarkFlow/Assets/Scripts/Networking/ClientPlayerSetings.cs new file mode 100644 index 0000000..a050a2c --- /dev/null +++ b/DarkFlow/Assets/Scripts/Networking/ClientPlayerSetings.cs @@ -0,0 +1,46 @@ +using Cinemachine; +using StarterAssets; +using Unity.Netcode; +using UnityEngine; +using UnityEngine.InputSystem; + + + public class ClientPlayerSetings : NetworkBehaviour + { + + [SerializeField] + CharacterController m_CharacterController; + + [SerializeField] + ThirdPersonController m_ThirdPersonController; + + [SerializeField] + Transform m_CameraFollow; + + [SerializeField] + PlayerInput m_PlayerInput; + + + public override void OnNetworkSpawn() + { + Invoke("Initialize", .5f); + } + + void Initialize() + //void Update() + { + //Debug.Log(".......... ClientPlayerSeting 1"); + if (!IsOwner) { return; } + // player input is only enabled on owning players + m_PlayerInput.enabled = true; + m_ThirdPersonController.enabled = true; + m_CharacterController.enabled = true; + GetComponent()._mainCamera = GameObject.FindGameObjectWithTag("MainCamera"); + FindObjectOfType().Follow = m_CameraFollow; + //if (IsSpawned) { return; } + //Debug.Log(".......... ClientPlayerSeting 2"); + + } + + } + diff --git a/DarkFlow/Assets/Scripts/ClientPlayerSetings.cs.meta b/DarkFlow/Assets/Scripts/Networking/ClientPlayerSetings.cs.meta similarity index 100% rename from DarkFlow/Assets/Scripts/ClientPlayerSetings.cs.meta rename to DarkFlow/Assets/Scripts/Networking/ClientPlayerSetings.cs.meta diff --git a/DarkFlow/Assets/Scripts/Networking/Matchplayer.cs b/DarkFlow/Assets/Scripts/Networking/Matchplayer.cs new file mode 100644 index 0000000..c8a0d83 --- /dev/null +++ b/DarkFlow/Assets/Scripts/Networking/Matchplayer.cs @@ -0,0 +1,40 @@ +using System; +using Unity.Netcode; + + public class Matchplayer : NetworkBehaviour + { + public static event Action OnServerPlayerSpawned; + public static event Action OnServerPlayerDespawned; + + private void Awake() + { + DontDestroyOnLoad(gameObject); + } + + public override void OnNetworkSpawn() + { + if (IsServer) + { + OnServerPlayerSpawned?.Invoke(this); + } + + if (IsClient) + { + ClientSingleton.Instance.Manager.AddMatchPlayer(this); + } + } + + public override void OnNetworkDespawn() + { + if (IsServer) + { + OnServerPlayerDespawned?.Invoke(this); + } + + if (IsClient) + { + ClientSingleton.Instance.Manager.RemoveMatchPlayer(this); + } + } + } + diff --git a/DarkFlow/Assets/Scripts/Matchplayer.cs.meta b/DarkFlow/Assets/Scripts/Networking/Matchplayer.cs.meta similarity index 100% rename from DarkFlow/Assets/Scripts/Matchplayer.cs.meta rename to DarkFlow/Assets/Scripts/Networking/Matchplayer.cs.meta diff --git a/DarkFlow/Packages/manifest.json b/DarkFlow/Packages/manifest.json index e3b634a..9a3a802 100644 --- a/DarkFlow/Packages/manifest.json +++ b/DarkFlow/Packages/manifest.json @@ -14,7 +14,6 @@ "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.9.1", - "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/DarkFlow/Packages/packages-lock.json b/DarkFlow/Packages/packages-lock.json index 6fa4271..7afc55e 100644 --- a/DarkFlow/Packages/packages-lock.json +++ b/DarkFlow/Packages/packages-lock.json @@ -328,13 +328,6 @@ }, "url": "https://packages.unity.com" }, - "com.veriorpies.parrelsync": { - "version": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync", - "depth": 0, - "source": "git", - "dependencies": {}, - "hash": "141b4e1e31966242a6fb7c495b52ac3d1221bc75" - }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0,