From 701522f3235f47987ec2979ac145ec28c6c9decf Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Fri, 29 Dec 2023 21:48:10 +0000
Subject: [PATCH] Changed Canvas UI
---
Assets/Scenes/GameplayScene.unity | 277 ++++++++++++++++++-------------------------------------
1 files changed, 91 insertions(+), 186 deletions(-)
diff --git a/Assets/Scenes/GameplayScene.unity b/Assets/Scenes/GameplayScene.unity
index 2b3c334..cd8351f 100644
--- a/Assets/Scenes/GameplayScene.unity
+++ b/Assets/Scenes/GameplayScene.unity
@@ -460,7 +460,7 @@
- target: {fileID: 1929849503756379294, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target
value:
- objectReference: {fileID: 1504282395}
+ objectReference: {fileID: 2064964506}
- target: {fileID: 1929849503756379294, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName
value: SetActive
@@ -528,7 +528,7 @@
- target: {fileID: 4687906685300630270, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
propertyPath: m_Delegates.Array.data[1].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
- objectReference: {fileID: 1504282390}
+ objectReference: {fileID: 0}
- target: {fileID: 4687906685300630270, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnMouseOver
@@ -786,7 +786,7 @@
- target: {fileID: 5949226579424490923, guid: 19b26cb080fd5b841970a693f820fc0f, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
- objectReference: {fileID: 1504282395}
+ objectReference: {fileID: 2064964506}
- target: {fileID: 5949226579424490923, guid: 19b26cb080fd5b841970a693f820fc0f, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
@@ -1214,7 +1214,7 @@
- target: {fileID: 5949226579424490923, guid: 19b26cb080fd5b841970a693f820fc0f, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
- objectReference: {fileID: 1504282395}
+ objectReference: {fileID: 2064964506}
- target: {fileID: 5949226579424490923, guid: 19b26cb080fd5b841970a693f820fc0f, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
@@ -1347,7 +1347,6 @@
- component: {fileID: 519420031}
- component: {fileID: 519420029}
- component: {fileID: 519420030}
- - component: {fileID: 519420034}
- component: {fileID: 519420033}
m_Layer: 0
m_Name: Main Camera
@@ -1443,7 +1442,7 @@
far clip plane: 1000
field of view: 34
orthographic: 1
- orthographic size: 7
+ orthographic size: 10
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@@ -1508,30 +1507,6 @@
m_CameraActivatedEvent:
m_PersistentCalls:
m_Calls: []
---- !u!114 &519420034
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 519420028}
- m_Enabled: 0
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: c88f5cead0c0b2a4eb05b5900433f8d1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_ComponentVersion: 1
- m_AssetsPPU: 16
- m_RefResolutionX: 800
- m_RefResolutionY: 600
- m_CropFrame: 0
- m_GridSnapping: 0
- m_FilterMode: 0
- m_UpscaleRT: 0
- m_PixelSnapping: 0
- m_CropFrameX: 0
- m_CropFrameY: 0
- m_StretchFill: 0
--- !u!224 &596450200 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8463972149905527249, guid: 19b26cb080fd5b841970a693f820fc0f, type: 3}
@@ -2139,7 +2114,7 @@
- target: {fileID: 5949226579424490923, guid: 19b26cb080fd5b841970a693f820fc0f, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
- objectReference: {fileID: 1504282395}
+ objectReference: {fileID: 2064964506}
- target: {fileID: 5949226579424490923, guid: 19b26cb080fd5b841970a693f820fc0f, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
@@ -2861,10 +2836,10 @@
m_GameObject: {fileID: 1219825711}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.75, y: 0.75, z: 1}
+ m_LocalScale: {x: 0.8547008, y: 0.8547008, z: 1.1396011}
m_ConstrainProportionsScale: 0
m_Children: []
- m_Father: {fileID: 1504282394}
+ m_Father: {fileID: 2064964503}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
@@ -3987,148 +3962,6 @@
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1504282390
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1504282394}
- - component: {fileID: 1504282393}
- - component: {fileID: 1504282392}
- - component: {fileID: 1504282391}
- - component: {fileID: 1504282395}
- - component: {fileID: 1504282396}
- m_Layer: 5
- m_Name: PauseMenu
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &1504282391
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1504282390}
- 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 &1504282392
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1504282390}
- 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: 0
---- !u!223 &1504282393
-Canvas:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1504282390}
- m_Enabled: 1
- serializedVersion: 3
- m_RenderMode: 0
- m_Camera: {fileID: 0}
- m_PlaneDistance: 100
- m_PixelPerfect: 1
- m_ReceivesEvents: 1
- m_OverrideSorting: 0
- m_OverridePixelPerfect: 0
- m_SortingBucketNormalizedSize: 0
- m_VertexColorAlwaysGammaSpace: 0
- m_AdditionalShaderChannelsFlag: 25
- m_UpdateRectTransformForStandalone: 0
- m_SortingLayerID: 0
- m_SortingOrder: 0
- m_TargetDisplay: 0
---- !u!224 &1504282394
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1504282390}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0, y: 0, z: 0}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 1219825712}
- - {fileID: 1562124019}
- m_Father: {fileID: 0}
- 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, y: 0}
---- !u!114 &1504282395
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1504282390}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 64ed98dbed86920429783907967e12d5, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- pauseMenuUI: {fileID: 851154475}
- settingsMenuUI: {fileID: 109537919}
- pausePanel: {fileID: 1562124018}
- saveGameText: {fileID: 1042147644}
---- !u!95 &1504282396
-Animator:
- serializedVersion: 5
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1504282390}
- m_Enabled: 1
- m_Avatar: {fileID: 0}
- m_Controller: {fileID: 9100000, guid: bb23bd3d1da87d644bbe94cd098f0770, type: 2}
- m_CullingMode: 0
- m_UpdateMode: 2
- m_ApplyRootMotion: 0
- m_LinearVelocityBlending: 0
- m_StabilizeFeet: 0
- m_WarningMessage:
- m_HasTransformHierarchy: 1
- m_AllowConstantClipSamplingOptimization: 1
- m_KeepAnimatorStateOnDisable: 0
- m_WriteDefaultValuesOnDisable: 0
--- !u!1 &1520567227
GameObject:
m_ObjectHideFlags: 0
@@ -4240,18 +4073,18 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1562124018}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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_LocalScale: {x: 1.1396011, y: 1.1396011, z: 1.1396011}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 851154476}
- {fileID: 153917607}
- m_Father: {fileID: 1504282394}
+ m_Father: {fileID: 2064964503}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 642, y: 361}
+ 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: 640, y: 640}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1562124020
@@ -4420,7 +4253,7 @@
m_Follow: {fileID: 254538002}
m_Lens:
FieldOfView: 34
- OrthographicSize: 7
+ OrthographicSize: 10
NearClipPlane: 0.3
FarClipPlane: 1000
Dutch: 0
@@ -5317,6 +5150,8 @@
- component: {fileID: 2064964501}
- component: {fileID: 2064964500}
- component: {fileID: 2064964504}
+ - component: {fileID: 2064964506}
+ - component: {fileID: 2064964505}
m_Layer: 5
m_Name: PlayerUI
m_TagString: Untagged
@@ -5402,6 +5237,8 @@
- {fileID: 1398596077}
- {fileID: 153702489}
- {fileID: 1082973126}
+ - {fileID: 1219825712}
+ - {fileID: 1562124019}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -5423,6 +5260,43 @@
m_EditorClassIdentifier:
healthText: {fileID: 153702490}
healthSlider: {fileID: 1082973125}
+--- !u!95 &2064964505
+Animator:
+ serializedVersion: 5
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2064964499}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: bb23bd3d1da87d644bbe94cd098f0770, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 2
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_StabilizeFeet: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+ m_KeepAnimatorStateOnDisable: 0
+ m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &2064964506
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2064964499}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 64ed98dbed86920429783907967e12d5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ pauseMenuUI: {fileID: 851154475}
+ settingsMenuUI: {fileID: 109537919}
+ pausePanel: {fileID: 1562124018}
+ saveGameText: {fileID: 1219825711}
--- !u!1001 &2118694763
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5442,7 +5316,7 @@
- target: {fileID: 5949226579424490923, guid: 19b26cb080fd5b841970a693f820fc0f, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
- objectReference: {fileID: 1504282395}
+ objectReference: {fileID: 2064964506}
- target: {fileID: 5949226579424490923, guid: 19b26cb080fd5b841970a693f820fc0f, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
@@ -5626,7 +5500,7 @@
- target: {fileID: 6908574976455911116, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
propertyPath: pauseMenuUI
value:
- objectReference: {fileID: 1504282393}
+ objectReference: {fileID: 2064964502}
- target: {fileID: 6908574976455911116, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
propertyPath: levelChanger
value:
@@ -5634,7 +5508,11 @@
- target: {fileID: 7748736149887392517, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
- objectReference: {fileID: 1504282395}
+ objectReference: {fileID: 2064964506}
+ - target: {fileID: 7748736149887392517, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
+ propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: OnEscapedPressed
+ objectReference: {fileID: 0}
- target: {fileID: 8598998496262044661, guid: 7296d9a2424531f4ba42c0c75e9c48a0, type: 3}
propertyPath: m_Name
value: GameManager
@@ -5711,6 +5589,34 @@
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
+ - target: {fileID: 6914713383366050867, guid: c220ec455fce341408d66d880b464cad, type: 3}
+ propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.size
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6914713383366050867, guid: c220ec455fce341408d66d880b464cad, type: 3}
+ propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6914713383366050867, guid: c220ec455fce341408d66d880b464cad, type: 3}
+ propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 2064964506}
+ - target: {fileID: 6914713383366050867, guid: c220ec455fce341408d66d880b464cad, type: 3}
+ propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 6914713383366050867, guid: c220ec455fce341408d66d880b464cad, type: 3}
+ propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+ value: OnEscapedPressed
+ objectReference: {fileID: 0}
+ - target: {fileID: 6914713383366050867, guid: c220ec455fce341408d66d880b464cad, type: 3}
+ propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+ value: PauseMenu, Assembly-CSharp
+ objectReference: {fileID: 0}
+ - target: {fileID: 6914713383366050867, guid: c220ec455fce341408d66d880b464cad, type: 3}
+ propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+ value: UnityEngine.Object, UnityEngine
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -5729,7 +5635,6 @@
- {fileID: 727795133}
- {fileID: 75655679957548990}
- {fileID: 2064964503}
- - {fileID: 1504282394}
- {fileID: 1409843026}
- {fileID: 1406521045}
- {fileID: 1007461191}
--
Gitblit v1.9.3