From 6f4a214113bb299211ed2f5d1080731e94d65193 Mon Sep 17 00:00:00 2001 From: tianmo Date: Tue, 13 Oct 2026 19:28:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Core/Display.prefab | 6 +- Assets/Materials/Enermy.mat | 20 +- Assets/Materials/PlayerMat.mat | 11 +- Assets/Prefabs/RuntimeSettingsUI.prefab | 6 +- Assets/Scenes/Main.unity | 6 +- Assets/Scenes/Start.unity | 843 ++++++++++----------- Assets/UI/MoveJoystick/MoveJoystick.prefab | 6 +- Assets/UI/MoveJoystick/Pause.prefab | 312 ++++---- 8 files changed, 614 insertions(+), 596 deletions(-) diff --git a/Assets/Core/Display.prefab b/Assets/Core/Display.prefab index b9d277c..6dd8729 100644 --- a/Assets/Core/Display.prefab +++ b/Assets/Core/Display.prefab @@ -172,7 +172,7 @@ RectTransform: 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: 259} + m_AnchoredPosition: {x: 0, y: 115} m_SizeDelta: {x: 400, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6441692389451551187 @@ -304,7 +304,7 @@ RectTransform: 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: 129} + m_AnchoredPosition: {x: 0, y: -15} m_SizeDelta: {x: 400, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2567210313262782293 @@ -763,7 +763,7 @@ RectTransform: 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: -1} + m_AnchoredPosition: {x: 0, y: -145} m_SizeDelta: {x: 400, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4340879920758205189 diff --git a/Assets/Materials/Enermy.mat b/Assets/Materials/Enermy.mat index c9fe16c..9a4f9e9 100644 --- a/Assets/Materials/Enermy.mat +++ b/Assets/Materials/Enermy.mat @@ -11,19 +11,15 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON - - _SURFACE_TYPE_TRANSPARENT + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 2000 stringTagMap: - RenderType: Transparent - disabledShaderPasses: - - DepthOnly - - SHADOWCASTER + RenderType: Opaque + disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -97,8 +93,8 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _DstBlendAlpha: 10 + - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -113,9 +109,9 @@ Material: - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Surface: 1 + - _Surface: 0 - _WorkflowMode: 1 - - _ZWrite: 0 + - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Materials/PlayerMat.mat b/Assets/Materials/PlayerMat.mat index 259c31f..0b3b6ae 100644 --- a/Assets/Materials/PlayerMat.mat +++ b/Assets/Materials/PlayerMat.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PlayerMat - m_Shader: {fileID: 4800000, guid: 7ddbc50ff7d2d42939fd3e9816f2baf4, type: 3} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -30,7 +30,8 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -127,7 +128,7 @@ Material: - _DissolveHighlightWidth: 0.08 - _DissolveWidth: 0 - _Distortion: 0 - - _DstBlend: 10 + - _DstBlend: 0 - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 0 @@ -149,7 +150,7 @@ Material: - _SpecularHighlights: 1 - _SpeedU: 0 - _SpeedV: 0 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 @@ -166,7 +167,7 @@ Material: - _UseVertexMask: 0 - _VertexFlipX: 1 - _WorkflowMode: 1 - - _ZWrite: 0 + - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _ClipRect: {r: -1, g: -1, b: 1, a: 1} diff --git a/Assets/Prefabs/RuntimeSettingsUI.prefab b/Assets/Prefabs/RuntimeSettingsUI.prefab index 569edab..864d0a4 100644 --- a/Assets/Prefabs/RuntimeSettingsUI.prefab +++ b/Assets/Prefabs/RuntimeSettingsUI.prefab @@ -32,9 +32,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 738559199794729866} 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: -397, y: 1116} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140, y: -54} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6218795531409178724 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 9fe672a..2929bc4 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -382,12 +382,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1080, y: 2340} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 diff --git a/Assets/Scenes/Start.unity b/Assets/Scenes/Start.unity index 72076de..37d44f4 100644 --- a/Assets/Scenes/Start.unity +++ b/Assets/Scenes/Start.unity @@ -233,19 +233,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 203844586} serializedVersion: 2 - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalRotation: {x: 0.35355338, y: -0.35355338, z: 0.1464466, w: 0.8535535} m_LocalPosition: {x: -13.96, y: 3, z: 14.02} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!224 &444670974 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - m_PrefabInstance: {fileID: 1453607734393673572} - m_PrefabAsset: {fileID: 0} + m_LocalEulerAnglesHint: {x: 45, y: -45, z: 0} --- !u!1 &606824761 GameObject: m_ObjectHideFlags: 3 @@ -334,6 +328,74 @@ MonoBehaviour: m_MaximumFOV: 60 m_MinimumOrthoSize: 1 m_MaximumOrthoSize: 5000 +--- !u!1001 &642800686 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalPosition.x + value: 13.98 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalPosition.z + value: -1.97 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4708354386871929370, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_Name + value: TrailRoot (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 305d0010d8b0944179d12671922ebbdb, type: 3} --- !u!1 &649210418 GameObject: m_ObjectHideFlags: 0 @@ -580,6 +642,74 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &870552843 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalPosition.x + value: 9.44 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalPosition.z + value: 16.57 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4708354386871929370, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_Name + value: TrailRoot (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 305d0010d8b0944179d12671922ebbdb, type: 3} --- !u!1 &961739749 GameObject: m_ObjectHideFlags: 0 @@ -717,7 +847,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 70.472, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0} --- !u!114 &961739754 MonoBehaviour: m_ObjectHideFlags: 0 @@ -854,7 +984,7 @@ RectTransform: m_Children: - {fileID: 1567128866} - {fileID: 1102178707} - - {fileID: 444670974} + - {fileID: 2073815149} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -911,127 +1041,142 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1247547178 -GameObject: +--- !u!1001 &1222592676 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1247547182} - - component: {fileID: 1247547181} - - component: {fileID: 1247547180} - - component: {fileID: 1247547179} - m_Layer: 5 - m_Name: Button - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1247547179 -MonoBehaviour: + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalPosition.x + value: 8.32 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalPosition.z + value: -11.88 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4708354386871929370, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_Name + value: TrailRoot (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 305d0010d8b0944179d12671922ebbdb, type: 3} +--- !u!1001 &1397636700 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247547178} - 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: 1247547180} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1247547180 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247547178} - 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: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - 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!222 &1247547181 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247547178} - m_CullTransparentMesh: 1 ---- !u!224 &1247547182 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1247547178} - 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: - - {fileID: 1752672438} - m_Father: {fileID: 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: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalPosition.x + value: -7.3 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalPosition.z + value: -12.78 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4708354386871929370, guid: 305d0010d8b0944179d12671922ebbdb, + type: 3} + propertyPath: m_Name + value: TrailRoot (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 305d0010d8b0944179d12671922ebbdb, type: 3} --- !u!1 &1542954234 GameObject: m_ObjectHideFlags: 0 @@ -1464,140 +1609,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1752672437 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1752672438} - - component: {fileID: 1752672440} - - component: {fileID: 1752672439} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1752672438 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1752672437} - 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: 1247547182} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1752672439 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1752672437} - 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: Button - 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: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - 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: 1 - 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!222 &1752672440 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1752672437} - m_CullTransparentMesh: 1 --- !u!1 &1836106126 GameObject: m_ObjectHideFlags: 0 @@ -1808,169 +1819,12 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1453607734393673572 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1122275124} - m_Modifications: - - target: {fileID: 259465833517525368, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_Color.b - value: 0.4339623 - objectReference: {fileID: 0} - - target: {fileID: 259465833517525368, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_Color.g - value: 0.4339623 - objectReference: {fileID: 0} - - target: {fileID: 259465833517525368, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_Color.r - value: 0.4339623 - objectReference: {fileID: 0} - - target: {fileID: 1144107883013079828, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_Name - value: Pause - objectReference: {fileID: 0} - - target: {fileID: 1780940045160361663, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_fontColor.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1780940045160361663, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_fontColor.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1780940045160361663, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_fontColor.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1780940045160361663, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_fontColor32.rgba - value: 4294967295 - objectReference: {fileID: 0} - - target: {fileID: 1780940045160361663, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_VerticalAlignment - value: 512 - objectReference: {fileID: 0} - - target: {fileID: 1780940045160361663, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 444 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 1066 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4172077542332785284, guid: 027c28fce3a00424a8de120c60655fb6, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 027c28fce3a00424a8de120c60655fb6, type: 3} +--- !u!224 &2073815149 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + m_PrefabInstance: {fileID: 6436705698259306582} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2143333256699706677 PrefabInstance: m_ObjectHideFlags: 0 @@ -2173,7 +2027,7 @@ PrefabInstance: - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -7.34 objectReference: {fileID: 0} - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, type: 3} @@ -2183,7 +2037,7 @@ PrefabInstance: - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, type: 3} propertyPath: m_LocalPosition.z - value: 9.9 + value: 14.21 objectReference: {fileID: 0} - target: {fileID: 1387359303306385943, guid: 305d0010d8b0944179d12671922ebbdb, type: 3} @@ -2248,6 +2102,134 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a40b5077dc83e4f33a9f0718325ff7e8, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &6436705698259306582 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1122275124} + m_Modifications: + - target: {fileID: 3800687982124274857, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_Name + value: Pause + objectReference: {fileID: 0} + - target: {fileID: 6149780881321501707, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 6149780881321501707, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8332918891868354447, guid: 027c28fce3a00424a8de120c60655fb6, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 027c28fce3a00424a8de120c60655fb6, type: 3} --- !u!1001 &8377050102590174623 PrefabInstance: m_ObjectHideFlags: 0 @@ -2383,6 +2365,9 @@ SceneRoots: - {fileID: 707194828} - {fileID: 3270044679103326515} - {fileID: 3786016077816348752} + - {fileID: 1397636700} + - {fileID: 1222592676} + - {fileID: 642800686} + - {fileID: 870552843} - {fileID: 1655261779} - {fileID: 813205549} - - {fileID: 1247547182} diff --git a/Assets/UI/MoveJoystick/MoveJoystick.prefab b/Assets/UI/MoveJoystick/MoveJoystick.prefab index 1cd5ea5..c79db08 100644 --- a/Assets/UI/MoveJoystick/MoveJoystick.prefab +++ b/Assets/UI/MoveJoystick/MoveJoystick.prefab @@ -145,9 +145,9 @@ RectTransform: - {fileID: 6739805442853675050} m_Father: {fileID: 287968043959564548} 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: -640} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 540, y: 409} m_SizeDelta: {x: 280, y: 280} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8893691542894185516 diff --git a/Assets/UI/MoveJoystick/Pause.prefab b/Assets/UI/MoveJoystick/Pause.prefab index 5e6dec9..6ceba12 100644 --- a/Assets/UI/MoveJoystick/Pause.prefab +++ b/Assets/UI/MoveJoystick/Pause.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1144107883013079828 +--- !u!1 &3800687982124274857 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,11 +8,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4172077542332785284} - - component: {fileID: 345602403453948064} - - component: {fileID: 259465833517525368} - - component: {fileID: 6639534625618683748} - - component: {fileID: 1028145701956676060} + - component: {fileID: 8332918891868354447} m_Layer: 5 m_Name: Pause m_TagString: Untagged @@ -20,136 +16,27 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4172077542332785284 +--- !u!224 &8332918891868354447 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1144107883013079828} + m_GameObject: {fileID: 3800687982124274857} 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: - - {fileID: 708533037758194194} + - {fileID: 6149780881321501707} m_Father: {fileID: 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: 444, y: 1066} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -2240, y: -980} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &345602403453948064 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1144107883013079828} - m_CullTransparentMesh: 1 ---- !u!114 &259465833517525368 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1144107883013079828} - 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: 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 &6639534625618683748 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1144107883013079828} - 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: 259465833517525368} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1028145701956676060} - m_TargetAssemblyTypeName: PauseButton, Assembly-CSharp - m_MethodName: OnPauseClicked - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1028145701956676060 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1144107883013079828} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 96966a3c5c8764fc4bedfd83928fce19, type: 3} - m_Name: - m_EditorClassIdentifier: - pauseMenuPrefab: {fileID: 5370029860754155369, guid: ce050e46220d447bc913aa8f8b4e5fa3, - type: 3} - menuParent: {fileID: 0} ---- !u!1 &4344320191675706538 +--- !u!1 &6193457773363309154 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -157,9 +44,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 708533037758194194} - - component: {fileID: 6202124048445091554} - - component: {fileID: 1780940045160361663} + - component: {fileID: 8276661069950509620} + - component: {fileID: 8189395185752065892} + - component: {fileID: 3033873890509332111} m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged @@ -167,40 +54,40 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &708533037758194194 +--- !u!224 &8276661069950509620 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4344320191675706538} + m_GameObject: {fileID: 6193457773363309154} 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: 4172077542332785284} + m_Father: {fileID: 6149780881321501707} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 60, y: -70} + m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6202124048445091554 +--- !u!222 &8189395185752065892 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4344320191675706538} + m_GameObject: {fileID: 6193457773363309154} m_CullTransparentMesh: 1 ---- !u!114 &1780940045160361663 +--- !u!114 &3033873890509332111 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4344320191675706538} + m_GameObject: {fileID: 6193457773363309154} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -223,8 +110,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -283,3 +170,152 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6450473036761059528 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6149780881321501707} + - component: {fileID: 1272269592278693401} + - component: {fileID: 345101623647725815} + - component: {fileID: 8720363317039773883} + - component: {fileID: 6124568347897509198} + m_Layer: 5 + m_Name: Pause_BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6149780881321501707 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6450473036761059528} + 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: + - {fileID: 8276661069950509620} + m_Father: {fileID: 8332918891868354447} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 1039, y: 403} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1272269592278693401 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6450473036761059528} + m_CullTransparentMesh: 1 +--- !u!114 &345101623647725815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6450473036761059528} + 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.4716981, g: 0.4716981, b: 0.4716981, 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 &8720363317039773883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6450473036761059528} + 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: 345101623647725815} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6124568347897509198} + m_TargetAssemblyTypeName: PauseButton, Assembly-CSharp + m_MethodName: OnPauseClicked + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &6124568347897509198 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6450473036761059528} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 96966a3c5c8764fc4bedfd83928fce19, type: 3} + m_Name: + m_EditorClassIdentifier: + pauseMenuPrefab: {fileID: 5370029860754155369, guid: ce050e46220d447bc913aa8f8b4e5fa3, + type: 3} + menuParent: {fileID: 0}