diff --git a/.erp b/.erp index 5067d9e..6c740b2 100644 --- a/.erp +++ b/.erp @@ -5,7 +5,7 @@ false false true - 1677883781 + 1677886908 4881733312513047015 false \ No newline at end of file diff --git a/Assets/Prefabs/Counter/DeliveryCounter.prefab b/Assets/Prefabs/Counter/DeliveryCounter.prefab index 415ce3f..9185fc8 100644 --- a/Assets/Prefabs/Counter/DeliveryCounter.prefab +++ b/Assets/Prefabs/Counter/DeliveryCounter.prefab @@ -1,5 +1,164 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &129866866302403356 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4444224352603892316} + - component: {fileID: 7293032263431927085} + - component: {fileID: 4674279055243651268} + - component: {fileID: 6434026234001325340} + - component: {fileID: 8785384667574737679} + - component: {fileID: 7096096454660909546} + - component: {fileID: 64095755175205687} + m_Layer: 5 + m_Name: DeliveryResultUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4444224352603892316 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129866866302403356} + 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: 1 + m_Children: + - {fileID: 2939913568667564616} + - {fileID: 1181936987943913017} + - {fileID: 6164652645646764267} + m_Father: {fileID: 8051914628305980545} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &7293032263431927085 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129866866302403356} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &4674279055243651268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129866866302403356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &6434026234001325340 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129866866302403356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &8785384667574737679 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129866866302403356} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 46812ad5454e74340a5e08d4802bcdb7, type: 3} + m_Name: + m_EditorClassIdentifier: + backgroundImage: {fileID: 5108910716593031188} + iconImage: {fileID: 3548572491624348925} + messageText: {fileID: 391244722131803802} + successColour: {r: 0.40784314, g: 0.9529412, b: 0.57254905, a: 0} + failColour: {r: 0.9529412, g: 0.5000943, b: 0.4078431, a: 0} + successSprite: {fileID: 21300000, guid: 6c562ac6d3e47ff4794df31886c6d864, type: 3} + failSprite: {fileID: 21300000, guid: 0d6e1281049dccc4189bf308b2ccf331, type: 3} +--- !u!95 &7096096454660909546 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129866866302403356} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6808c3bb868880e468408cafcc282659, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!225 &64095755175205687 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 129866866302403356} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &601817793532135484 GameObject: m_ObjectHideFlags: 0 @@ -106,6 +265,373 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &3454086603421830316 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6164652645646764267} + - component: {fileID: 4017977412137063123} + - component: {fileID: 3548572491624348925} + m_Layer: 5 + m_Name: IconImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6164652645646764267 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3454086603421830316} + 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: 4444224352603892316} + m_RootOrder: -1 + 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: 0.698, y: 0} + m_SizeDelta: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4017977412137063123 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3454086603421830316} + m_CullTransparentMesh: 1 +--- !u!114 &3548572491624348925 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3454086603421830316} + 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: 6c562ac6d3e47ff4794df31886c6d864, 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 &6176468263185818208 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1181936987943913017} + - component: {fileID: 4996985991274782625} + - component: {fileID: 391244722131803802} + m_Layer: 5 + m_Name: MessageText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1181936987943913017 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6176468263185818208} + 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: 4444224352603892316} + m_RootOrder: -1 + 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: -0.345, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4996985991274782625 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6176468263185818208} + m_CullTransparentMesh: 1 +--- !u!114 &391244722131803802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6176468263185818208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 'DELIVERY + + SUCCESS' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 0.25 + m_fontSizeBase: 0.25 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6745105481239907185 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8051914628305980545} + - component: {fileID: 793502633883551650} + m_Layer: 0 + m_Name: DeliveryResultUI_LookAtCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8051914628305980545 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6745105481239907185} + m_LocalRotation: {x: -0, y: 0.70910937, z: -0, w: 0.70509857} + m_LocalPosition: {x: -1.6000004, y: 3, z: 1.2000005} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4444224352603892316} + m_Father: {fileID: 7482973359124119346} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &793502633883551650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6745105481239907185} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5808323afc086764e9ce5b8db2df4456, type: 3} + m_Name: + m_EditorClassIdentifier: + mode: 1 +--- !u!1 &7664141519918172956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2939913568667564616} + - component: {fileID: 8400886018910832566} + - component: {fileID: 5108910716593031188} + - component: {fileID: 6373348118300415639} + - component: {fileID: 7555339936176170691} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2939913568667564616 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7664141519918172956} + 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: 4444224352603892316} + m_RootOrder: -1 + 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: 0, y: 0} + m_SizeDelta: {x: 2.2, y: 0.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8400886018910832566 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7664141519918172956} + m_CullTransparentMesh: 1 +--- !u!114 &5108910716593031188 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7664141519918172956} + 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: 0.40899786, g: 0.9528302, b: 0.5742553, 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: 0} + 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 &6373348118300415639 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7664141519918172956} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 0.1, y: 0.1} + m_UseGraphicAlpha: 1 +--- !u!114 &7555339936176170691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7664141519918172956} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 0.2, y: -0.2} + m_UseGraphicAlpha: 1 --- !u!1001 &3179224412346939459 PrefabInstance: m_ObjectHideFlags: 0 @@ -196,7 +722,7 @@ PrefabInstance: - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, type: 3} propertyPath: m_RootOrder - value: 0 + value: -1 objectReference: {fileID: 0} - target: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, type: 3} @@ -268,6 +794,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 9060777340159250089} + - targetCorrespondingSourceObject: {fileID: 6371086230447438899, guid: 509501a557d1d0a45817fb7332917dd5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8051914628305980545} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 6869097019740516189, guid: 509501a557d1d0a45817fb7332917dd5, type: 3} diff --git a/Assets/Scenes/GaneScene.unity b/Assets/Scenes/GaneScene.unity index 7b52ed2..96a3d58 100644 --- a/Assets/Scenes/GaneScene.unity +++ b/Assets/Scenes/GaneScene.unity @@ -8332,6 +8332,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8785384667574737679, guid: 5bc7927ba1b8e4242be0761fa07e2039, + type: 3} + propertyPath: failColour.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8785384667574737679, guid: 5bc7927ba1b8e4242be0761fa07e2039, + type: 3} + propertyPath: successColour.a + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scripts/GameStateManager.cs b/Assets/Scripts/GameStateManager.cs index d2d1ba2..0c5372e 100644 --- a/Assets/Scripts/GameStateManager.cs +++ b/Assets/Scripts/GameStateManager.cs @@ -26,7 +26,7 @@ public class GameStateManager : MonoBehaviour // --- Timers --- private float countdownToStartTimer = 3f; private float gamePlayTimer; - private float gamePlayTimerMax = 10f; + private float gamePlayTimerMax = 30f; private void Awake() { diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 4279b1f..48d9523 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -23,7 +23,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 21910 + controlID: 19 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -47,8 +47,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 2016 - height: 1059 + width: 1877 + height: 937 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -90,7 +90,7 @@ MonoBehaviour: m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 m_HSlider: 0 - m_VSlider: 0 + m_VSlider: 1 m_IgnoreScrollWheelUntilClicked: 0 m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 @@ -101,23 +101,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 2016 - height: 1038 - m_Scale: {x: 0.72083336, y: 0.72083336} - m_Translation: {x: 1008, y: 519} + width: 1877 + height: 916 + m_Scale: {x: 0.63611114, y: 0.63611114} + m_Translation: {x: 938.5, y: 457.99994} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1398.3815 - y: -720 - width: 2796.763 - height: 1440 + x: -1475.3711 + y: -719.9999 + width: 2950.7422 + height: 1439.9999 m_MinimalGUI: 1 - m_defaultScale: 0.72083336 - m_LastWindowPixelSize: {x: 2016, y: 1059} + m_defaultScale: 0.63611114 + m_LastWindowPixelSize: {x: 1877, y: 937} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -147,7 +147,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 21911 + controlID: 20 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -167,12 +167,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2017 + width: 1878 height: 1299 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 21912 + controlID: 21 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -190,8 +190,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 2017 - height: 1080 + width: 1878 + height: 958 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 2} @@ -224,7 +224,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73 - width: 2016 + width: 1877 height: 937 m_SerializedDataModeController: m_DataMode: 0 @@ -322,7 +322,7 @@ MonoBehaviour: snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Orientation - index: 0 + index: 1 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -339,16 +339,16 @@ MonoBehaviour: layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 - - dockPosition: 1 + - dockPosition: 0 containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 1 - snapOffset: {x: 267, y: 10} + displayed: 0 + snapOffset: {x: -937, y: -911} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 + snapCorner: 3 id: Scene View/Camera - index: 10 + index: 0 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -545,9 +545,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 11.31814, y: -13.210319, z: 18.823023} + m_Target: {x: 1.7102861, y: -8.605359, z: 19.212528} speed: 2 - m_Value: {x: 11.31814, y: -13.210319, z: 18.823023} + m_Value: {x: 1.7102861, y: -8.605359, z: 19.212528} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -593,20 +593,20 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.22431801, y: -0.1694386, z: 0.039639473, w: -0.95885915} + m_Target: {x: 0.26363647, y: -0.060439397, z: 0.016494267, w: 0.9626463} speed: 2 - m_Value: {x: -0.22431801, y: -0.1694386, z: 0.039639473, w: -0.95885915} + m_Value: {x: 0.26217687, y: -0.060460538, z: 0.01640261, w: 0.9629843} m_Size: - m_Target: 19.978935 + m_Target: 12.62771 speed: 2 - m_Value: 19.978935 + m_Value: 12.62771 m_Ortho: m_Target: 0 speed: 2 m_Value: 0 m_CameraSettings: - m_Speed: 1.0204899 - m_SpeedNormalized: 0.51 + m_Speed: 1.2003998 + m_SpeedNormalized: 0.5999999 m_SpeedMin: 0.001 m_SpeedMax: 2 m_EasingEnabled: 1 @@ -617,7 +617,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: 0.35006523, y: 0.44742557, z: -0.19601229, w: 0.79934734} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -646,8 +646,8 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 19 - width: 2016 + y: 73 + width: 1877 height: 937 m_SerializedDataModeController: m_DataMode: 0 @@ -663,6 +663,10 @@ MonoBehaviour: m_KeySerializationHelper: - {fileID: 3341265433047602877, guid: 68eaadb9ce37beb4dada3e6649f7ae47, type: 2} - {fileID: 3733528916098049310, guid: 159fdf44081dc31468b5d2cf94ed008e, type: 2} + - {fileID: -2295579770948003907, guid: 9d9369ef6465eb747bbfabd3f6b33449, type: 2} + - {fileID: -4942770097063373993, guid: 1a6d3fdd0db4d6a4788a355db5119c9d, type: 2} + - {fileID: -7307097432115165344, guid: d0ddac7101c422c41a1cd8711d5291a6, type: 2} + - {fileID: 6468133301544140521, guid: 6808c3bb868880e468408cafcc282659, type: 2} m_ValueSerializationHelper: - e00: 1.3573047 e01: 0 @@ -696,11 +700,75 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 + - e00: 1 + e01: 0 + e02: 0 + e03: 114 + e10: 0 + e11: 1 + e12: 0 + e13: 222 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 1 + e01: 0 + e02: 0 + e03: 121.5 + e10: 0 + e11: 1 + e12: 0 + e13: 364 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 1.387912 + e01: 0 + e02: 0 + e03: -170.39558 + e10: 0 + e11: 1.387912 + e12: 0 + e13: 404.90085 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 1.387912 + e01: 0 + e02: 0 + e03: -22.395565 + e10: 0 + e11: 1.387912 + e12: 0 + e13: 391.90085 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 159fdf44081dc31468b5d2cf94ed008e, + m_AnimatorController: {fileID: 9100000, guid: 6808c3bb868880e468408cafcc282659, type: 2} m_BreadCrumbs: - - m_Target: {fileID: 3733528916098049310, guid: 159fdf44081dc31468b5d2cf94ed008e, + - m_Target: {fileID: 6468133301544140521, guid: 6808c3bb868880e468408cafcc282659, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} @@ -732,13 +800,13 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 1080 - width: 2017 - height: 219 + y: 958 + width: 1878 + height: 341 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 21878 + controlID: 197 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -756,8 +824,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 453 - height: 219 + width: 422 + height: 341 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 10} @@ -787,9 +855,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 1153 - width: 452 - height: 198 + y: 1031 + width: 421 + height: 320 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -802,10 +870,10 @@ MonoBehaviour: m_OverlaysVisible: 1 m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 9284fbff4086fbff768efbff66aefbff60befbffe2d2fbffdaf1fbffc449fcfff675fcffb09bfcffda9cfcff749dfcff2243feff3c3affff0afbffff6e040100 + scrollPos: {x: 0, y: 497} + m_SelectedIDs: 0ac8fdff + m_LastClickedID: -145398 + m_ExpandedIDs: e4b1f9ff0ac8fdff88f6fffffefaffffdc710000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -821,7 +889,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 5} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -844,10 +912,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 453 + x: 422 y: 0 - width: 1564 - height: 219 + width: 1456 + height: 341 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 12} @@ -856,7 +924,7 @@ MonoBehaviour: - {fileID: 13} - {fileID: 14} m_Selected: 0 - m_LastSelected: 1 + m_LastSelected: 2 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -878,10 +946,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 453 - y: 1153 - width: 1562 - height: 198 + x: 422 + y: 1031 + width: 1454 + height: 320 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -905,7 +973,7 @@ MonoBehaviour: m_SkipHidden: 1 m_SearchArea: 1 m_Folders: - - Assets/Scenes + - Assets/Animations m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -921,7 +989,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 118} m_SelectedIDs: 3c6f0000 m_LastClickedID: 28476 - m_ExpandedIDs: ffffffff00000000da6f0000b67c0000b87c0000ba7c0000bc7c0000be7c0000c07c0000c27c0000c47c0000c67c0000c87c0000ca7c0000cc7c0000ce7c0000d27c0000d47c00002c7d00003c7d0000427d00003a8c000044e8000016e900001ae90000ffffff7f + m_ExpandedIDs: 0000000064700000fe80000000810000028100000481000006810000088100000a8100000c8100000e81000010810000128100001481000016810000188100001a8100001c8100001e81000020810000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -946,10 +1014,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 149} - m_SelectedIDs: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 0ac8fdff m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000da6f0000b67c0000b87c0000ba7c0000bc7c0000be7c0000c07c0000c27c0000c47c0000c67c0000c87c0000ca7c0000cc7c0000ce7c0000d27c0000d47c00002c7d00003c7d0000427d00003a8c000044e8000016e900001ae90000ffffff7f + m_ExpandedIDs: ffffffff0000000064700000fe80000000810000028100000481000006810000088100000a8100000c8100000e81000010810000128100001481000016810000188100001a8100001c8100001e81000020810000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -965,7 +1033,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 11} + m_ClientGUIView: {fileID: 5} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -974,8 +1042,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 0ac8fdff + m_LastClickedInstanceID: -145398 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000ea050000 m_RenameOverlay: @@ -1026,9 +1094,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 453 + x: 422 y: 1031 - width: 1562 + width: 1451 height: 320 m_SerializedDataModeController: m_DataMode: 0 @@ -1061,10 +1129,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 403 - y: 1043 - width: 1424 - height: 308 + x: 422 + y: 1031 + width: 1454 + height: 320 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1077,7 +1145,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -844538 + m_LastSelectedObjectID: -145398 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1093,12 +1161,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 2017 + x: 1878 y: 0 - width: 543 + width: 682 height: 1299 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 16} m_Panes: - {fileID: 16} @@ -1127,9 +1195,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2017 + x: 1878 y: 73 - width: 542 + width: 681 height: 1278 m_SerializedDataModeController: m_DataMode: 0 @@ -1209,9 +1277,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1773 + x: 1875 y: 73 - width: 786 + width: 684 height: 1278 m_SerializedDataModeController: m_DataMode: 0