From 1c1fa09a48c6c96885e1998596e5600afb8fda88 Mon Sep 17 00:00:00 2001 From: Sewmina Dilshan Date: Wed, 25 May 2022 20:56:27 +0530 Subject: [PATCH] Trade WIP --- Assets/Game/Scenes/GameScene/GameScene.unity | 501 +++++++++++-------- Assets/Game/Scripts/Rotator.cs | 13 + Assets/Game/Scripts/Rotator.cs.meta | 11 + Assets/Game/Scripts/TradeMenu.cs | 5 +- 4 files changed, 322 insertions(+), 208 deletions(-) create mode 100644 Assets/Game/Scripts/Rotator.cs create mode 100644 Assets/Game/Scripts/Rotator.cs.meta diff --git a/Assets/Game/Scenes/GameScene/GameScene.unity b/Assets/Game/Scenes/GameScene/GameScene.unity index 5c2e88002..90323e1f3 100644 --- a/Assets/Game/Scenes/GameScene/GameScene.unity +++ b/Assets/Game/Scenes/GameScene/GameScene.unity @@ -5173,9 +5173,9 @@ RectTransform: m_Father: {fileID: 7894890879254366206} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -96.25} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &53824407 @@ -37509,9 +37509,9 @@ RectTransform: m_Father: {fileID: 7548028370002474470} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -106.174995} m_SizeDelta: {x: 200, y: 33.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &308532674 @@ -42519,9 +42519,9 @@ RectTransform: m_Father: {fileID: 1599766262} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -96.25} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &347620291 @@ -74939,6 +74939,95 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7ed89a148f8a1d64eb6ed06f4fc4d28b, type: 3} +--- !u!1 &638757247 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 638757248} + - component: {fileID: 638757250} + - component: {fileID: 638757249} + - component: {fileID: 638757251} + m_Layer: 5 + m_Name: Refreshing + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &638757248 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 638757247} + 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: 7894890879115246241} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 272.8, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &638757249 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 638757247} + 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.012846382, g: 0.9716981, 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: 21300000, guid: 5c3218082b2c447a5a56ff4ddabc2429, 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 +--- !u!222 &638757250 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 638757247} + m_CullTransparentMesh: 1 +--- !u!114 &638757251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 638757247} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d15ae079e941bca4c90d983a184abc2b, type: 3} + m_Name: + m_EditorClassIdentifier: + rotationVector: {x: 0, y: 0, z: 4} --- !u!4 &638857149 stripped Transform: m_CorrespondingSourceObject: {fileID: 4561988940605264, guid: fd13f817b6a23c54e852836adcac80ab, type: 3} @@ -95740,9 +95829,9 @@ RectTransform: m_Father: {fileID: 1759333731} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -96.25} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &816038781 @@ -110236,10 +110325,10 @@ RectTransform: m_Father: {fileID: 7894890878111630362} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 224, y: -67} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &937979876 MonoBehaviour: @@ -110648,9 +110737,9 @@ RectTransform: m_Father: {fileID: 937979875} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -39.75} m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &941762341 @@ -123102,9 +123191,9 @@ RectTransform: m_Father: {fileID: 1599766262} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -39.75} m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1031729561 @@ -149335,9 +149424,9 @@ RectTransform: m_Father: {fileID: 7548028370464226928} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -106.174995} m_SizeDelta: {x: 200, y: 33.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1253754303 @@ -159541,9 +159630,9 @@ RectTransform: m_Father: {fileID: 1759333731} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -39.75} m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1349387233 @@ -173913,9 +174002,9 @@ RectTransform: m_Father: {fileID: 7548028370799589681} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -106.174995} m_SizeDelta: {x: 200, y: 33.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1495584247 @@ -187050,10 +187139,10 @@ RectTransform: m_Father: {fileID: 7894890878111630362} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 224, y: -215} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1599766263 MonoBehaviour: @@ -207192,10 +207281,10 @@ RectTransform: m_Father: {fileID: 7894890878111630362} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 76, y: -215} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1759333732 MonoBehaviour: @@ -209440,9 +209529,9 @@ RectTransform: m_Father: {fileID: 937979875} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -96.25} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1776692534 @@ -248712,9 +248801,9 @@ RectTransform: m_Father: {fileID: 7548028370862993511} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -106.174995} m_SizeDelta: {x: 200, y: 33.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2124194102 @@ -251657,8 +251746,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9a00128818eda43dfaa959b83527b255, type: 3} m_Name: m_EditorClassIdentifier: - otherPanels: - - {fileID: 0} + otherPanels: [] --- !u!224 &7548028369139560015 RectTransform: m_ObjectHideFlags: 0 @@ -251952,10 +252040,10 @@ RectTransform: m_Father: {fileID: 7548028370573100806} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 57} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -46.5} + m_SizeDelta: {x: 66, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028369178297215 CanvasRenderer: @@ -252218,10 +252306,10 @@ RectTransform: m_Father: {fileID: 7548028370540024263} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 375.3215, y: -215} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028369272267383 GameObject: @@ -252256,10 +252344,10 @@ RectTransform: m_Father: {fileID: 7548028370040864157} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 67} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 47.5, y: -45} + m_SizeDelta: {x: 67, y: 67} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028369406147417 GameObject: @@ -252332,10 +252420,10 @@ RectTransform: m_Father: {fileID: 7548028370540024263} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 375.3215, y: -67} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028369416612529 GameObject: @@ -252761,7 +252849,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7548028369609139424 RectTransform: m_ObjectHideFlags: 0 @@ -252890,10 +252978,10 @@ RectTransform: m_Father: {fileID: 7548028370282911199} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30.2} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 89, y: -25} + m_SizeDelta: {x: 178, y: 30.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028369635804756 CanvasRenderer: @@ -253089,10 +253177,10 @@ RectTransform: m_Father: {fileID: 7548028370540024263} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 79.3215, y: -67} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028369674503759 GameObject: @@ -253475,7 +253563,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 298} m_Pivot: {x: 0, y: 1} --- !u!114 &7548028369761689005 MonoBehaviour: @@ -253545,9 +253633,9 @@ RectTransform: m_Father: {fileID: 7548028370002474470} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -43.175} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028369804255619 @@ -253749,9 +253837,9 @@ RectTransform: m_Father: {fileID: 7548028370799589681} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -43.175} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028369878513255 @@ -254142,10 +254230,10 @@ RectTransform: m_Father: {fileID: 7548028369761688995} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 224, y: -215} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028370002474471 GameObject: @@ -254208,10 +254296,10 @@ RectTransform: m_Father: {fileID: 7548028370540024263} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 79.3215, y: -511} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028370036477041 GameObject: @@ -254375,7 +254463,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -133.18884, y: -60.569992} - m_SizeDelta: {x: 0, y: 90} + m_SizeDelta: {x: 336.81, y: 90} m_Pivot: {x: 1, y: 0.5} --- !u!114 &7548028370040864158 MonoBehaviour: @@ -254990,10 +255078,10 @@ RectTransform: m_Father: {fileID: 7548028370040864157} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30.2} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 210.405, y: -45} + m_SizeDelta: {x: 168.81, y: 30.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028370161136793 CanvasRenderer: @@ -255018,10 +255106,10 @@ RectTransform: m_Father: {fileID: 7548028370540024263} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 227.3215, y: -363} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028370161136797 GameObject: @@ -255326,10 +255414,10 @@ RectTransform: m_Father: {fileID: 7548028370540024263} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 227.3215, y: -215} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028370429163355 GameObject: @@ -255448,10 +255536,10 @@ RectTransform: m_Father: {fileID: 7548028369761688995} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 76, y: -67} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028370464226929 GameObject: @@ -255903,7 +255991,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 594} m_Pivot: {x: 0, y: 1} --- !u!114 &7548028370573100800 MonoBehaviour: @@ -256002,7 +256090,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 276.7, y: 5.43} - m_SizeDelta: {x: 0, y: 90} + m_SizeDelta: {x: 215.14, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028370573100807 GameObject: @@ -256213,10 +256301,10 @@ RectTransform: m_Father: {fileID: 7548028370540024263} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 79.3215, y: -363} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028370616918718 CanvasRenderer: @@ -256679,10 +256767,10 @@ RectTransform: m_Father: {fileID: 7548028369903289855} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30.2} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 128, y: -25} + m_SizeDelta: {x: 256, y: 30.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028370685246057 CanvasRenderer: @@ -256707,10 +256795,10 @@ RectTransform: m_Father: {fileID: 7548028370540024263} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 227.3215, y: -67} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028370685246061 GameObject: @@ -257108,10 +257196,10 @@ RectTransform: m_Father: {fileID: 7548028370573100806} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30.2} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 160.07, y: -46.5} + m_SizeDelta: {x: 86.14, y: 30.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028370765915791 GameObject: @@ -257203,10 +257291,10 @@ RectTransform: m_Father: {fileID: 7548028369761688995} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 76, y: -215} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028370799589682 CanvasRenderer: @@ -257389,10 +257477,10 @@ RectTransform: m_Father: {fileID: 7548028370540024263} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 375.3215, y: -363} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028370846516215 GameObject: @@ -257569,10 +257657,10 @@ RectTransform: m_Father: {fileID: 7548028369761688995} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 224, y: -67} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028370889035473 CanvasRenderer: @@ -257644,9 +257732,9 @@ RectTransform: m_Father: {fileID: 7548028370464226928} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -43.175} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &7548028370915096916 @@ -258095,10 +258183,10 @@ RectTransform: m_Father: {fileID: 7548028370540024263} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 79.3215, y: -215} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028371039086269 GameObject: @@ -258459,10 +258547,10 @@ RectTransform: m_Father: {fileID: 7548028370540024263} m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 375.3215, y: -511} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7548028371117674338 GameObject: @@ -258542,10 +258630,10 @@ RectTransform: m_Father: {fileID: 7548028370540024263} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 227.3215, y: -511} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028371117674350 CanvasRenderer: @@ -258856,9 +258944,9 @@ RectTransform: m_Father: {fileID: 7548028370862993511} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -43.175} m_SizeDelta: {x: 80, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7548028371223728491 @@ -259362,7 +259450,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &7894890877298988141 MonoBehaviour: m_ObjectHideFlags: 0 @@ -259377,6 +259465,7 @@ MonoBehaviour: m_EditorClassIdentifier: tradeListParent: {fileID: 7894890878383526720} tradeListItem: {fileID: 7894890879221525352} + refreshIndicator: {fileID: 638757247} coinsTxt: {fileID: 7894890878275405818} gemsTxt: {fileID: 7894890877415590217} pooledEntries: [] @@ -259621,10 +259710,10 @@ RectTransform: m_Father: {fileID: 7894890877404393233} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 67} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 47.5, y: -45} + m_SizeDelta: {x: 67, y: 67} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7894890877404393232 MonoBehaviour: @@ -259654,12 +259743,12 @@ RectTransform: - {fileID: 7894890877362795979} - {fileID: 7894890878275405819} m_Father: {fileID: 7894890879115246241} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -133.18884, y: -60.569992} - m_SizeDelta: {x: 0, y: 90} + m_SizeDelta: {x: 336.81, y: 90} m_Pivot: {x: 1, y: 0.5} --- !u!1 &7894890877404393234 GameObject: @@ -259856,10 +259945,10 @@ RectTransform: m_Father: {fileID: 7894890878918501834} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30.2} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 160.07, y: -46.5} + m_SizeDelta: {x: 86.14, y: 30.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7894890877415590219 GameObject: @@ -259976,10 +260065,10 @@ RectTransform: m_Father: {fileID: 7894890877252587938} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30.2} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 89, y: -25} + m_SizeDelta: {x: 178, y: 30.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7894890877465682734 GameObject: @@ -260669,10 +260758,10 @@ RectTransform: m_Father: {fileID: 7894890877426257969} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30.2} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 114.755, y: -25} + m_SizeDelta: {x: 229.51, y: 30.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7894890877775745493 GameObject: @@ -260824,10 +260913,10 @@ RectTransform: m_Father: {fileID: 7894890879187871410} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30.2} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 140.115, y: -25} + m_SizeDelta: {x: 280.23, y: 30.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7894890877828007737 GameObject: @@ -261448,7 +261537,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 298} m_Pivot: {x: 0, y: 1} --- !u!1 &7894890878111630363 GameObject: @@ -261672,10 +261761,10 @@ RectTransform: m_Father: {fileID: 7894890877404393233} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30.2} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 210.405, y: -45} + m_SizeDelta: {x: 168.81, y: 30.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &7894890878383526720 RectTransform: @@ -261695,7 +261784,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 13.8, y: -0.000030517578} - m_SizeDelta: {x: -173.052, y: 0} + m_SizeDelta: {x: -173.052, y: -436.534} m_Pivot: {x: 0, y: 1} --- !u!1 &7894890878383526721 GameObject: @@ -262062,7 +262151,7 @@ RectTransform: m_Children: - {fileID: 7894890878782246174} m_Father: {fileID: 7894890879115246241} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -263531,8 +263620,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9a00128818eda43dfaa959b83527b255, type: 3} m_Name: m_EditorClassIdentifier: - otherPanels: - - {fileID: 0} + otherPanels: [] --- !u!224 &7894890878904890936 RectTransform: m_ObjectHideFlags: 0 @@ -263663,12 +263751,12 @@ RectTransform: - {fileID: 7894890879022110459} - {fileID: 7894890877415590218} m_Father: {fileID: 7894890879115246241} - m_RootOrder: 3 + m_RootOrder: 4 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: 276.7, y: 5.43} - m_SizeDelta: {x: 0, y: 90} + m_SizeDelta: {x: 215.14, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7894890878918501835 GameObject: @@ -263986,7 +264074,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0, y: 1} --- !u!224 &7894890879018931440 RectTransform: @@ -264133,10 +264221,10 @@ RectTransform: m_Father: {fileID: 7894890878918501834} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 57} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -46.5} + m_SizeDelta: {x: 66, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7894890879077431092 CanvasRenderer: @@ -264255,6 +264343,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7894890878605447913} + - {fileID: 638757248} - {fileID: 7894890877404393233} - {fileID: 7894890878498974330} - {fileID: 7894890878918501834} @@ -264344,9 +264433,9 @@ RectTransform: m_Father: {fileID: 7894890879254366206} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -39.75} m_SizeDelta: {x: 70, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7894890879143371715 @@ -264426,10 +264515,10 @@ RectTransform: m_Father: {fileID: 7894890878998931611} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 227.3215, y: -67} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7894890879148921746 GameObject: @@ -264827,10 +264916,10 @@ RectTransform: m_Father: {fileID: 7894890878383526720} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -86.526, y: -67} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7894890879229135540 GameObject: @@ -265064,10 +265153,10 @@ RectTransform: m_Father: {fileID: 7894890878111630362} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 76, y: -67} + m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7894890879254366207 GameObject: diff --git a/Assets/Game/Scripts/Rotator.cs b/Assets/Game/Scripts/Rotator.cs new file mode 100644 index 000000000..b78912c7f --- /dev/null +++ b/Assets/Game/Scripts/Rotator.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Rotator : MonoBehaviour +{ + public Vector3 rotationVector; + + void Update() + { + transform.Rotate(rotationVector); + } +} diff --git a/Assets/Game/Scripts/Rotator.cs.meta b/Assets/Game/Scripts/Rotator.cs.meta new file mode 100644 index 000000000..485b27663 --- /dev/null +++ b/Assets/Game/Scripts/Rotator.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d15ae079e941bca4c90d983a184abc2b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game/Scripts/TradeMenu.cs b/Assets/Game/Scripts/TradeMenu.cs index 0ceeafe5f..ff6be671c 100644 --- a/Assets/Game/Scripts/TradeMenu.cs +++ b/Assets/Game/Scripts/TradeMenu.cs @@ -11,7 +11,7 @@ public class TradeMenu : MonoBehaviour { public Transform tradeListParent; public GameObject tradeListItem; - + public GameObject refreshIndicator; public TMP_Text coinsTxt; public TMP_Text gemsTxt; public List pooledEntries; @@ -41,6 +41,7 @@ public class TradeMenu : MonoBehaviour public bool refreshing = false; public async void Refresh(){ refreshing = true; + refreshIndicator.SetActive(true); //Clean existing entries foreach(GameObject entry in pooledEntries){entry.SetActive(false);} coinsTxt.text = DBmanager.Coins.ToString(); @@ -109,7 +110,7 @@ public class TradeMenu : MonoBehaviour } - + refreshIndicator.SetActive(false); refreshing=false; }