diff --git a/Assets/01.Scenes/_A.LMG.unity b/Assets/01.Scenes/_A.LMG.unity index 1f149ce71..6befdd1a8 100644 --- a/Assets/01.Scenes/_A.LMG.unity +++ b/Assets/01.Scenes/_A.LMG.unity @@ -1037,7 +1037,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 106.3 + value: 150 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y @@ -1073,7 +1073,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.x - value: 295.75 + value: 455 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.y @@ -3922,6 +3922,114 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &286269068 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 286269069} + - component: {fileID: 286269072} + - component: {fileID: 286269071} + - component: {fileID: 286269070} + m_Layer: 0 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &286269069 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 286269068} + 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: 2008435267} + - {fileID: 1031459856} + m_Father: {fileID: 1489284987} + 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: -404.6, y: -26.95} + m_SizeDelta: {x: 850, y: 650} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &286269070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 286269068} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 0} + m_Horizontal: 1 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 2008435267} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 1031459857} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &286269071 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 286269068} + 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: 0.392} + 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: 10907, 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 &286269072 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 286269068} + m_CullTransparentMesh: 1 --- !u!1001 &308211526 PrefabInstance: m_ObjectHideFlags: 0 @@ -4504,7 +4612,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 106.3 + value: 150 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y @@ -4540,7 +4648,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.x - value: 412.05002 + value: 615 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.y @@ -4865,7 +4973,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 106.3 + value: 150 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y @@ -4901,7 +5009,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.x - value: 63.15 + value: 135 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.y @@ -7006,7 +7114,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 106.3 + value: 150 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y @@ -7042,7 +7150,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.x - value: 295.75 + value: 455 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.y @@ -9684,7 +9792,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 106.3 + value: 150 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y @@ -9720,7 +9828,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.x - value: 179.45001 + value: 295 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.y @@ -12524,6 +12632,132 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1031459855 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1031459856} + - component: {fileID: 1031459859} + - component: {fileID: 1031459858} + - component: {fileID: 1031459857} + m_Layer: 0 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1031459856 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1031459855} + 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: 1174160395} + m_Father: {fileID: 286269069} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -831, y: 0} + m_SizeDelta: {x: 20, y: -17} + m_Pivot: {x: 1, y: 1} +--- !u!114 &1031459857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1031459855} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 1846610468} + m_HandleRect: {fileID: 1846610467} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1031459858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1031459855} + 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: 10907, 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 &1031459859 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1031459855} + m_CullTransparentMesh: 1 --- !u!4 &1038321203 stripped Transform: m_CorrespondingSourceObject: {fileID: 6190127373159935981, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} @@ -14238,7 +14472,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 106.3 + value: 150 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y @@ -14274,7 +14508,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.x - value: 644.65 + value: 935 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.y @@ -14456,6 +14690,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1173162350} m_CullTransparentMesh: 1 +--- !u!1 &1174160394 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1174160395} + m_Layer: 0 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1174160395 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1174160394} + 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: 1846610467} + m_Father: {fileID: 1031459856} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &1174451532 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} @@ -18192,7 +18462,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1489284987} - - {fileID: 1920271866} - {fileID: 1761154679} - {fileID: 1196852655} - {fileID: 1547401329} @@ -19560,7 +19829,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 286269069} m_Father: {fileID: 1412500829} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -20970,7 +21240,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 106.3 + value: 150 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y @@ -21006,7 +21276,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.x - value: 412.05002 + value: 615 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.y @@ -24006,7 +24276,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 106.3 + value: 150 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y @@ -24042,7 +24312,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.x - value: 760.9501 + value: 1095 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.y @@ -24112,7 +24382,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 106.3 + value: 150 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y @@ -24148,7 +24418,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.x - value: 528.35004 + value: 775 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.y @@ -26013,7 +26283,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 106.3 + value: 150 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y @@ -26049,7 +26319,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.x - value: 644.65 + value: 935 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.y @@ -26213,6 +26483,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1839291792} m_CullTransparentMesh: 1 +--- !u!1 &1846610466 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1846610467} + - component: {fileID: 1846610469} + - component: {fileID: 1846610468} + m_Layer: 0 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1846610467 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1846610466} + 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: 1174160395} + 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: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1846610468 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1846610466} + 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 &1846610469 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1846610466} + m_CullTransparentMesh: 1 --- !u!1 &1849823319 GameObject: m_ObjectHideFlags: 0 @@ -27321,7 +27666,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1920271865} 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: @@ -27339,12 +27684,12 @@ RectTransform: - {fileID: 1838771717} - {fileID: 2102240165} - {fileID: 1743344590} - m_Father: {fileID: 1412500829} + m_Father: {fileID: 2008435267} 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: -400, y: -30} - m_SizeDelta: {x: 850, y: 650} + m_AnchoredPosition: {x: 14, y: -3} + m_SizeDelta: {x: 850, y: 1300} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1920271867 MonoBehaviour: @@ -27359,16 +27704,16 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 10 - m_Right: 10 + m_Left: 60 + m_Right: 60 m_Top: 10 m_Bottom: 10 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 1 - m_CellSize: {x: 106.3, y: 250} + m_CellSize: {x: 150, y: 250} m_Spacing: {x: 10, y: 70} - m_Constraint: 0 + m_Constraint: 2 m_ConstraintCount: 2 --- !u!114 &1920271868 MonoBehaviour: @@ -27383,7 +27728,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.18431373} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -28800,6 +29145,96 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1993214433} m_CullTransparentMesh: 1 +--- !u!1 &2008435266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2008435267} + - component: {fileID: 2008435270} + - component: {fileID: 2008435269} + - component: {fileID: 2008435268} + m_Layer: 0 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2008435267 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2008435266} + 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: 1920271866} + m_Father: {fileID: 286269069} + 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: -17, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &2008435268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2008435266} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &2008435269 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2008435266} + 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: 10917, 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 &2008435270 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2008435266} + m_CullTransparentMesh: 1 --- !u!1001 &2013335376 PrefabInstance: m_ObjectHideFlags: 0 @@ -28842,7 +29277,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 106.3 + value: 150 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y @@ -28878,7 +29313,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.x - value: 63.15 + value: 135 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.y @@ -29079,7 +29514,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 106.3 + value: 150 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y @@ -29115,7 +29550,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.x - value: 528.35004 + value: 775 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.y @@ -29675,7 +30110,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 106.3 + value: 150 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y @@ -29711,7 +30146,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.x - value: 179.45001 + value: 295 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.y @@ -30066,7 +30501,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.x - value: 106.3 + value: 150 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_SizeDelta.y @@ -30102,7 +30537,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.x - value: 760.9501 + value: 1095 objectReference: {fileID: 0} - target: {fileID: 5063942582541577301, guid: 06a03ff1c2be9fd41a2634ea225f8935, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Assets/02.Scripts/Tycoon/CardDataSo.cs b/Assets/02.Scripts/Tycoon/CardDataSo.cs index 5c7904207..b2da9e7e3 100644 --- a/Assets/02.Scripts/Tycoon/CardDataSo.cs +++ b/Assets/02.Scripts/Tycoon/CardDataSo.cs @@ -12,7 +12,7 @@ namespace BlueWater public class CardDataSo : DataSo { private Dictionary _selectedCard = new Dictionary(); // 선택된 카드를 저장함. - + public CardData GetCardData(string idxKey) { return GetDataByIdx(idxKey); diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs index 7037e3311..8c46e7272 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs @@ -32,7 +32,8 @@ namespace BlueWater.Uis [field: SerializeField, CLabel("업그레이드_스크립트")] private GameObject _upgradePopup; - + + private bool _selectedPassive = false; private void Awake() { @@ -115,6 +116,13 @@ namespace BlueWater.Uis //----카드 값 지정 및 초기화---- + bool passiveCheck(CardData _card) + { + if(_card.Type == CardType.Passive) Debug.Log(_card.ScriptText+" : "+_selectedPassive); + + return _selectedPassive && _card.Type == CardType.Passive; + } + CardData card; var card01Key = "NULL VAL"; @@ -128,7 +136,8 @@ namespace BlueWater.Uis card01Key = card.Idx; } - } while (card == null || _tycoonManager.CardDataSo.CardMaxCheck(card)); + } while (card == null || _tycoonManager.CardDataSo.CardMaxCheck(card) //Max 검사 + || passiveCheck(card));//패시브 검사 _tycoonCard01Componet.SetCard(card01Key); @@ -143,7 +152,9 @@ namespace BlueWater.Uis card02Key = card.Idx; } - } while (card == null || _tycoonManager.CardDataSo.CardMaxCheck(card) || card02Key.Equals(card01Key)); + } while (card == null || _tycoonManager.CardDataSo.CardMaxCheck(card) //Max 검사 + || card02Key.Equals(card01Key) //중복검사 + || passiveCheck(card));//패시브 검사 _tycoonCard02Componet.SetCard(card02Key); @@ -158,7 +169,9 @@ namespace BlueWater.Uis card03Key = card.Idx; } - } while (card == null || _tycoonManager.CardDataSo.CardMaxCheck(card) || card03Key.Equals(card01Key) || card03Key.Equals(card02Key)); + } while (card == null || _tycoonManager.CardDataSo.CardMaxCheck(card) //Max 검사 + || card03Key.Equals(card01Key) || card03Key.Equals(card02Key) //중복검사 + || passiveCheck(card)); //패시브 검사 _tycoonCard03Componet.SetCard(card03Key); //------------- @@ -281,6 +294,8 @@ namespace BlueWater.Uis default: Debug.Log("Not Found Card : IDX" + currTycoonCard.CardDataForIdx.Idx); return; } + if (currTycoonCard.CardDataForIdx.Type == CardType.Passive) _selectedPassive = true; + TycoonManager.Instance.CardDataSo.AddToSelectedCard(currTycoonCard.CardDataForIdx); StartCoroutine(SelectedAnimation(currTycoonCard));