From df99abcba7d50d9a4030ceb2f455366e50da8d82 Mon Sep 17 00:00:00 2001 From: Melbyj1125 <60886701+Melbyj1125@users.noreply.github.com> Date: Mon, 18 Apr 2022 22:58:26 -0500 Subject: [PATCH] added a bit of cost clarity --- Assets/Prefabs/Lobby/LobbyUI.prefab | 788 ++++++++---------- Assets/Scenes/Lobby.unity | 72 -- Assets/Scripts/UI/Lobby/KingTooltips.cs | 44 +- Assets/Scripts/UI/Lobby/LobbyItems.cs | 9 +- .../King/KR_UI_KingSheet_JadS_V03.png.meta | 114 ++- 5 files changed, 469 insertions(+), 558 deletions(-) diff --git a/Assets/Prefabs/Lobby/LobbyUI.prefab b/Assets/Prefabs/Lobby/LobbyUI.prefab index b54dcb4..57c74d0 100644 --- a/Assets/Prefabs/Lobby/LobbyUI.prefab +++ b/Assets/Prefabs/Lobby/LobbyUI.prefab @@ -71,7 +71,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 3154854748256979298, guid: 9d82c67b12dc08a4e8782d89114d7e45, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -599,7 +599,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: -7531340353707283031, guid: 9d82c67b12dc08a4e8782d89114d7e45, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -747,7 +747,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -336.57, y: 35} + m_AnchoredPosition: {x: -336.57, y: 50} m_SizeDelta: {x: 210, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1619667366 @@ -780,7 +780,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: -4961362372881410234, guid: 827eb2c03f1391542975f74191d7c32f, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1014,7 +1014,7 @@ GameObject: - component: {fileID: 66530297609834125} - component: {fileID: 1877202884596017945} m_Layer: 0 - m_Name: Fog + m_Name: Rain m_TagString: hasEvent m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1036,7 +1036,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 32.5, y: 32.5} + m_AnchoredPosition: {x: 32.2, y: 31.3} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8670380048187732789 @@ -1067,9 +1067,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -2196999812744318433, guid: a036275538de07d43a97d88b71a700ec, type: 3} + m_Sprite: {fileID: 2727786002229355747, guid: e50aa6ca2e43edf4dbd8ea82e0c022c9, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1096,7 +1096,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 4305594823652630938} m_TargetAssemblyTypeName: KingTooltips, Assembly-CSharp - m_MethodName: OnEnterFog + m_MethodName: OnEnterRain m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -1356,6 +1356,85 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &419618129059974632 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1942914613458317925} + - component: {fileID: 1665157454808222887} + - component: {fileID: 5970910311918298479} + m_Layer: 0 + m_Name: CurCostPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1942914613458317925 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419618129059974632} + m_LocalRotation: {x: -0, y: -0, z: 0.182904, w: 0.9831308} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6823759094490125006} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 21.078} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -3.7, y: 5} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1665157454808222887 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419618129059974632} + m_CullTransparentMesh: 1 +--- !u!114 &5970910311918298479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419618129059974632} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: + m_Font: {fileID: 12800000, guid: 353e251299fb13c44b479a40dce9522d, type: 3} + m_FontSize: 15 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 15 --- !u!1 &496674742971047324 GameObject: m_ObjectHideFlags: 0 @@ -1427,8 +1506,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 3.495} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 186, y: 4} - m_SizeDelta: {x: 170.3144, y: 58.2233} + m_AnchoredPosition: {x: 189, y: 13} + m_SizeDelta: {x: 166.29, y: 63.4846} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7741279863306780133 CanvasRenderer: @@ -1459,8 +1538,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 12 + m_Font: {fileID: 12800000, guid: 353e251299fb13c44b479a40dce9522d, type: 3} + m_FontSize: 14 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 1 @@ -1500,7 +1579,8 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0.043619405, w: 0.9990483} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 730483529652743979} m_Father: {fileID: 1354363586255247205} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 5} @@ -1539,7 +1619,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 3943178503366170515, guid: b8ddc7d8b43a3f545b499d82a754936a, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1562,7 +1642,7 @@ GameObject: - component: {fileID: 5307018618508014030} - component: {fileID: 7898831013422778595} m_Layer: 0 - m_Name: Windy + m_Name: Snow m_TagString: hasEvent m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1584,7 +1664,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -32.5, y: 32.5} + m_AnchoredPosition: {x: -32, y: 31.9} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6522187221397634520 @@ -1615,9 +1695,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: -6768675186751372735, guid: a036275538de07d43a97d88b71a700ec, type: 3} + m_Sprite: {fileID: -5956525014613863018, guid: e50aa6ca2e43edf4dbd8ea82e0c022c9, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1644,7 +1724,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 4305594823652630938} m_TargetAssemblyTypeName: KingTooltips, Assembly-CSharp - m_MethodName: OnEnterWind + m_MethodName: OnEnterSnow m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -1829,7 +1909,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 273.81, y: 35} + m_AnchoredPosition: {x: 273.81, y: 50} m_SizeDelta: {x: 210, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6679798526771964959 @@ -1862,7 +1942,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: -7878662621293769924, guid: 827eb2c03f1391542975f74191d7c32f, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2238,7 +2318,7 @@ GameObject: - component: {fileID: 630840620} - component: {fileID: 630840617} m_Layer: 0 - m_Name: ThunderImg + m_Name: BumperImg m_TagString: hasEvent m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2254,14 +2334,13 @@ RectTransform: 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_Children: - - {fileID: 5420448859732788795} + m_Children: [] m_Father: {fileID: 8127521571582583106} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -50, y: 0} + m_AnchoredPosition: {x: -55, y: 0} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6012529867688134799 @@ -2292,9 +2371,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: -1299129274275613984, guid: e50aa6ca2e43edf4dbd8ea82e0c022c9, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2384,85 +2463,6 @@ CircleCollider2D: m_Offset: {x: 0, y: 0} serializedVersion: 2 m_Radius: 35 ---- !u!1 &1362948383206565149 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8253725592099594213} - - component: {fileID: 7340482453793480909} - - component: {fileID: 6378741648936215033} - m_Layer: 0 - m_Name: BlockText - m_TagString: hasEvent - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8253725592099594213 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1362948383206565149} - 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_Children: [] - m_Father: {fileID: 8673316758248993453} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -5} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7340482453793480909 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1362948383206565149} - m_CullTransparentMesh: 1 ---- !u!114 &6378741648936215033 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1362948383206565149} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Block --- !u!1 &1404662155451980035 GameObject: m_ObjectHideFlags: 0 @@ -2478,7 +2478,7 @@ GameObject: - component: {fileID: 4799909021140250887} - component: {fileID: 4601011341519733525} m_Layer: 0 - m_Name: Rain + m_Name: Fog m_TagString: hasEvent m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2500,7 +2500,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 32.5, y: -32.5} + m_AnchoredPosition: {x: 31.9, y: -33} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5250379555134549562 @@ -2531,9 +2531,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 2227736008206240503, guid: a036275538de07d43a97d88b71a700ec, type: 3} + m_Sprite: {fileID: 2738336841607438541, guid: e50aa6ca2e43edf4dbd8ea82e0c022c9, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2560,7 +2560,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 4305594823652630938} m_TargetAssemblyTypeName: KingTooltips, Assembly-CSharp - m_MethodName: OnEnterRain + m_MethodName: OnEnterFog m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -2825,17 +2825,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1588757982412272574} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0.007956877, w: 0.99996835} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1261354144070426062} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -0.912} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 122.1953, y: 76.3363} + m_AnchoredPosition: {x: -1.0311, y: -18.6534} + m_SizeDelta: {x: 125.681, y: 89.9221} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5121927109369824462 CanvasRenderer: @@ -2866,19 +2866,19 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 12 + m_Font: {fileID: 12800000, guid: 353e251299fb13c44b479a40dce9522d, type: 3} + m_FontSize: 13 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 1 - m_MaxSize: 40 + m_MaxSize: 123 m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Hover Over Wheel for Weather Explanations + m_Text: --- !u!1 &1708510024199582993 GameObject: m_ObjectHideFlags: 0 @@ -2940,13 +2940,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1870929702410857994} - m_LocalRotation: {x: -0, y: -0, z: 0.04320669, w: 0.9990662} + m_LocalRotation: {x: -0, y: -0, z: 0.056920007, w: 0.99837875} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8213675323316347587} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 4.953} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 6.526} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -35, y: -18} @@ -2982,7 +2982,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: -5239439350207746736, guid: b6de7bf76e94e1d4c88cc0dcece5fa76, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -3059,9 +3059,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 630520e8bcf49ec4cacb92a219a79c5c, type: 3} + m_Sprite: {fileID: 1775862099188547160, guid: e50aa6ca2e43edf4dbd8ea82e0c022c9, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -3094,7 +3094,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2548171977291658386} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: 0.019523963, w: 0.99980944} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -3104,7 +3104,7 @@ RectTransform: - {fileID: 162785044478539301} m_Father: {fileID: 8213675323316347587} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 2.237} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -44, y: 32} @@ -3138,9 +3138,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: -3889352769269586464, guid: e50aa6ca2e43edf4dbd8ea82e0c022c9, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -3436,14 +3436,13 @@ RectTransform: 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_Children: - - {fileID: 645468152544349199} + m_Children: [] m_Father: {fileID: 8127521571582583106} m_RootOrder: 2 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: 50} + m_AnchoredPosition: {x: 0, y: 55} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6230374131111170590 @@ -3474,9 +3473,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: -5902826298676525234, guid: e50aa6ca2e43edf4dbd8ea82e0c022c9, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -3768,6 +3767,25 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: itemOptPrefab: {fileID: 8447329698821624902, guid: 51a78c57dc85625428c8f1e6448d113f, type: 3} + costPointer: {fileID: 3929573017222990863} + costPointerText: {fileID: 5970910311918298479} + costPointerPos: + - {x: -5, y: -203, z: 0} + - {x: -5, y: -190.5, z: 0} + - {x: -5, y: -177, z: 0} + - {x: -3, y: -162.5, z: 0} + - {x: -3, y: -149.5, z: 0} + - {x: -21, y: -133.5, z: 0} + - {x: -1, y: -122.5, z: 0} + - {x: -1, y: -109.5, z: 0} + - {x: -1, y: -94.5, z: 0} + - {x: -1, y: -81.5, z: 0} + - {x: -15, y: -65.5, z: 0} + - {x: -2, y: -56, z: 0} + - {x: -2, y: -42.5, z: 0} + - {x: -2, y: -27, z: 0} + - {x: -2, y: -14, z: 0} + - {x: -10, y: 1, z: 0} tooltip: {fileID: 0} itemBG: - {fileID: 7627111236641680476, guid: 81773d5ce89537c4b920f5caf313c271, type: 3} @@ -4143,17 +4161,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2970982695222635922} - m_LocalRotation: {x: -0, y: -0, z: 0.014813367, w: 0.9998903} + m_LocalRotation: {x: -0, y: -0, z: 0.025923936, w: 0.99966395} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8213675323316347587} m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 1.698} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 2.971} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -36, y: -112} - m_SizeDelta: {x: 243.6908, y: 76.9301} + m_AnchoredPosition: {x: -31, y: -123} + m_SizeDelta: {x: 243.691, y: 98.823} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5879277658600241980 CanvasRenderer: @@ -4184,8 +4202,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 + m_Font: {fileID: 12800000, guid: 353e251299fb13c44b479a40dce9522d, type: 3} + m_FontSize: 18 m_FontStyle: 1 m_BestFit: 0 m_MinSize: 1 @@ -4298,13 +4316,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3229267049952274861} - m_LocalRotation: {x: -0, y: -0, z: 0.033217784, w: 0.9994482} + m_LocalRotation: {x: -0, y: -0, z: 0.03430904, w: 0.9994113} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1261354144070426062} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 3.807} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 3.932} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 9, y: -26} @@ -4379,14 +4397,13 @@ RectTransform: 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_Children: - - {fileID: 6800644854715029187} + m_Children: [] m_Father: {fileID: 8127521571582583106} m_RootOrder: 3 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: -50} + m_AnchoredPosition: {x: 0, y: -55} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6340508573842156703 @@ -4417,9 +4434,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 104298233470097908, guid: e50aa6ca2e43edf4dbd8ea82e0c022c9, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -4737,9 +4754,9 @@ GameObject: m_Component: - component: {fileID: 1751212503021867136} - component: {fileID: 9140612605194355945} - - component: {fileID: 3952767027809229216} + - component: {fileID: 4168067146061954472} m_Layer: 0 - m_Name: SpecificWeatherImg + m_Name: WeatherEffectTitle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4752,17 +4769,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3684421907850857819} - m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} + m_LocalRotation: {x: -0, y: -0, z: -0.014123409, w: 0.9999003} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1261354144070426062} m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -1.618} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 8, y: -41} - m_SizeDelta: {x: 65, y: 65} + m_AnchoredPosition: {x: -3.7999878, y: 24.700012} + m_SizeDelta: {x: 130.3602, y: 51.4549} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9140612605194355945 CanvasRenderer: @@ -4772,7 +4789,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3684421907850857819} m_CullTransparentMesh: 1 ---- !u!114 &3952767027809229216 +--- !u!114 &4168067146061954472 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4781,27 +4798,31 @@ MonoBehaviour: m_GameObject: {fileID: 3684421907850857819} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, 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: -2196999812744318433, guid: a036275538de07d43a97d88b71a700ec, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_FontData: + m_Font: {fileID: 12800000, guid: 353e251299fb13c44b479a40dce9522d, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Hover Over For Weather Explanations --- !u!1 &3918132164218156330 GameObject: m_ObjectHideFlags: 0 @@ -5118,6 +5139,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3929573017222990863 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6823759094490125006} + - component: {fileID: 4412486671975232069} + - component: {fileID: 2820693015457913274} + m_Layer: 0 + m_Name: CostPointer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6823759094490125006 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3929573017222990863} + m_LocalRotation: {x: -0, y: -0, z: -0.23149393, w: 0.9728364} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1942914613458317925} + m_Father: {fileID: 730483529652743979} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -26.77} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -10, y: 1} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4412486671975232069 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3929573017222990863} + m_CullTransparentMesh: 1 +--- !u!114 &2820693015457913274 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3929573017222990863} + 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: -8110203004865104281, guid: e50aa6ca2e43edf4dbd8ea82e0c022c9, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3975031492042563123 GameObject: m_ObjectHideFlags: 0 @@ -5162,85 +5259,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3975031492042563123} m_CullTransparentMesh: 1 ---- !u!1 &4088588692862868584 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5420448859732788795} - - component: {fileID: 3696571973476589762} - - component: {fileID: 7235178610568441012} - m_Layer: 0 - m_Name: ThunderText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5420448859732788795 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4088588692862868584} - 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_Children: [] - m_Father: {fileID: 9150033072167530864} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -5} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3696571973476589762 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4088588692862868584} - m_CullTransparentMesh: 1 ---- !u!114 &7235178610568441012 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4088588692862868584} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Thunder --- !u!1 &4147883257800441090 GameObject: m_ObjectHideFlags: 0 @@ -5738,85 +5756,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4800657289630686449 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 645468152544349199} - - component: {fileID: 5944206951278852624} - - component: {fileID: 6591105192825437076} - m_Layer: 0 - m_Name: SlimeText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &645468152544349199 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4800657289630686449} - 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_Children: [] - m_Father: {fileID: 5461875721521363360} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -5} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5944206951278852624 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4800657289630686449} - m_CullTransparentMesh: 1 ---- !u!114 &6591105192825437076 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4800657289630686449} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Slime --- !u!1 &4825862359276003384 GameObject: m_ObjectHideFlags: 0 @@ -5842,16 +5781,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4825862359276003384} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: 0.023198534, w: 0.9997309} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1940408589166091606} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 2.659} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 108, y: 25} + m_AnchoredPosition: {x: 107, y: 40} m_SizeDelta: {x: 372.7512, y: 93.2316} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7179199273450519475 @@ -5945,7 +5884,7 @@ GameObject: - component: {fileID: 6731486731072997917} - component: {fileID: 5769482212394618531} m_Layer: 0 - m_Name: Snow + m_Name: Wind m_TagString: hasEvent m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5967,7 +5906,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -32.5, y: -32.5} + m_AnchoredPosition: {x: -32.2, y: -33} m_SizeDelta: {x: 65, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7043497239875103000 @@ -5998,9 +5937,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 7206854781991241367, guid: a036275538de07d43a97d88b71a700ec, type: 3} + m_Sprite: {fileID: -7913372982308857268, guid: e50aa6ca2e43edf4dbd8ea82e0c022c9, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -6027,7 +5966,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 4305594823652630938} m_TargetAssemblyTypeName: KingTooltips, Assembly-CSharp - m_MethodName: OnEnterSnow + m_MethodName: OnEnterWind m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -6131,14 +6070,13 @@ RectTransform: 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_Children: - - {fileID: 8253725592099594213} + m_Children: [] m_Father: {fileID: 8127521571582583106} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 50, y: 0} + m_AnchoredPosition: {x: 55, y: -0} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8691691216652306508 @@ -6169,9 +6107,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 2308575732804040797, guid: e50aa6ca2e43edf4dbd8ea82e0c022c9, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -6491,7 +6429,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7810498348320998331 Transform: m_ObjectHideFlags: 0 @@ -6522,20 +6460,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f2e12472a6d6ff6468d4fb8c7c12007a, type: 3} m_Name: m_EditorClassIdentifier: - curWeatherSpriteObj: {fileID: 3684421907850857819} curWeatherText: {fileID: 5950285241483413905} - curWeatherImage: {fileID: 3952767027809229216} - rain: {fileID: 2227736008206240503, guid: a036275538de07d43a97d88b71a700ec, type: 3} - snow: {fileID: 7206854781991241367, guid: a036275538de07d43a97d88b71a700ec, type: 3} - wind: {fileID: -6768675186751372735, guid: a036275538de07d43a97d88b71a700ec, type: 3} - fog: {fileID: -2196999812744318433, guid: a036275538de07d43a97d88b71a700ec, type: 3} + curWeatherTitle: {fileID: 4168067146061954472} curPlaceablesSpriteObj: {fileID: 5781469170965076305} curPlaceablesText: {fileID: 6529570069819785813} curPlaceablesImage: {fileID: 6395406820119782472} - block: {fileID: 8953198066205750476, guid: 827eb2c03f1391542975f74191d7c32f, type: 3} - thunder: {fileID: 2061666376165797104, guid: 6752962b9a0f4984fa08cb5a13e7bdfa, type: 3} - slime: {fileID: 4561481026067350109, guid: 6752962b9a0f4984fa08cb5a13e7bdfa, type: 3} - hail: {fileID: 4914967321489272866, guid: 6752962b9a0f4984fa08cb5a13e7bdfa, type: 3} + block: {fileID: 2308575732804040797, guid: e50aa6ca2e43edf4dbd8ea82e0c022c9, type: 3} + bumper: {fileID: -1299129274275613984, guid: e50aa6ca2e43edf4dbd8ea82e0c022c9, type: 3} + slime: {fileID: -5902826298676525234, guid: e50aa6ca2e43edf4dbd8ea82e0c022c9, type: 3} + hail: {fileID: 104298233470097908, guid: e50aa6ca2e43edf4dbd8ea82e0c022c9, type: 3} --- !u!1 &5411663148713234339 GameObject: m_ObjectHideFlags: 0 @@ -6570,7 +6503,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 7.182} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 205, y: -53} + m_AnchoredPosition: {x: 211, y: -37} m_SizeDelta: {x: 250, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6461841643306138876 @@ -6603,7 +6536,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: -7117595623854331935, guid: b6de7bf76e94e1d4c88cc0dcece5fa76, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -6636,7 +6569,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5467644784555572502} - m_LocalRotation: {x: -0, y: -0, z: 0.024117509, w: 0.9997092} + m_LocalRotation: {x: -0, y: -0, z: 0.017100008, w: 0.99985385} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -6644,10 +6577,10 @@ RectTransform: - {fileID: 8418410863045690012} m_Father: {fileID: 8858512156553390662} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 2.764} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 1.96} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 52, y: -41} + m_AnchoredPosition: {x: 52.00006, y: -40.980103} m_SizeDelta: {x: 416.5457, y: 252.0697} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5800529322620748475 @@ -6680,7 +6613,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: -5829802904065716218, guid: 9d82c67b12dc08a4e8782d89114d7e45, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -6889,7 +6822,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 1490524940242357431, guid: b6de7bf76e94e1d4c88cc0dcece5fa76, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -6922,16 +6855,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5781469170965076305} - m_LocalRotation: {x: -0, y: -0, z: 0.027603187, w: 0.999619} + m_LocalRotation: {x: -0, y: -0, z: 0.0998546, w: 0.99500203} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6614527597526599442} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 3.163} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 11.462} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 201, y: -75} + m_AnchoredPosition: {x: 211, y: -65} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5246922603230493780 @@ -6962,9 +6895,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 2308575732804040797, guid: e50aa6ca2e43edf4dbd8ea82e0c022c9, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -6972,85 +6905,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6012886652234400936 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6800644854715029187} - - component: {fileID: 852588986679426876} - - component: {fileID: 5883797921165324656} - m_Layer: 0 - m_Name: HailText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6800644854715029187 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6012886652234400936} - 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_Children: [] - m_Father: {fileID: 162785044478539301} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -5} - m_SizeDelta: {x: 160, y: 30} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &852588986679426876 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6012886652234400936} - m_CullTransparentMesh: 1 ---- !u!114 &5883797921165324656 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6012886652234400936} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Hail --- !u!1 &6137220662987167072 GameObject: m_ObjectHideFlags: 0 @@ -7185,6 +7039,42 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6631301957922613310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 730483529652743979} + m_Layer: 0 + m_Name: SpecifyItemCost + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &730483529652743979 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6631301957922613310} + 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_Children: + - {fileID: 6823759094490125006} + m_Father: {fileID: 2972652690648092363} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -20, y: 92} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6980124757043343321 GameObject: m_ObjectHideFlags: 0 @@ -7295,7 +7185,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 65, y: 46} + m_AnchoredPosition: {x: 65, y: 37} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6259712840733748133 @@ -7506,16 +7396,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8358473993862194025} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: 0.016386949, w: 0.9998657} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7601005510265935241} m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 1.878} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 54, y: 26} + m_AnchoredPosition: {x: 78, y: 2} m_SizeDelta: {x: 232.2169, y: 101.1534} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &975033219170766143 @@ -7547,7 +7437,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 353e251299fb13c44b479a40dce9522d, type: 3} m_FontSize: 16 m_FontStyle: 1 m_BestFit: 0 @@ -8121,11 +8011,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3} ---- !u!224 &3732651221136882027 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2004584391902020887, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3} - m_PrefabInstance: {fileID: 2890392183042899068} - m_PrefabAsset: {fileID: 0} --- !u!114 &5410293111695408891 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7136380821082899079, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3} @@ -8137,6 +8022,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 311c1a64d12df464ab0b856d2aa3e5ae, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &3732651221136882027 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2004584391902020887, guid: 25b0bd1c83713d44ab76eaa07a6357fa, type: 3} + m_PrefabInstance: {fileID: 2890392183042899068} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6471307727058244567 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index 44f526e..012de86 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -682,78 +682,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: glider - value: - objectReference: {fileID: 1557924177} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: leftLeg - value: - objectReference: {fileID: 830458338} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: leftFoot - value: - objectReference: {fileID: 1412069676} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: leftQuad - value: - objectReference: {fileID: 1964031227} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: rightLeg - value: - objectReference: {fileID: 1981709688} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: rightFoot - value: - objectReference: {fileID: 919153051} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: rightHand - value: - objectReference: {fileID: 238421040} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: rightQuad - value: - objectReference: {fileID: 535173809} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: leftSpring - value: - objectReference: {fileID: 49756914} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: backBattery - value: - objectReference: {fileID: 242966128} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: rightSpring - value: - objectReference: {fileID: 631883696} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: leftWallShoe - value: - objectReference: {fileID: 1129569242} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: rightWallShoe - value: - objectReference: {fileID: 1129569241} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: thiccLeftQuad - value: - objectReference: {fileID: 1129569237} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: thiccRightQuad - value: - objectReference: {fileID: 1129569243} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: leftRollerSkate - value: - objectReference: {fileID: 1129569239} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: rightStickyHand - value: - objectReference: {fileID: 1129569240} - - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} - propertyPath: rightRollerSkate - value: - objectReference: {fileID: 1129569238} - target: {fileID: 3670971460473670880, guid: f04855a6b3fae4f478846139aa5cf621, type: 3} propertyPath: runnerBodyModifiers.Array.data[0] value: diff --git a/Assets/Scripts/UI/Lobby/KingTooltips.cs b/Assets/Scripts/UI/Lobby/KingTooltips.cs index dc72d08..28a9322 100644 --- a/Assets/Scripts/UI/Lobby/KingTooltips.cs +++ b/Assets/Scripts/UI/Lobby/KingTooltips.cs @@ -7,21 +7,19 @@ public class KingTooltips : MonoBehaviour { ////Weather Wheel Variables - public GameObject curWeatherSpriteObj; public Text curWeatherText; - public Image curWeatherImage; - float curSpriteRotation; + public Text curWeatherTitle; string rainExplanation = "Increases the players acceleration & decreases the players traction."; + string rainTitle = "Rain"; string snowExplanation = "Increases the players traction & decreases the players acceleration."; + string snowTitle = "Snow"; string windExplanation = "Pushes the player in a random direction altering their movement."; + string windTitle = "Wind"; string fogExplanation = "Obscures the players vision."; + string fogTitle = "Fog"; + string defaultWeatherTitle; string defaultWeatherExplanation; - - public Sprite rain; - public Sprite snow; - public Sprite wind; - public Sprite fog; //// ////Placeables Variables @@ -30,55 +28,47 @@ public class KingTooltips : MonoBehaviour public Image curPlaceablesImage; string blockExplanation = "Place a block on the grid to obstruct a players movement."; - string thunderExplanation = "Places Thunder Above both players forcing them to the ground if they stay aerial for too long."; + string bumperExplanation = "Places a bumper on the grid to obstruct and knock the players back."; string slimeExplanation = "Click and hold the mouse to place and then choose the direction the slowing slime goes."; string hailExplanation = "Click and hold the mouse to adjust the hail size dropping papers"; string defaultPlaceablesExplanation; public Sprite block; - public Sprite thunder; + public Sprite bumper; public Sprite slime; public Sprite hail; void Start(){ + defaultWeatherTitle = curWeatherTitle.text; defaultWeatherExplanation = curWeatherText.text; defaultPlaceablesExplanation = curPlaceablesText.text; - curWeatherSpriteObj.SetActive(false); curPlaceablesSpriteObj.SetActive(false); } ////Weather Wheel Functions public void OnEnterRain(){ - curWeatherSpriteObj.SetActive(true); - curWeatherSpriteObj.transform.localEulerAngles = new Vector3(0, 0, 135); - curWeatherImage.sprite = rain; + curWeatherTitle.text = rainTitle; curWeatherText.text = rainExplanation; } public void OnEnterSnow(){ - curWeatherSpriteObj.SetActive(true); - curWeatherSpriteObj.transform.localEulerAngles = new Vector3(0, 0, -135); - curWeatherImage.sprite = snow; + curWeatherTitle.text = snowTitle; curWeatherText.text = snowExplanation; } public void OnEnterWind(){ - curWeatherSpriteObj.SetActive(true); - curWeatherSpriteObj.transform.localEulerAngles = new Vector3(0, 0, -45); - curWeatherImage.sprite = wind; + curWeatherTitle.text = windTitle; curWeatherText.text = windExplanation; } public void OnEnterFog(){ - curWeatherSpriteObj.SetActive(true); - curWeatherSpriteObj.transform.localEulerAngles = new Vector3(0, 0, 45); - curWeatherImage.sprite = fog; + curWeatherTitle.text = fogTitle; curWeatherText.text = fogExplanation; } public void OnExitWeather(){ - curWeatherSpriteObj.SetActive(false); + curWeatherTitle.text = defaultWeatherTitle; curWeatherText.text = defaultWeatherExplanation; } //// @@ -90,10 +80,10 @@ public class KingTooltips : MonoBehaviour curPlaceablesText.text = blockExplanation; } - public void OnEnterThunder(){ + public void OnEnterBumper(){ curPlaceablesSpriteObj.SetActive(true); - curPlaceablesImage.sprite = thunder; - curPlaceablesText.text = thunderExplanation; + curPlaceablesImage.sprite = bumper; + curPlaceablesText.text = bumperExplanation; } public void OnEnterSlime(){ diff --git a/Assets/Scripts/UI/Lobby/LobbyItems.cs b/Assets/Scripts/UI/Lobby/LobbyItems.cs index dcc1004..cd08c8b 100644 --- a/Assets/Scripts/UI/Lobby/LobbyItems.cs +++ b/Assets/Scripts/UI/Lobby/LobbyItems.cs @@ -12,6 +12,9 @@ public class LobbyItems : MonoBehaviour LobbyUI lobbyUI; PlayerInventory pInv; public GameObject itemOptPrefab; + public GameObject costPointer; + public Text costPointerText; + public Vector3[] costPointerPos; private Slider glueGooSlider; private PlayerStats pStats; @@ -135,7 +138,9 @@ public class LobbyItems : MonoBehaviour if(pInv.PlayerItemDict.ContainsKey(item.name)){ //Player can remove the item pointsLeft += itemCost; - + costPointer.transform.localPosition = costPointerPos[pointsLeft]; + costPointerText.text = pointsLeft.ToString(); + //Glue level glueGooSlider.value += itemCost; @@ -148,6 +153,8 @@ public class LobbyItems : MonoBehaviour else if(!pInv.PlayerItemDict.ContainsKey(item.name) && (pointsLeft - itemCost) >= 0){ //Player can add the item pointsLeft -= itemCost; + costPointer.transform.localPosition = costPointerPos[pointsLeft]; + costPointerText.text = pointsLeft.ToString(); //glue level glueGooSlider.value -= itemCost; diff --git a/Assets/Sprites/King/KR_UI_KingSheet_JadS_V03.png.meta b/Assets/Sprites/King/KR_UI_KingSheet_JadS_V03.png.meta index eb2b8db..67b282d 100644 --- a/Assets/Sprites/King/KR_UI_KingSheet_JadS_V03.png.meta +++ b/Assets/Sprites/King/KR_UI_KingSheet_JadS_V03.png.meta @@ -26,6 +26,18 @@ TextureImporter: - first: 213: 2093323450993257831 second: KR_UI_KingSheet_JadS_V03_7 + - first: + 213: -5956525014613863018 + second: Snow + - first: + 213: 2727786002229355747 + second: Rain + - first: + 213: -7913372982308857268 + second: Wind + - first: + 213: 2738336841607438541 + second: Fog externalObjects: {} serializedVersion: 11 mipmaps: @@ -183,7 +195,7 @@ TextureImporter: width: 404 height: 387 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -204,7 +216,7 @@ TextureImporter: width: 404 height: 387 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -225,7 +237,7 @@ TextureImporter: width: 404 height: 387 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -246,7 +258,7 @@ TextureImporter: width: 403 height: 387 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -267,7 +279,7 @@ TextureImporter: width: 123 height: 123 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -288,7 +300,7 @@ TextureImporter: width: 208 height: 185 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -305,11 +317,11 @@ TextureImporter: rect: serializedVersion: 2 x: 1305 - y: 17 + y: 21 width: 600 height: 613 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -330,7 +342,7 @@ TextureImporter: width: 928 height: 50 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -342,6 +354,90 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: Snow + rect: + serializedVersion: 2 + x: 1305 + y: 326 + width: 300 + height: 306 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6955638ee0c265da0800000000000000 + internalID: -5956525014613863018 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Rain + rect: + serializedVersion: 2 + x: 1605 + y: 326 + width: 300 + height: 306 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3e4e926aaea0bd520800000000000000 + internalID: 2727786002229355747 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Wind + rect: + serializedVersion: 2 + x: 1305 + y: 21 + width: 300 + height: 305 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: c4a9e4e033d0e2290800000000000000 + internalID: -7913372982308857268 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Fog + rect: + serializedVersion: 2 + x: 1605 + y: 21 + width: 300 + height: 305 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: dc0606f59d6800620800000000000000 + internalID: 2738336841607438541 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: []