From 1ce57639e74a0fea968226138e73767659a014a1 Mon Sep 17 00:00:00 2001 From: villaingames Date: Mon, 16 Oct 2023 20:48:03 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=EC=9B=8C=EC=A1=B0=EC=A0=88=20UI=20?= =?UTF-8?q?=EB=B0=8F=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 슬라이더로 변경 - 물체 Addforce 방식 변경(각도 범위 내 랜덤) --- .../AssetGroups/Characters.asset | 14 +- .../Characters/Prefabs/Player_Cop.prefab | 405 ++++++++++------- .../Characters/Prefabs/Player_Cowboy.prefab | 407 +++++++++++------- .../Prefabs/Player_Cowboy.prefab.meta | 2 +- .../Characters/Prefabs/Player_Female01.prefab | 407 +++++++++++------- .../Prefabs/Player_Female01.prefab.meta | 2 +- .../Characters/Prefabs/Player_Female02.prefab | 407 +++++++++++------- .../Prefabs/Player_Female02.prefab.meta | 2 +- .../AddressableResources/Tables/JPlayer.json | 8 +- .../UI/Stage/UIPanelStage.prefab | 2 + Assets/Scripts/Etc/Constants.cs | 2 +- .../Scene/SingleStageSceneController.cs | 7 + .../Stage/Controller/MinigameController.cs | 33 +- .../Stage/Controller/PlayerController.cs | 7 +- .../Stage/Controller/PropController.cs | 20 +- Assets/Scripts/Stage/Events/StageEvents.cs | 12 + Assets/Scripts/Stage/Manage/StageManager.cs | 3 +- Assets/Scripts/UI/Stage/UIPanelStage.cs | 10 + 18 files changed, 1064 insertions(+), 686 deletions(-) diff --git a/Assets/AddressableAssetsData/AssetGroups/Characters.asset b/Assets/AddressableAssetsData/AssetGroups/Characters.asset index 3fdc641..3c44c37 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Characters.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Characters.asset @@ -22,17 +22,17 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: e96f518301af6cb408c911f8d96c1215 - m_Address: Player_Cowboy - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 13c3758736541e44a8e863745f5b125f + - m_GUID: b0c69b922aa740345a46579fc2b88f0e m_Address: Player_Female01 m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 - - m_GUID: 0f172b21f80f7244987e730fec11a12f + - m_GUID: 5879610e23964c149a4cf6507d590a33 + m_Address: Player_Cowboy + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: d4d558cb2be50fe4c84a407f706f5170 m_Address: Player_Female02 m_ReadOnly: 0 m_SerializedLabels: [] diff --git a/Assets/AddressableResources/Characters/Prefabs/Player_Cop.prefab b/Assets/AddressableResources/Characters/Prefabs/Player_Cop.prefab index 774f9ff..8a5696c 100644 --- a/Assets/AddressableResources/Characters/Prefabs/Player_Cop.prefab +++ b/Assets/AddressableResources/Characters/Prefabs/Player_Cop.prefab @@ -1,5 +1,244 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2112324817718801814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1537274028833927024} + - component: {fileID: 377002213795747568} + m_Layer: 5 + m_Name: Slider_IconType02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1537274028833927024 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2112324817718801814} + 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: 4644710923886947921} + - {fileID: 3128588514070410210} + m_Father: {fileID: 3623812035191485470} + 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: 140, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &377002213795747568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2112324817718801814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 1214105951615742018} + m_FillRect: {fileID: 3128588514070410210} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &2795506843107735279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4644710923886947921} + - component: {fileID: 400052664967700695} + - component: {fileID: 1214105951615742018} + m_Layer: 5 + m_Name: Slider_IconType02_Frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4644710923886947921 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2795506843107735279} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0000063329935} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1537274028833927024} + 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!222 &400052664967700695 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2795506843107735279} + m_CullTransparentMesh: 0 +--- !u!114 &1214105951615742018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2795506843107735279} + 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: 299a90a20014649b08b2b908b2cd9f01, type: 3} + 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!1 &4788077713684358222 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3128588514070410210} + - component: {fileID: 2483531577146866267} + - component: {fileID: 6345224349433822381} + m_Layer: 5 + m_Name: Slider_IconType02_Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3128588514070410210 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4788077713684358222} + 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: 1537274028833927024} + 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!222 &2483531577146866267 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4788077713684358222} + m_CullTransparentMesh: 0 +--- !u!114 &6345224349433822381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4788077713684358222} + 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: 4ddc2082251c84e67adbea97fdabceb1, type: 3} + 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!1 &5537478090616612689 GameObject: m_ObjectHideFlags: 0 @@ -16,7 +255,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3623812035191485470 RectTransform: m_ObjectHideFlags: 0 @@ -29,7 +268,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1567541202839507901} + - {fileID: 1537274028833927024} m_Father: {fileID: 4581683211894441857} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -49,8 +288,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0d69119b63d5a9b4bbf89378d90c6496, type: 3} m_Name: m_EditorClassIdentifier: - _bgRect: {fileID: 1567541202839507901} - _holder: {fileID: 3057373282978890765} + _bgRect: {fileID: 0} + _gauge: {fileID: 377002213795747568} --- !u!1 &5683023600944451917 GameObject: m_ObjectHideFlags: 0 @@ -236,7 +475,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 @@ -281,157 +520,6 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &8348957975414783624 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1567541202839507901} - - component: {fileID: 3379051410993385840} - - component: {fileID: 7738489847354638638} - m_Layer: 0 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1567541202839507901 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348957975414783624} - 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: 2934959609601784276} - m_Father: {fileID: 3623812035191485470} - 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: 140, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3379051410993385840 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348957975414783624} - m_CullTransparentMesh: 1 ---- !u!114 &7738489847354638638 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348957975414783624} - 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!1 &8782600941435266400 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2934959609601784276} - - component: {fileID: 7596924951948915478} - - component: {fileID: 3057373282978890765} - m_Layer: 0 - m_Name: Holder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2934959609601784276 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8782600941435266400} - 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: 1567541202839507901} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 70, y: 0} - m_SizeDelta: {x: 5, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7596924951948915478 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8782600941435266400} - m_CullTransparentMesh: 1 ---- !u!114 &3057373282978890765 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8782600941435266400} - 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.3773585, g: 0.3773585, b: 0.3773585, 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!1 &9183878442997009333 GameObject: m_ObjectHideFlags: 0 @@ -444,7 +532,7 @@ GameObject: - component: {fileID: 9151583754428987945} - component: {fileID: 9161262214850749213} m_Layer: 0 - m_Name: Cop + m_Name: Model m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -459,7 +547,7 @@ Transform: m_GameObject: {fileID: 9183878442997009333} serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -566,7 +654,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _minigameController: {fileID: 2780159524716559223} - _characterRenderer: {fileID: 9161262214850749213} _playerCam: {fileID: 8295369173337790907} --- !u!143 &1319893631350053148 CharacterController: diff --git a/Assets/AddressableResources/Characters/Prefabs/Player_Cowboy.prefab b/Assets/AddressableResources/Characters/Prefabs/Player_Cowboy.prefab index b331072..ec8051b 100644 --- a/Assets/AddressableResources/Characters/Prefabs/Player_Cowboy.prefab +++ b/Assets/AddressableResources/Characters/Prefabs/Player_Cowboy.prefab @@ -1,5 +1,244 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2112324817718801814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1537274028833927024} + - component: {fileID: 377002213795747568} + m_Layer: 5 + m_Name: Slider_IconType02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1537274028833927024 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2112324817718801814} + 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: 4644710923886947921} + - {fileID: 3128588514070410210} + m_Father: {fileID: 3623812035191485470} + 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: 140, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &377002213795747568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2112324817718801814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 1214105951615742018} + m_FillRect: {fileID: 3128588514070410210} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &2795506843107735279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4644710923886947921} + - component: {fileID: 400052664967700695} + - component: {fileID: 1214105951615742018} + m_Layer: 5 + m_Name: Slider_IconType02_Frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4644710923886947921 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2795506843107735279} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0000063329935} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1537274028833927024} + 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!222 &400052664967700695 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2795506843107735279} + m_CullTransparentMesh: 0 +--- !u!114 &1214105951615742018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2795506843107735279} + 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: 299a90a20014649b08b2b908b2cd9f01, type: 3} + 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!1 &4788077713684358222 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3128588514070410210} + - component: {fileID: 2483531577146866267} + - component: {fileID: 6345224349433822381} + m_Layer: 5 + m_Name: Slider_IconType02_Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3128588514070410210 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4788077713684358222} + 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: 1537274028833927024} + 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!222 &2483531577146866267 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4788077713684358222} + m_CullTransparentMesh: 0 +--- !u!114 &6345224349433822381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4788077713684358222} + 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: 4ddc2082251c84e67adbea97fdabceb1, type: 3} + 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!1 &5537478090616612689 GameObject: m_ObjectHideFlags: 0 @@ -16,7 +255,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3623812035191485470 RectTransform: m_ObjectHideFlags: 0 @@ -29,7 +268,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1567541202839507901} + - {fileID: 1537274028833927024} m_Father: {fileID: 4581683211894441857} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -49,8 +288,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0d69119b63d5a9b4bbf89378d90c6496, type: 3} m_Name: m_EditorClassIdentifier: - _bgRect: {fileID: 1567541202839507901} - _holder: {fileID: 3057373282978890765} + _bgRect: {fileID: 0} + _gauge: {fileID: 377002213795747568} --- !u!1 &5683023600944451917 GameObject: m_ObjectHideFlags: 0 @@ -236,7 +475,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 @@ -281,157 +520,6 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &8348957975414783624 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1567541202839507901} - - component: {fileID: 3379051410993385840} - - component: {fileID: 7738489847354638638} - m_Layer: 0 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1567541202839507901 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348957975414783624} - 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: 2934959609601784276} - m_Father: {fileID: 3623812035191485470} - 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: 140, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3379051410993385840 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348957975414783624} - m_CullTransparentMesh: 1 ---- !u!114 &7738489847354638638 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348957975414783624} - 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!1 &8782600941435266400 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2934959609601784276} - - component: {fileID: 7596924951948915478} - - component: {fileID: 3057373282978890765} - m_Layer: 0 - m_Name: Holder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2934959609601784276 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8782600941435266400} - 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: 1567541202839507901} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 70, y: 0} - m_SizeDelta: {x: 5, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7596924951948915478 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8782600941435266400} - m_CullTransparentMesh: 1 ---- !u!114 &3057373282978890765 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8782600941435266400} - 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.3773585, g: 0.3773585, b: 0.3773585, 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!1 &9183878442997009333 GameObject: m_ObjectHideFlags: 0 @@ -444,7 +532,7 @@ GameObject: - component: {fileID: 9151583754428987945} - component: {fileID: 9161262214850749213} m_Layer: 0 - m_Name: Cop + m_Name: Model m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -529,7 +617,7 @@ GameObject: - component: {fileID: 2140123478648627397} - component: {fileID: 1319893631350053148} - component: {fileID: 3029072877129923665} - - component: {fileID: 5948098750537304418} + - component: {fileID: 8567422993077356588} m_Layer: 0 m_Name: Player_Cowboy m_TagString: Untagged @@ -566,7 +654,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _minigameController: {fileID: 2780159524716559223} - _characterRenderer: {fileID: 9161262214850749213} _playerCam: {fileID: 8295369173337790907} --- !u!143 &1319893631350053148 CharacterController: @@ -608,7 +695,7 @@ MonoBehaviour: m_EditorClassIdentifier: _playerObj: {fileID: 9185467096088431885} _characterController: {fileID: 1319893631350053148} ---- !u!136 &5948098750537304418 +--- !u!136 &8567422993077356588 CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/AddressableResources/Characters/Prefabs/Player_Cowboy.prefab.meta b/Assets/AddressableResources/Characters/Prefabs/Player_Cowboy.prefab.meta index 1d24c41..51ceb65 100644 --- a/Assets/AddressableResources/Characters/Prefabs/Player_Cowboy.prefab.meta +++ b/Assets/AddressableResources/Characters/Prefabs/Player_Cowboy.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e96f518301af6cb408c911f8d96c1215 +guid: 5879610e23964c149a4cf6507d590a33 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/AddressableResources/Characters/Prefabs/Player_Female01.prefab b/Assets/AddressableResources/Characters/Prefabs/Player_Female01.prefab index e0b4885..e17a4aa 100644 --- a/Assets/AddressableResources/Characters/Prefabs/Player_Female01.prefab +++ b/Assets/AddressableResources/Characters/Prefabs/Player_Female01.prefab @@ -1,5 +1,244 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2112324817718801814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1537274028833927024} + - component: {fileID: 377002213795747568} + m_Layer: 5 + m_Name: Slider_IconType02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1537274028833927024 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2112324817718801814} + 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: 4644710923886947921} + - {fileID: 3128588514070410210} + m_Father: {fileID: 3623812035191485470} + 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: 140, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &377002213795747568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2112324817718801814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 1214105951615742018} + m_FillRect: {fileID: 3128588514070410210} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &2795506843107735279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4644710923886947921} + - component: {fileID: 400052664967700695} + - component: {fileID: 1214105951615742018} + m_Layer: 5 + m_Name: Slider_IconType02_Frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4644710923886947921 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2795506843107735279} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0000063329935} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1537274028833927024} + 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!222 &400052664967700695 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2795506843107735279} + m_CullTransparentMesh: 0 +--- !u!114 &1214105951615742018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2795506843107735279} + 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: 299a90a20014649b08b2b908b2cd9f01, type: 3} + 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!1 &4788077713684358222 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3128588514070410210} + - component: {fileID: 2483531577146866267} + - component: {fileID: 6345224349433822381} + m_Layer: 5 + m_Name: Slider_IconType02_Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3128588514070410210 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4788077713684358222} + 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: 1537274028833927024} + 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!222 &2483531577146866267 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4788077713684358222} + m_CullTransparentMesh: 0 +--- !u!114 &6345224349433822381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4788077713684358222} + 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: 4ddc2082251c84e67adbea97fdabceb1, type: 3} + 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!1 &5537478090616612689 GameObject: m_ObjectHideFlags: 0 @@ -16,7 +255,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3623812035191485470 RectTransform: m_ObjectHideFlags: 0 @@ -29,7 +268,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1567541202839507901} + - {fileID: 1537274028833927024} m_Father: {fileID: 4581683211894441857} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -49,8 +288,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0d69119b63d5a9b4bbf89378d90c6496, type: 3} m_Name: m_EditorClassIdentifier: - _bgRect: {fileID: 1567541202839507901} - _holder: {fileID: 3057373282978890765} + _bgRect: {fileID: 0} + _gauge: {fileID: 377002213795747568} --- !u!1 &5683023600944451917 GameObject: m_ObjectHideFlags: 0 @@ -236,7 +475,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 @@ -281,157 +520,6 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &8348957975414783624 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1567541202839507901} - - component: {fileID: 3379051410993385840} - - component: {fileID: 7738489847354638638} - m_Layer: 0 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1567541202839507901 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348957975414783624} - 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: 2934959609601784276} - m_Father: {fileID: 3623812035191485470} - 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: 140, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3379051410993385840 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348957975414783624} - m_CullTransparentMesh: 1 ---- !u!114 &7738489847354638638 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348957975414783624} - 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!1 &8782600941435266400 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2934959609601784276} - - component: {fileID: 7596924951948915478} - - component: {fileID: 3057373282978890765} - m_Layer: 0 - m_Name: Holder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2934959609601784276 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8782600941435266400} - 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: 1567541202839507901} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 70, y: 0} - m_SizeDelta: {x: 5, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7596924951948915478 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8782600941435266400} - m_CullTransparentMesh: 1 ---- !u!114 &3057373282978890765 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8782600941435266400} - 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.3773585, g: 0.3773585, b: 0.3773585, 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!1 &9183878442997009333 GameObject: m_ObjectHideFlags: 0 @@ -444,7 +532,7 @@ GameObject: - component: {fileID: 9151583754428987945} - component: {fileID: 9161262214850749213} m_Layer: 0 - m_Name: Cop + m_Name: Model m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -529,7 +617,7 @@ GameObject: - component: {fileID: 2140123478648627397} - component: {fileID: 1319893631350053148} - component: {fileID: 3029072877129923665} - - component: {fileID: 4558750650324747419} + - component: {fileID: 8567422993077356588} m_Layer: 0 m_Name: Player_Female01 m_TagString: Untagged @@ -566,7 +654,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _minigameController: {fileID: 2780159524716559223} - _characterRenderer: {fileID: 9161262214850749213} _playerCam: {fileID: 8295369173337790907} --- !u!143 &1319893631350053148 CharacterController: @@ -608,7 +695,7 @@ MonoBehaviour: m_EditorClassIdentifier: _playerObj: {fileID: 9185467096088431885} _characterController: {fileID: 1319893631350053148} ---- !u!136 &4558750650324747419 +--- !u!136 &8567422993077356588 CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/AddressableResources/Characters/Prefabs/Player_Female01.prefab.meta b/Assets/AddressableResources/Characters/Prefabs/Player_Female01.prefab.meta index 0fc7329..bac6983 100644 --- a/Assets/AddressableResources/Characters/Prefabs/Player_Female01.prefab.meta +++ b/Assets/AddressableResources/Characters/Prefabs/Player_Female01.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 13c3758736541e44a8e863745f5b125f +guid: b0c69b922aa740345a46579fc2b88f0e PrefabImporter: externalObjects: {} userData: diff --git a/Assets/AddressableResources/Characters/Prefabs/Player_Female02.prefab b/Assets/AddressableResources/Characters/Prefabs/Player_Female02.prefab index 1c607ca..269e376 100644 --- a/Assets/AddressableResources/Characters/Prefabs/Player_Female02.prefab +++ b/Assets/AddressableResources/Characters/Prefabs/Player_Female02.prefab @@ -1,5 +1,244 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2112324817718801814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1537274028833927024} + - component: {fileID: 377002213795747568} + m_Layer: 5 + m_Name: Slider_IconType02 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1537274028833927024 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2112324817718801814} + 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: 4644710923886947921} + - {fileID: 3128588514070410210} + m_Father: {fileID: 3623812035191485470} + 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: 140, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &377002213795747568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2112324817718801814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 1214105951615742018} + m_FillRect: {fileID: 3128588514070410210} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &2795506843107735279 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4644710923886947921} + - component: {fileID: 400052664967700695} + - component: {fileID: 1214105951615742018} + m_Layer: 5 + m_Name: Slider_IconType02_Frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4644710923886947921 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2795506843107735279} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0000063329935} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1537274028833927024} + 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!222 &400052664967700695 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2795506843107735279} + m_CullTransparentMesh: 0 +--- !u!114 &1214105951615742018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2795506843107735279} + 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: 299a90a20014649b08b2b908b2cd9f01, type: 3} + 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!1 &4788077713684358222 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3128588514070410210} + - component: {fileID: 2483531577146866267} + - component: {fileID: 6345224349433822381} + m_Layer: 5 + m_Name: Slider_IconType02_Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3128588514070410210 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4788077713684358222} + 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: 1537274028833927024} + 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!222 &2483531577146866267 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4788077713684358222} + m_CullTransparentMesh: 0 +--- !u!114 &6345224349433822381 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4788077713684358222} + 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: 4ddc2082251c84e67adbea97fdabceb1, type: 3} + 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!1 &5537478090616612689 GameObject: m_ObjectHideFlags: 0 @@ -16,7 +255,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3623812035191485470 RectTransform: m_ObjectHideFlags: 0 @@ -29,7 +268,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1567541202839507901} + - {fileID: 1537274028833927024} m_Father: {fileID: 4581683211894441857} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -49,8 +288,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0d69119b63d5a9b4bbf89378d90c6496, type: 3} m_Name: m_EditorClassIdentifier: - _bgRect: {fileID: 1567541202839507901} - _holder: {fileID: 3057373282978890765} + _bgRect: {fileID: 0} + _gauge: {fileID: 377002213795747568} --- !u!1 &5683023600944451917 GameObject: m_ObjectHideFlags: 0 @@ -236,7 +475,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 1 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 @@ -281,157 +520,6 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &8348957975414783624 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1567541202839507901} - - component: {fileID: 3379051410993385840} - - component: {fileID: 7738489847354638638} - m_Layer: 0 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1567541202839507901 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348957975414783624} - 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: 2934959609601784276} - m_Father: {fileID: 3623812035191485470} - 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: 140, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3379051410993385840 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348957975414783624} - m_CullTransparentMesh: 1 ---- !u!114 &7738489847354638638 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8348957975414783624} - 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!1 &8782600941435266400 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2934959609601784276} - - component: {fileID: 7596924951948915478} - - component: {fileID: 3057373282978890765} - m_Layer: 0 - m_Name: Holder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2934959609601784276 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8782600941435266400} - 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: 1567541202839507901} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 70, y: 0} - m_SizeDelta: {x: 5, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7596924951948915478 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8782600941435266400} - m_CullTransparentMesh: 1 ---- !u!114 &3057373282978890765 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8782600941435266400} - 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.3773585, g: 0.3773585, b: 0.3773585, 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!1 &9183878442997009333 GameObject: m_ObjectHideFlags: 0 @@ -444,7 +532,7 @@ GameObject: - component: {fileID: 9151583754428987945} - component: {fileID: 9161262214850749213} m_Layer: 0 - m_Name: Cop + m_Name: Model m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -529,7 +617,7 @@ GameObject: - component: {fileID: 2140123478648627397} - component: {fileID: 1319893631350053148} - component: {fileID: 3029072877129923665} - - component: {fileID: 7283136279876262611} + - component: {fileID: 8567422993077356588} m_Layer: 0 m_Name: Player_Female02 m_TagString: Untagged @@ -566,7 +654,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _minigameController: {fileID: 2780159524716559223} - _characterRenderer: {fileID: 9161262214850749213} _playerCam: {fileID: 8295369173337790907} --- !u!143 &1319893631350053148 CharacterController: @@ -608,7 +695,7 @@ MonoBehaviour: m_EditorClassIdentifier: _playerObj: {fileID: 9185467096088431885} _characterController: {fileID: 1319893631350053148} ---- !u!136 &7283136279876262611 +--- !u!136 &8567422993077356588 CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/AddressableResources/Characters/Prefabs/Player_Female02.prefab.meta b/Assets/AddressableResources/Characters/Prefabs/Player_Female02.prefab.meta index 99bb99f..8756592 100644 --- a/Assets/AddressableResources/Characters/Prefabs/Player_Female02.prefab.meta +++ b/Assets/AddressableResources/Characters/Prefabs/Player_Female02.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0f172b21f80f7244987e730fec11a12f +guid: d4d558cb2be50fe4c84a407f706f5170 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/AddressableResources/Tables/JPlayer.json b/Assets/AddressableResources/Tables/JPlayer.json index c2bbe93..dea38e2 100644 --- a/Assets/AddressableResources/Tables/JPlayer.json +++ b/Assets/AddressableResources/Tables/JPlayer.json @@ -2,7 +2,7 @@ "list": [ { "Id": 1, - "Str": 2000, + "Str": 50, "Range": 2.0, "Speed": 3.0, "PrefabName": "Player_Cop", @@ -10,7 +10,7 @@ }, { "Id": 2, - "Str": 2200, + "Str": 55, "Range": 2.5, "Speed": 2.5, "PrefabName": "Player_Cowboy", @@ -18,7 +18,7 @@ }, { "Id": 3, - "Str": 1800, + "Str": 45, "Range": 2.8, "Speed": 2.5, "PrefabName": "Player_Female01", @@ -26,7 +26,7 @@ }, { "Id": 4, - "Str": 1800, + "Str": 40, "Range": 2.5, "Speed": 2.8, "PrefabName": "Player_Female02", diff --git a/Assets/AddressableResources/UI/Stage/UIPanelStage.prefab b/Assets/AddressableResources/UI/Stage/UIPanelStage.prefab index c4f1100..1fde022 100644 --- a/Assets/AddressableResources/UI/Stage/UIPanelStage.prefab +++ b/Assets/AddressableResources/UI/Stage/UIPanelStage.prefab @@ -274,6 +274,8 @@ MonoBehaviour: _settingButton: {fileID: 4206944545761638098} _spawnTimer: {fileID: 470785271292392503} _playTimer: {fileID: 5196473190348363001} + _redTeamScoreText: {fileID: 6473347727893299575} + _blueTeamScoreText: {fileID: 5303882089696033561} --- !u!1 &1998614922332527177 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Etc/Constants.cs b/Assets/Scripts/Etc/Constants.cs index b8bfd54..14a5926 100644 --- a/Assets/Scripts/Etc/Constants.cs +++ b/Assets/Scripts/Etc/Constants.cs @@ -4,7 +4,7 @@ using UnityEngine; public static class Constants { - public static readonly float PLAY_TIME = 60; + public static readonly float PLAY_TIME = 120; public static readonly int PLAYER_SPAWN_TIME = 3; //TODO : 콺  Ȯ ʿ diff --git a/Assets/Scripts/Manage/Scene/SingleStageSceneController.cs b/Assets/Scripts/Manage/Scene/SingleStageSceneController.cs index c47801d..f6c7f98 100644 --- a/Assets/Scripts/Manage/Scene/SingleStageSceneController.cs +++ b/Assets/Scripts/Manage/Scene/SingleStageSceneController.cs @@ -12,6 +12,7 @@ public class SingleStageSceneController : MonoBehaviour EventBus.Instance.Subscribe(OnUpdateSapwnTimer); EventBus.Instance.Subscribe(OnStartGame); EventBus.Instance.Subscribe(OnUpdatePlayTimer); + EventBus.Instance.Subscribe(OnUpdateScore); } private void OnDestroy() @@ -20,6 +21,7 @@ public class SingleStageSceneController : MonoBehaviour EventBus.Instance.Unsubscribe(OnUpdateSapwnTimer); EventBus.Instance.Unsubscribe(OnStartGame); EventBus.Instance.Unsubscribe(OnUpdatePlayTimer); + EventBus.Instance.Unsubscribe(OnUpdateScore); } private void OnStartStage(EventStartStage e) @@ -46,4 +48,9 @@ public class SingleStageSceneController : MonoBehaviour { _stageUI.UpdatePlayTimer(e.Timer); } + + private void OnUpdateScore(EventUpdateScore e) + { + _stageUI.UpdateScore(e.Team, e.Score); + } } diff --git a/Assets/Scripts/Stage/Controller/MinigameController.cs b/Assets/Scripts/Stage/Controller/MinigameController.cs index cd00ef0..b49b1b3 100644 --- a/Assets/Scripts/Stage/Controller/MinigameController.cs +++ b/Assets/Scripts/Stage/Controller/MinigameController.cs @@ -8,22 +8,21 @@ using UnityEngine.UI; public class MinigameController : MonoBehaviour { [SerializeField] private RectTransform _bgRect; - [SerializeField] private Image _holder; + [SerializeField] private Slider _gauge; - private float _range = 0; - private float _moveSpeed = 200; + private float _moveSpeed = 3; private bool _isStop = false; private Coroutine _moveCoroutine; private void Start() { - _range = _bgRect.rect.width / 2; - EventBus.Instance.Subscribe(OnMinigameStop); } public void StartGame() { + _gauge.gameObject.SetActive(true); + _gauge.value = 0; _isStop = false; if(_moveCoroutine != null) { @@ -38,23 +37,27 @@ public class MinigameController : MonoBehaviour } private IEnumerator MoveHolder() { - float range = _bgRect.rect.width / 2; - float xPos = -range; - float dir = 1; + float value = 0; + int dir = 1; while(!_isStop) { - if(xPos >= range || xPos <= -range) + value += Time.deltaTime * _moveSpeed * dir; + if(value > 1f) { - dir *= -1; + value = 1f; + dir = -1; } - - xPos += dir * _moveSpeed * Time.deltaTime; - _holder.GetComponent().anchoredPosition = new Vector2(xPos, 0); - + if(value < 0) + { + value = 0; + dir = 1; + } + _gauge.value = value; yield return null; } - float point = 1 - (Math.Abs(xPos) / range); + float point = _gauge.value; + _gauge.gameObject.SetActive(false); EventBus.Instance.Publish(new EventSendMinigamePoint(point)); } } diff --git a/Assets/Scripts/Stage/Controller/PlayerController.cs b/Assets/Scripts/Stage/Controller/PlayerController.cs index 6a7b4fd..3ac6190 100644 --- a/Assets/Scripts/Stage/Controller/PlayerController.cs +++ b/Assets/Scripts/Stage/Controller/PlayerController.cs @@ -7,7 +7,6 @@ using UnityEngine.Rendering.Universal; public class PlayerController : MonoBehaviour { [SerializeField] private MinigameController _minigameController; - [SerializeField] private Renderer _characterRenderer; [SerializeField] private Camera _playerCam; private bool _isPushed = false; @@ -80,7 +79,7 @@ public class PlayerController : MonoBehaviour } private void Push(float point) { - Collider[] colliders = Physics.OverlapSphere(transform.position, 2); + Collider[] colliders = Physics.OverlapSphere(transform.position, _tableData.RANGE); foreach (var collider in colliders) { @@ -89,7 +88,7 @@ public class PlayerController : MonoBehaviour var prop = collider.GetComponent(); if(prop != null) { - prop.Explode(_tableData, transform.position, _currentTeam); + prop.Explode(_tableData.STR, transform.position, point, _currentTeam); } } @@ -106,12 +105,10 @@ public class PlayerController : MonoBehaviour public void Respawn() { IsBlock = false; - _characterRenderer.enabled = true; } public void Block() { - _characterRenderer.enabled = false; IsBlock = true; } diff --git a/Assets/Scripts/Stage/Controller/PropController.cs b/Assets/Scripts/Stage/Controller/PropController.cs index 729f0be..4df1540 100644 --- a/Assets/Scripts/Stage/Controller/PropController.cs +++ b/Assets/Scripts/Stage/Controller/PropController.cs @@ -12,11 +12,11 @@ public class PropController : MonoBehaviour private Rigidbody _rigidBody; private JPropInfoData _data; - private void Start() - { - - } + private void OnEnable() + { + _hitTeam = E_TEAM.None; + } public void SetData(JPropInfoData data, Bounds bound) { _rigidBody = GetComponent(); @@ -33,13 +33,13 @@ public class PropController : MonoBehaviour transform.position = randomPos; } - public void Explode(PlayerInfo info, Vector3 position, E_TEAM team) + public void Explode(int str, Vector3 position, float dist, E_TEAM team) { - //info ؼ ߰ - float power = info.STR + 2000; - //info ؼ ߰ - float range = 20 + info.RANGE; - _rigidBody.AddExplosionForce(power, position, range); + Vector3 dir = transform.position - position; + int rndAngle = Random.Range(-45, -30); + dir = Quaternion.AngleAxis(rndAngle, Vector3.right) * dir; + + _rigidBody.AddForce(dir.normalized * str * dist, ForceMode.Impulse); _hitTeam = team; } diff --git a/Assets/Scripts/Stage/Events/StageEvents.cs b/Assets/Scripts/Stage/Events/StageEvents.cs index 67e9f99..2993b08 100644 --- a/Assets/Scripts/Stage/Events/StageEvents.cs +++ b/Assets/Scripts/Stage/Events/StageEvents.cs @@ -55,4 +55,16 @@ public class EventPlayTimer : EventBase { Timer = timer; } +} + +public class EventUpdateScore : EventBase +{ + public E_TEAM Team { get; private set; } + public int Score { get; private set; } + + public EventUpdateScore(E_TEAM team, int score) + { + Team = team; + Score = score; + } } \ No newline at end of file diff --git a/Assets/Scripts/Stage/Manage/StageManager.cs b/Assets/Scripts/Stage/Manage/StageManager.cs index 4b7f05a..b2f935b 100644 --- a/Assets/Scripts/Stage/Manage/StageManager.cs +++ b/Assets/Scripts/Stage/Manage/StageManager.cs @@ -54,8 +54,7 @@ public class StageManager : UnitySingletonOnce if (_teamScoreDict.ContainsKey(team)) { _teamScoreDict[team] += score; - //TODO : UI ǥ - Debug.Log($"Current Score : {_teamScoreDict[team]}"); + EventBus.Instance.Publish(new EventUpdateScore(team, _teamScoreDict[team])); } } diff --git a/Assets/Scripts/UI/Stage/UIPanelStage.cs b/Assets/Scripts/UI/Stage/UIPanelStage.cs index be1b95a..5cec4c6 100644 --- a/Assets/Scripts/UI/Stage/UIPanelStage.cs +++ b/Assets/Scripts/UI/Stage/UIPanelStage.cs @@ -10,6 +10,9 @@ public class UIPanelStage : UIBase [SerializeField] private Button _settingButton; [SerializeField] private TextMeshProUGUI _spawnTimer; [SerializeField] private TextMeshProUGUI _playTimer; + + [SerializeField] private TextMeshProUGUI _redTeamScoreText; + [SerializeField] private TextMeshProUGUI _blueTeamScoreText; public override void Open() { _spawnTimer.text = string.Empty; @@ -43,4 +46,11 @@ public class UIPanelStage : UIBase yield return new WaitForSeconds(.5f); _spawnTimer.text = string.Empty; } + + public void UpdateScore(E_TEAM team, int score) + { + var textObj = team == E_TEAM.Red ? _redTeamScoreText : _blueTeamScoreText; + + textObj.SetText(score.ToString()); + } }