diff --git a/Assets/Data/GameModes.meta b/Assets/Data/GameModes.meta new file mode 100644 index 0000000..ae17482 --- /dev/null +++ b/Assets/Data/GameModes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac893ebcf6aa2894cbfa7152c977643e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models.meta b/Assets/Models.meta new file mode 100644 index 0000000..5346456 --- /dev/null +++ b/Assets/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 296bd90e667df1f4697823a0aa45acf0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameMode Scenes.meta b/Assets/Scenes/GameMode Scenes.meta new file mode 100644 index 0000000..5f4507d --- /dev/null +++ b/Assets/Scenes/GameMode Scenes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae2177b0b12013f4f9ecb906841b5ae3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameMode Scenes/ColorGameMode.unity b/Assets/Scenes/GameMode Scenes/ColorGameMode.unity new file mode 100644 index 0000000..c52961c --- /dev/null +++ b/Assets/Scenes/GameMode Scenes/ColorGameMode.unity @@ -0,0 +1,265 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_LightmapEditorSettings: + serializedVersion: 10 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &1169593764 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1169593766} + - component: {fileID: 1169593765} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1169593765 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1169593764} + m_Enabled: 1 + serializedVersion: 8 + m_Type: 1 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1169593766 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1169593764} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &1819061323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1819061326} + - component: {fileID: 1819061325} + - component: {fileID: 1819061324} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1819061324 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1819061323} + m_Enabled: 1 +--- !u!20 &1819061325 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1819061323} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1819061326 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1819061323} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/GameMode Scenes/ColorGameMode.unity.meta b/Assets/Scenes/GameMode Scenes/ColorGameMode.unity.meta new file mode 100644 index 0000000..ab5e2dc --- /dev/null +++ b/Assets/Scenes/GameMode Scenes/ColorGameMode.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5e284b48dfe47ac4990c68e87fd4d299 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameMode/GameMode.cs b/Assets/Scripts/GameMode/GameMode.cs index 6cb5314..c5bb4bb 100644 --- a/Assets/Scripts/GameMode/GameMode.cs +++ b/Assets/Scripts/GameMode/GameMode.cs @@ -1,15 +1,67 @@ -using System.Collections; +using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; using Networking.Server; -public abstract class GameMode : MonoBehaviour +public abstract class GameMode : ScriptableObject { + public Action RoundStartEvent; + public Action AllPlayersMovedEvent; + public Action RoundEndEvent; + public Action OnGameOverEvent; + /// + /// Called at the beginning of a new Round + /// + protected abstract void OnRoundStart(PlayerData[] allPlayers); - public abstract void OnPlayerFinishedMove(Character character, ClientData client, Block currentBlock); + /// + /// Called for each player after they finished one move. Even if they didn't move! + /// + /// Character which moved + /// Client which controls character + /// Block which the character finished on + protected abstract void OnPlayerFinishedMove(Character character, ClientData client, Block currentBlock); - public abstract bool isGameOver(); + /// + /// Called once after every player has finished one move + /// + /// List of all player Info + protected abstract void OnAllPlayersFinishedMove(PlayerData[] allPlayers); - public abstract void OnRoundFinished(); + public abstract bool isGameOver(PlayerData[] allPlayers); + + public abstract void OnRoundEnd(PlayerData[] allPlayers); + + public abstract void OnGameOver(PlayerData[] allPlayers); + + + + public void RoundStart(PlayerData[] allPlayers) + { + OnRoundStart(allPlayers); + RoundStartEvent.Invoke(); + } + + public void FinishedMove(PlayerData[] allPlayers) + { + foreach (PlayerData player in allPlayers) + OnPlayerFinishedMove(player.character, player.client, player.character.CurrentBlock); + + OnAllPlayersFinishedMove(allPlayers); + AllPlayersMovedEvent.Invoke(); + } + + public void RoundEnd(PlayerData[] allPlayers) + { + OnRoundEnd(allPlayers); + RoundEndEvent.Invoke(); + } + + public void GameOver(PlayerData[] allPlayers) + { + OnGameOver(allPlayers); + OnGameOverEvent.Invoke(); + } } diff --git a/Assets/Scripts/GameMode/GameModeEvents.cs b/Assets/Scripts/GameMode/GameModeEvents.cs new file mode 100644 index 0000000..74d23e5 --- /dev/null +++ b/Assets/Scripts/GameMode/GameModeEvents.cs @@ -0,0 +1,54 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Events; + +public class GameModeEvents : MonoBehaviour +{ + [Header("Reference")] + [SerializeField] + private GameModeReference Reference; + + [Header("Events")] + public UnityEvent OnRoundStart = new UnityEvent(); + public UnityEvent OnPlayersMoved = new UnityEvent(); + public UnityEvent OnRoundEnd = new UnityEvent(); + public UnityEvent OnGameOver = new UnityEvent(); + + + private void OnEnable() + { + Reference.Value.RoundStartEvent += RoundStart; + Reference.Value.AllPlayersMovedEvent += PlayersMoved; + Reference.Value.RoundEndEvent += RoundEnd; + Reference.Value.OnGameOverEvent += GameOver; + } + + private void OnDisable() + { + Reference.Value.RoundStartEvent -= RoundStart; + Reference.Value.AllPlayersMovedEvent -= PlayersMoved; + Reference.Value.RoundEndEvent -= RoundEnd; + Reference.Value.OnGameOverEvent -= GameOver; + } + + + private void RoundStart() + { + OnRoundStart.Invoke(); + } + + private void PlayersMoved() + { + OnPlayersMoved.Invoke(); + } + + private void RoundEnd() + { + OnRoundEnd.Invoke(); + } + private void GameOver() + { + OnGameOver.Invoke(); + } +} diff --git a/Assets/Scripts/GameMode/GameModeEvents.cs.meta b/Assets/Scripts/GameMode/GameModeEvents.cs.meta new file mode 100644 index 0000000..ce49bde --- /dev/null +++ b/Assets/Scripts/GameMode/GameModeEvents.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 96bf274f514b09741a0ff748fef480f0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameMode/GameModeReference.cs b/Assets/Scripts/GameMode/GameModeReference.cs new file mode 100644 index 0000000..f9d98f1 --- /dev/null +++ b/Assets/Scripts/GameMode/GameModeReference.cs @@ -0,0 +1,9 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(menuName = "Major Project/GameMode Refence", order = 201)] +public class GameModeReference : ScriptableObject +{ + public GameMode Value; +} diff --git a/Assets/Scripts/GameMode/GameModeReference.cs.meta b/Assets/Scripts/GameMode/GameModeReference.cs.meta new file mode 100644 index 0000000..e1ef68f --- /dev/null +++ b/Assets/Scripts/GameMode/GameModeReference.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8e47369572222344fa1ccd65fecad347 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameMode/TestGameMode.cs b/Assets/Scripts/GameMode/TestGameMode.cs new file mode 100644 index 0000000..104e425 --- /dev/null +++ b/Assets/Scripts/GameMode/TestGameMode.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class TestGameMode : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/GameMode/TestGameMode.cs.meta b/Assets/Scripts/GameMode/TestGameMode.cs.meta new file mode 100644 index 0000000..4244d1f --- /dev/null +++ b/Assets/Scripts/GameMode/TestGameMode.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: efa4d444fe1d14e4daf014fc89bfc971 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/LogicBlocks.meta b/Assets/Scripts/LogicBlocks.meta new file mode 100644 index 0000000..98af9d1 --- /dev/null +++ b/Assets/Scripts/LogicBlocks.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8936b441d7647f74884c94f97bfb8931 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index fde1885..e97e780 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -122,7 +122,7 @@ public class GameManager : MonoBehaviour Character newChar = Instantiate(characterPrefab); Block startingBlock = SpawnBlocks[(spawnIndex++ % ClientList.ConnectedClients.Count)]; newChar.Initialise(startingBlock, client.Inventory, client.characterAnimal); - playerData.Add(client.ID, new PlayerData(newChar)); + playerData.Add(client.ID, new PlayerData(newChar,client)); } } @@ -134,18 +134,22 @@ public class GameManager : MonoBehaviour - class PlayerData - { - public Character character; - public BlockReader blockReader; - public bool recievedList; + +} - public bool waiting; +public class PlayerData +{ + public Character character; + public BlockReader blockReader; + public ClientData client; - public PlayerData(Character character) - { - this.character = character; - blockReader = new BlockReader(); - } + public bool recievedList; + public bool waiting; + + public PlayerData(Character character, ClientData client) + { + this.character = character; + this.client = client; + blockReader = new BlockReader(); } }