From 8d2e1b0bf18da6feb5a7cc1027116be00c4447ea Mon Sep 17 00:00:00 2001 From: Julia Butenhoff Date: Fri, 4 Mar 2022 14:10:30 -0600 Subject: [PATCH] Weather Spawns for the players (doesn't yet despawn) --- Assets/Prefabs/Game/WeatherWheel.meta | 8 + .../{ => WeatherWheel}/WeatherWheel.prefab | 246 +++++++---------- .../WeatherWheel.prefab.meta | 0 .../Game/WeatherWheel/WheelButton.prefab | 166 ++++++++++++ .../Game/WeatherWheel/WheelButton.prefab.meta | 7 + Assets/Prefabs/King/King.prefab | 254 ------------------ Assets/Scenes/Preloader.unity | 2 + Assets/Scripts/UI/WeatherWheel.cs | 122 +++++++-- 8 files changed, 391 insertions(+), 414 deletions(-) create mode 100644 Assets/Prefabs/Game/WeatherWheel.meta rename Assets/Prefabs/Game/{ => WeatherWheel}/WeatherWheel.prefab (56%) rename Assets/Prefabs/Game/{ => WeatherWheel}/WeatherWheel.prefab.meta (100%) create mode 100644 Assets/Prefabs/Game/WeatherWheel/WheelButton.prefab create mode 100644 Assets/Prefabs/Game/WeatherWheel/WheelButton.prefab.meta diff --git a/Assets/Prefabs/Game/WeatherWheel.meta b/Assets/Prefabs/Game/WeatherWheel.meta new file mode 100644 index 0000000..162d97f --- /dev/null +++ b/Assets/Prefabs/Game/WeatherWheel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8ea3a011bae18a34aa9cb2b45e53ff6c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Game/WeatherWheel.prefab b/Assets/Prefabs/Game/WeatherWheel/WeatherWheel.prefab similarity index 56% rename from Assets/Prefabs/Game/WeatherWheel.prefab rename to Assets/Prefabs/Game/WeatherWheel/WeatherWheel.prefab index fcc890c..46f1747 100644 --- a/Assets/Prefabs/Game/WeatherWheel.prefab +++ b/Assets/Prefabs/Game/WeatherWheel/WeatherWheel.prefab @@ -207,149 +207,109 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7165179050578953928 -GameObject: +--- !u!1001 &2715687016351687023 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 635832953810750502} - - component: {fileID: 8732928333618901988} - - component: {fileID: 8751829882106088540} - - component: {fileID: 7823058882322209727} - - component: {fileID: 6861462054085696516} - m_Layer: 12 - m_Name: WheelButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &635832953810750502 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4677622022843481040} + m_Modifications: + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_AnchoredPosition.x + value: 960 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_AnchoredPosition.y + value: 540 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5107040822107056039, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: m_Name + value: WheelButton + objectReference: {fileID: 0} + - target: {fileID: 8829519900378791275, guid: f09106d98169c264fa587fb2909ff027, type: 3} + propertyPath: pointer + value: + objectReference: {fileID: 1804665021489879995} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f09106d98169c264fa587fb2909ff027, type: 3} +--- !u!224 &635832953810750502 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 3270422845421317449, guid: f09106d98169c264fa587fb2909ff027, type: 3} + m_PrefabInstance: {fileID: 2715687016351687023} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7165179050578953928} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 5, y: 5, z: 1} - m_Children: [] - m_Father: {fileID: 4677622022843481040} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 960, y: 540} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8732928333618901988 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7165179050578953928} - m_CullTransparentMesh: 1 ---- !u!114 &8751829882106088540 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7165179050578953928} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 630520e8bcf49ec4cacb92a219a79c5c, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &7823058882322209727 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7165179050578953928} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 8751829882106088540} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 6861462054085696516} - m_TargetAssemblyTypeName: WeatherWheel, Assembly-CSharp - m_MethodName: SpinWheel - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &6861462054085696516 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7165179050578953928} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7abbd564e39545e41ae2b0f2f4529121, type: 3} - m_Name: - m_EditorClassIdentifier: - isSpinning: 0 diff --git a/Assets/Prefabs/Game/WeatherWheel.prefab.meta b/Assets/Prefabs/Game/WeatherWheel/WeatherWheel.prefab.meta similarity index 100% rename from Assets/Prefabs/Game/WeatherWheel.prefab.meta rename to Assets/Prefabs/Game/WeatherWheel/WeatherWheel.prefab.meta diff --git a/Assets/Prefabs/Game/WeatherWheel/WheelButton.prefab b/Assets/Prefabs/Game/WeatherWheel/WheelButton.prefab new file mode 100644 index 0000000..a63f6be --- /dev/null +++ b/Assets/Prefabs/Game/WeatherWheel/WheelButton.prefab @@ -0,0 +1,166 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5107040822107056039 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3270422845421317449} + - component: {fileID: 6665774945924289163} + - component: {fileID: 6684661378602331443} + - component: {fileID: 5269519878570638032} + - component: {fileID: 8829519900378791275} + - component: {fileID: 4333767850834850630} + m_Layer: 12 + m_Name: WheelButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3270422845421317449 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5107040822107056039} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 5, y: 5, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 960, y: 540} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6665774945924289163 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5107040822107056039} + m_CullTransparentMesh: 1 +--- !u!114 &6684661378602331443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5107040822107056039} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 630520e8bcf49ec4cacb92a219a79c5c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5269519878570638032 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5107040822107056039} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 0 + m_TargetGraphic: {fileID: 6684661378602331443} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8829519900378791275} + m_TargetAssemblyTypeName: WeatherWheel, Assembly-CSharp + m_MethodName: SpinWheel + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &8829519900378791275 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5107040822107056039} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7abbd564e39545e41ae2b0f2f4529121, type: 3} + m_Name: + m_EditorClassIdentifier: + isSpinning: 0 +--- !u!114 &4333767850834850630 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5107040822107056039} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + NetworkInstanceId: 0 + PrefabHash: 17668353120306675666 + PrefabHashGenerator: WheelButton + AlwaysReplicateAsRoot: 0 + DontDestroyWithOwner: 0 diff --git a/Assets/Prefabs/Game/WeatherWheel/WheelButton.prefab.meta b/Assets/Prefabs/Game/WeatherWheel/WheelButton.prefab.meta new file mode 100644 index 0000000..04d580a --- /dev/null +++ b/Assets/Prefabs/Game/WeatherWheel/WheelButton.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f09106d98169c264fa587fb2909ff027 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/King/King.prefab b/Assets/Prefabs/King/King.prefab index 3a4eb5d..c02ea4b 100644 --- a/Assets/Prefabs/King/King.prefab +++ b/Assets/Prefabs/King/King.prefab @@ -1,258 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2892316208689564 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 458936276257707492} - - component: {fileID: 5372132919776677937} - - component: {fileID: 8364176932711527241} - - component: {fileID: 5174671100426909216} - - component: {fileID: 7684134515880227463} - m_Layer: 12 - m_Name: WheelButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &458936276257707492 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2892316208689564} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -1191.0625} - m_LocalScale: {x: 5, y: 5, z: 1} - m_Children: [] - m_Father: {fileID: 461393241204552141} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1696.6062, y: 395.8017} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5372132919776677937 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2892316208689564} - m_CullTransparentMesh: 1 ---- !u!114 &8364176932711527241 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2892316208689564} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 630520e8bcf49ec4cacb92a219a79c5c, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5174671100426909216 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2892316208689564} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 8364176932711527241} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 7684134515880227463} - m_TargetAssemblyTypeName: WeatherWheel, Assembly-CSharp - m_MethodName: SpinWheel - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &7684134515880227463 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2892316208689564} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7abbd564e39545e41ae2b0f2f4529121, type: 3} - m_Name: - m_EditorClassIdentifier: - isSpinning: 0 ---- !u!1 &482820676534364632 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1541186099529016182} - - component: {fileID: 1660637878758554570} - - component: {fileID: 2431844289648417773} - m_Layer: 12 - m_Name: Pointer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1541186099529016182 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 482820676534364632} - m_LocalRotation: {x: -0, y: -0, z: -0.38268343, w: 0.92387956} - m_LocalPosition: {x: 0, y: 0, z: -1191.0625} - m_LocalScale: {x: 0.49999994, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 461393241204552141} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -45} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1528.6069, y: 241.8039} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1660637878758554570 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 482820676534364632} - m_CullTransparentMesh: 1 ---- !u!114 &2431844289648417773 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 482820676534364632} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4f3ff2a93920421488d4b875bb5126c5, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7713330914688437217 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 461393241204552141} - m_Layer: 12 - m_Name: WeatherWheel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &461393241204552141 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7713330914688437217} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -550, y: 248, z: 2560} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 458936276257707492} - - {fileID: 1541186099529016182} - m_Father: {fileID: 8183403963077248725} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8183403963077248722 GameObject: m_ObjectHideFlags: 0 @@ -284,7 +31,6 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 8183403963399572358} - - {fileID: 461393241204552141} m_Father: {fileID: 8183403963968820400} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/Preloader.unity b/Assets/Scenes/Preloader.unity index 4d3f0a7..e7e04b7 100644 --- a/Assets/Scenes/Preloader.unity +++ b/Assets/Scenes/Preloader.unity @@ -314,6 +314,8 @@ MonoBehaviour: PlayerPrefab: 0 - Prefab: {fileID: 4414581513358013603, guid: 058744b4c7122c346bf39d014bb74ebd, type: 3} PlayerPrefab: 0 + - Prefab: {fileID: 5107040822107056039, guid: f09106d98169c264fa587fb2909ff027, type: 3} + PlayerPrefab: 0 PlayerPrefabHash: id: 0 CreatePlayerPrefab: 0 diff --git a/Assets/Scripts/UI/WeatherWheel.cs b/Assets/Scripts/UI/WeatherWheel.cs index 14fd6f5..97f3156 100644 --- a/Assets/Scripts/UI/WeatherWheel.cs +++ b/Assets/Scripts/UI/WeatherWheel.cs @@ -1,60 +1,148 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; +using MLAPI; +using MLAPI.Messaging; -public class WeatherWheel : MonoBehaviour { +public class WeatherWheel : NetworkBehaviour { private float wheelSpeed; private float subtractSpeed; public bool isSpinning = false; - void Update() { - if (isSpinning) { + public GameObject pointer; + + void Start() { + gameObject.GetComponent().enabled = false; + pointer.SetActive(false); + StartCoroutine(ShowWeatherWheel()); + } + + IEnumerator ShowWeatherWheel() { + // Get the time to complete the intro camera fly through + float cameraLerpTime = Camera.main.GetComponent().playOnAwakeTime; + + // Wait for that many seconds - allows for time to complete the "cutscene" + yield return new WaitForSecondsRealtime(cameraLerpTime); + + // Turn the wheel back on for the + + GameObject[] players = GameObject.FindGameObjectsWithTag("Player"); + foreach (GameObject player in players) { + ulong clientID = player.GetComponent().OwnerClientId; + if (clientID == NetworkManager.Singleton.LocalClientId) { + if (player.GetComponentInChildren() != null) { + // Runner + gameObject.SetActive(false); + } else { + // King + gameObject.GetComponent().enabled = true; + gameObject.GetComponent