diff --git a/Assets/Game/Scenes/GameScene/GameScene.unity b/Assets/Game/Scenes/GameScene/GameScene.unity index 1733538e8..5ea5c5c93 100644 --- a/Assets/Game/Scenes/GameScene/GameScene.unity +++ b/Assets/Game/Scenes/GameScene/GameScene.unity @@ -1723,7 +1723,7 @@ RectTransform: 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_AnchoredPosition: {x: 1005.75995, y: 0} m_SizeDelta: {x: 0, y: 90} m_Pivot: {x: 1, y: 0.5} --- !u!114 &16466549 @@ -46059,7 +46059,8 @@ MonoBehaviour: coinsTxt: {fileID: 2126470561} gemsTxt: {fileID: 1740672616} inventoryParent: {fileID: 988594057} - emptySlotImage: {fileID: 21300000, guid: 3219b4ecaa97f44898f3804d963b932d, type: 3} + emptySlotImage: {fileID: 21300000, guid: c26bbd44818884eaa97433b4cbbab68d, type: 3} + selectedItemImg: {fileID: 459353628} --- !u!4 &375084964 stripped Transform: m_CorrespondingSourceObject: {fileID: 4627310524903758, guid: d194838adb73ce841a9e1626c9d51744, type: 3} @@ -56322,6 +56323,17 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 55ce8a3b5a66efc4195e34019198cfba, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f78b30d805ad7004790e9ff2fe8c3eda, type: 3} +--- !u!114 &459353628 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7548028369824015613, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + m_PrefabInstance: {fileID: 1552402923} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &459392363 stripped Transform: m_CorrespondingSourceObject: {fileID: 4298504386298160, guid: aa075532eab0ee34d895222ead71d185, type: 3} @@ -96039,6 +96051,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 374839933} + m_TargetAssemblyTypeName: SellMenu, Assembly-CSharp + m_MethodName: Refresh + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 --- !u!1 &820676544 GameObject: m_ObjectHideFlags: 0 @@ -151951,7 +151975,7 @@ RectTransform: 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_AnchoredPosition: {x: 560.06, y: 0} m_SizeDelta: {x: 0, y: 90} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1293333286 @@ -179217,6 +179241,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1534737056} m_Modifications: + - target: {fileID: 7548028369132289540, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028369132289540, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c26bbd44818884eaa97433b4cbbab68d, type: 3} + - target: {fileID: 7548028369132289540, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369132289543, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028369132289543, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.y + value: 90 + objectReference: {fileID: 0} - target: {fileID: 7548028369146276292, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -179237,6 +179281,46 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7548028369150178180, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Transition + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369150178180, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028369150178180, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369150178180, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369150178180, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369150178180, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369150178181, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 3219b4ecaa97f44898f3804d963b932d, type: 3} + - target: {fileID: 7548028369150178181, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369150178181, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369150178181, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7548028369150178183, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -179261,6 +179345,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7548028369203283040, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028369203283040, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c26bbd44818884eaa97433b4cbbab68d, type: 3} + - target: {fileID: 7548028369203283040, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369203283043, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028369203283043, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.y + value: 90 + objectReference: {fileID: 0} - target: {fileID: 7548028369205387868, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -179309,10 +179413,74 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7548028369216400215, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Transition + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369216400215, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028369216400215, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369216400215, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369216400215, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369216400215, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369235235980, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028369235235980, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028369235235981, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028369235235981, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c26bbd44818884eaa97433b4cbbab68d, type: 3} + - target: {fileID: 7548028369235235981, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7548028369256585260, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7548028369266822378, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028369266822378, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028369266822379, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028369266822379, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c26bbd44818884eaa97433b4cbbab68d, type: 3} + - target: {fileID: 7548028369266822379, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7548028369289563885, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -179341,6 +179509,50 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7548028369372696618, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028369372696618, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c26bbd44818884eaa97433b4cbbab68d, type: 3} + - target: {fileID: 7548028369372696618, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369372696621, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028369372696621, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028369431428686, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Transition + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369431428686, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028369431428686, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369431428686, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369431428686, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369431428686, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7548028369431428785, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -179369,6 +179581,50 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7548028369548819416, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028369548819416, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028369548819417, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028369548819417, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c26bbd44818884eaa97433b4cbbab68d, type: 3} + - target: {fileID: 7548028369548819417, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369777585052, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028369777585052, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c26bbd44818884eaa97433b4cbbab68d, type: 3} + - target: {fileID: 7548028369777585052, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369777585055, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028369777585055, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028369779763946, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7548028369814896452, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -179393,6 +179649,38 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7548028369814896453, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Transition + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369814896453, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028369814896453, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369814896453, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369814896453, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369814896453, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369824015613, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 270d98d375aef47baac86b9d9d37092e, type: 3} + - target: {fileID: 7548028369824015613, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7548028369851238022, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -179417,6 +179705,54 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7548028369851238023, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Transition + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369851238023, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028369851238023, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369851238023, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369851238023, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369851238023, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369906773844, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Transition + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369906773844, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028369906773844, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369906773844, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369906773844, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369906773844, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7548028369906773847, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -179441,6 +179777,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7548028369917759346, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028369917759346, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c26bbd44818884eaa97433b4cbbab68d, type: 3} + - target: {fileID: 7548028369917759346, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028369917759349, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028369917759349, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.y + value: 90 + objectReference: {fileID: 0} - target: {fileID: 7548028370069729498, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -179465,6 +179821,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7548028370100374042, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Transition + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370100374042, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028370100374042, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370100374042, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370100374042, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370100374042, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7548028370100374045, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -179629,6 +180009,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7548028370221034760, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028370221034760, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c26bbd44818884eaa97433b4cbbab68d, type: 3} + - target: {fileID: 7548028370221034760, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370221034763, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028370221034763, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.y + value: 90 + objectReference: {fileID: 0} - target: {fileID: 7548028370231054240, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -179649,6 +180049,50 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7548028370330210982, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028370330210982, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028370330210983, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028370330210983, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c26bbd44818884eaa97433b4cbbab68d, type: 3} + - target: {fileID: 7548028370330210983, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370414609240, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Transition + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370414609240, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028370414609240, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370414609240, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370414609240, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370414609240, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7548028370414609243, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -179693,6 +180137,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7548028370555808666, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Transition + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370555808666, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028370555808666, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370555808666, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370555808666, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370555808666, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7548028370555808669, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -179717,6 +180185,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7548028370625584830, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028370625584830, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028370625584831, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028370625584831, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c26bbd44818884eaa97433b4cbbab68d, type: 3} + - target: {fileID: 7548028370625584831, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370691663781, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: otherPanels.Array.data[0] + value: + objectReference: {fileID: 374839932} - target: {fileID: 7548028370730502806, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -179757,6 +180249,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7548028370773196148, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Transition + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370773196148, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028370773196148, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370773196148, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370773196148, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370773196148, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7548028370773196151, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -179829,6 +180345,30 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7548028370900977048, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Transition + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370900977048, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028370900977048, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370900977048, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370900977048, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370900977048, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7548028370900977051, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -179885,10 +180425,78 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 7548028370933784572, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028370933784572, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c26bbd44818884eaa97433b4cbbab68d, type: 3} + - target: {fileID: 7548028370933784572, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028370933784575, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028370933784575, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_SizeDelta.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 7548028371095063056, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028371164936034, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7548028371178918984, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7548028371226251170, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Transition + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028371226251170, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Interactable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7548028371226251170, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028371226251170, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028371226251170, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028371226251170, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Colors.m_DisabledColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028371226251171, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 3219b4ecaa97f44898f3804d963b932d, type: 3} + - target: {fileID: 7548028371226251171, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028371226251171, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7548028371226251171, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7548028371226251173, guid: 00be8b17ed8cd3a4d8111c5d4641b1d7, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -194091,7 +194699,7 @@ RectTransform: 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_AnchoredPosition: {x: 313.03, y: 0} m_SizeDelta: {x: 0, y: 90} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1665232126 @@ -206093,7 +206701,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 5a30c37041d1b4791acf7fc0629950f3, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -214578,7 +215186,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.00018310547, y: -85} + m_AnchoredPosition: {x: 0.00012207031, y: -85} m_SizeDelta: {x: 1920, y: 65.05449} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1840047502 @@ -224461,7 +225069,7 @@ RectTransform: 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_AnchoredPosition: {x: 1343.7899, y: 0} m_SizeDelta: {x: 0, y: 90} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1934658493 diff --git a/Assets/Game/Scripts/InventoryItem.cs b/Assets/Game/Scripts/InventoryItem.cs index 1067f0bc7..eb7bc58a0 100644 --- a/Assets/Game/Scripts/InventoryItem.cs +++ b/Assets/Game/Scripts/InventoryItem.cs @@ -15,15 +15,31 @@ public class InventoryItem : ScriptableObject [System.Serializable] -public class InventoryEntry{ +public class InventoryEntry +{ public string Item; public int Count; - public InventoryEntry(string item, int count){ + public InventoryEntry(string item, int count) + { Item = item; Count = count; } } -public static class Inventory{ - +public static class Inventory +{ + public static InventoryItem GetInventoryItem(string itemName) + { + Object[] shopItems = Resources.LoadAll("ScriptableObjects/ShopItems"); + Debug.Log("Searching thru " + shopItems.Length + " SOs"); + foreach (Object itemObj in shopItems) + { + InventoryItem item = itemObj as InventoryItem; + if (item.itemName == itemName) + { + return item; + } + } + return null; + } } \ No newline at end of file diff --git a/Assets/Game/Scripts/SellMenu.cs b/Assets/Game/Scripts/SellMenu.cs index 7b6ff27fc..a0f921eba 100644 --- a/Assets/Game/Scripts/SellMenu.cs +++ b/Assets/Game/Scripts/SellMenu.cs @@ -13,6 +13,7 @@ public class SellMenu : MonoBehaviour [Header("Content")] public Transform inventoryParent; public Sprite emptySlotImage; + public Image selectedItemImg; void Start() { Refresh(); @@ -39,10 +40,22 @@ public class SellMenu : MonoBehaviour for(int i =0; i < inventorySlots.Length; i++){ if(i < DBmanager.Inventory.Count){ - inventorySlots[i].GetComponent().sprite =emptySlotImage; + InventoryItem itemData = Inventory.GetInventoryItem(DBmanager.Inventory[i].Item); + if(itemData==null){ + Debug.LogError("Couldn't find data for " + DBmanager.Inventory[i].Item); + } + inventorySlots[i].transform.GetChild(0).GetComponent().sprite = itemData.image; + inventorySlots[i].interactable=true; + inventorySlots[i].onClick.RemoveAllListeners(); + inventorySlots[i].onClick.AddListener(()=>{selectInventoryItem(itemData);}); }else{ - inventorySlots[i].GetComponent().sprite = emptySlotImage; + inventorySlots[i].transform.GetChild(0).GetComponent().sprite = emptySlotImage; + inventorySlots[i].interactable=false; } } } + + public void selectInventoryItem(InventoryItem item){ + selectedItemImg.sprite = item.image; + } } diff --git a/Assets/Game/ScriptableObjects.meta b/Assets/Resources/ScriptableObjects.meta similarity index 100% rename from Assets/Game/ScriptableObjects.meta rename to Assets/Resources/ScriptableObjects.meta diff --git a/Assets/Game/ScriptableObjects/BuildingData.meta b/Assets/Resources/ScriptableObjects/BuildingData.meta similarity index 100% rename from Assets/Game/ScriptableObjects/BuildingData.meta rename to Assets/Resources/ScriptableObjects/BuildingData.meta diff --git a/Assets/Game/ScriptableObjects/BuildingData/Generic Building.asset b/Assets/Resources/ScriptableObjects/BuildingData/Generic Building.asset similarity index 100% rename from Assets/Game/ScriptableObjects/BuildingData/Generic Building.asset rename to Assets/Resources/ScriptableObjects/BuildingData/Generic Building.asset diff --git a/Assets/Game/ScriptableObjects/BuildingData/Generic Building.asset.meta b/Assets/Resources/ScriptableObjects/BuildingData/Generic Building.asset.meta similarity index 100% rename from Assets/Game/ScriptableObjects/BuildingData/Generic Building.asset.meta rename to Assets/Resources/ScriptableObjects/BuildingData/Generic Building.asset.meta diff --git a/Assets/Game/ScriptableObjects/BuildingData/Hall.asset b/Assets/Resources/ScriptableObjects/BuildingData/Hall.asset similarity index 100% rename from Assets/Game/ScriptableObjects/BuildingData/Hall.asset rename to Assets/Resources/ScriptableObjects/BuildingData/Hall.asset diff --git a/Assets/Game/ScriptableObjects/BuildingData/Hall.asset.meta b/Assets/Resources/ScriptableObjects/BuildingData/Hall.asset.meta similarity index 100% rename from Assets/Game/ScriptableObjects/BuildingData/Hall.asset.meta rename to Assets/Resources/ScriptableObjects/BuildingData/Hall.asset.meta diff --git a/Assets/Game/ScriptableObjects/BuildingData/Mine.asset b/Assets/Resources/ScriptableObjects/BuildingData/Mine.asset similarity index 100% rename from Assets/Game/ScriptableObjects/BuildingData/Mine.asset rename to Assets/Resources/ScriptableObjects/BuildingData/Mine.asset diff --git a/Assets/Game/ScriptableObjects/BuildingData/Mine.asset.meta b/Assets/Resources/ScriptableObjects/BuildingData/Mine.asset.meta similarity index 100% rename from Assets/Game/ScriptableObjects/BuildingData/Mine.asset.meta rename to Assets/Resources/ScriptableObjects/BuildingData/Mine.asset.meta diff --git a/Assets/Game/ScriptableObjects/BuildingData/MoonMineral.asset b/Assets/Resources/ScriptableObjects/BuildingData/MoonMineral.asset similarity index 100% rename from Assets/Game/ScriptableObjects/BuildingData/MoonMineral.asset rename to Assets/Resources/ScriptableObjects/BuildingData/MoonMineral.asset diff --git a/Assets/Game/ScriptableObjects/BuildingData/MoonMineral.asset.meta b/Assets/Resources/ScriptableObjects/BuildingData/MoonMineral.asset.meta similarity index 100% rename from Assets/Game/ScriptableObjects/BuildingData/MoonMineral.asset.meta rename to Assets/Resources/ScriptableObjects/BuildingData/MoonMineral.asset.meta diff --git a/Assets/Game/ScriptableObjects/BuildingData/O2Mine.asset b/Assets/Resources/ScriptableObjects/BuildingData/O2Mine.asset similarity index 100% rename from Assets/Game/ScriptableObjects/BuildingData/O2Mine.asset rename to Assets/Resources/ScriptableObjects/BuildingData/O2Mine.asset diff --git a/Assets/Game/ScriptableObjects/BuildingData/O2Mine.asset.meta b/Assets/Resources/ScriptableObjects/BuildingData/O2Mine.asset.meta similarity index 100% rename from Assets/Game/ScriptableObjects/BuildingData/O2Mine.asset.meta rename to Assets/Resources/ScriptableObjects/BuildingData/O2Mine.asset.meta diff --git a/Assets/Game/ScriptableObjects/BuildingData/Research Facility.asset b/Assets/Resources/ScriptableObjects/BuildingData/Research Facility.asset similarity index 100% rename from Assets/Game/ScriptableObjects/BuildingData/Research Facility.asset rename to Assets/Resources/ScriptableObjects/BuildingData/Research Facility.asset diff --git a/Assets/Game/ScriptableObjects/BuildingData/Research Facility.asset.meta b/Assets/Resources/ScriptableObjects/BuildingData/Research Facility.asset.meta similarity index 100% rename from Assets/Game/ScriptableObjects/BuildingData/Research Facility.asset.meta rename to Assets/Resources/ScriptableObjects/BuildingData/Research Facility.asset.meta diff --git a/Assets/Game/ScriptableObjects/ShopItems.meta b/Assets/Resources/ScriptableObjects/ShopItems.meta similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems.meta rename to Assets/Resources/ScriptableObjects/ShopItems.meta diff --git a/Assets/Game/ScriptableObjects/ShopItems/Arrow.asset b/Assets/Resources/ScriptableObjects/ShopItems/Arrow.asset similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Arrow.asset rename to Assets/Resources/ScriptableObjects/ShopItems/Arrow.asset diff --git a/Assets/Game/ScriptableObjects/ShopItems/Arrow.asset.meta b/Assets/Resources/ScriptableObjects/ShopItems/Arrow.asset.meta similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Arrow.asset.meta rename to Assets/Resources/ScriptableObjects/ShopItems/Arrow.asset.meta diff --git a/Assets/Game/ScriptableObjects/ShopItems/Bomb.asset b/Assets/Resources/ScriptableObjects/ShopItems/Bomb.asset similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Bomb.asset rename to Assets/Resources/ScriptableObjects/ShopItems/Bomb.asset diff --git a/Assets/Game/ScriptableObjects/ShopItems/Bomb.asset.meta b/Assets/Resources/ScriptableObjects/ShopItems/Bomb.asset.meta similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Bomb.asset.meta rename to Assets/Resources/ScriptableObjects/ShopItems/Bomb.asset.meta diff --git a/Assets/Game/ScriptableObjects/ShopItems/Flash.asset b/Assets/Resources/ScriptableObjects/ShopItems/Flash.asset similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Flash.asset rename to Assets/Resources/ScriptableObjects/ShopItems/Flash.asset diff --git a/Assets/Game/ScriptableObjects/ShopItems/Flash.asset.meta b/Assets/Resources/ScriptableObjects/ShopItems/Flash.asset.meta similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Flash.asset.meta rename to Assets/Resources/ScriptableObjects/ShopItems/Flash.asset.meta diff --git a/Assets/Game/ScriptableObjects/ShopItems/Hammer.asset b/Assets/Resources/ScriptableObjects/ShopItems/Hammer.asset similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Hammer.asset rename to Assets/Resources/ScriptableObjects/ShopItems/Hammer.asset diff --git a/Assets/Game/ScriptableObjects/ShopItems/Hammer.asset.meta b/Assets/Resources/ScriptableObjects/ShopItems/Hammer.asset.meta similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Hammer.asset.meta rename to Assets/Resources/ScriptableObjects/ShopItems/Hammer.asset.meta diff --git a/Assets/Game/ScriptableObjects/ShopItems/Potion.asset b/Assets/Resources/ScriptableObjects/ShopItems/Potion.asset similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Potion.asset rename to Assets/Resources/ScriptableObjects/ShopItems/Potion.asset diff --git a/Assets/Game/ScriptableObjects/ShopItems/Potion.asset.meta b/Assets/Resources/ScriptableObjects/ShopItems/Potion.asset.meta similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Potion.asset.meta rename to Assets/Resources/ScriptableObjects/ShopItems/Potion.asset.meta diff --git a/Assets/Game/ScriptableObjects/ShopItems/Scroll.asset b/Assets/Resources/ScriptableObjects/ShopItems/Scroll.asset similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Scroll.asset rename to Assets/Resources/ScriptableObjects/ShopItems/Scroll.asset diff --git a/Assets/Game/ScriptableObjects/ShopItems/Scroll.asset.meta b/Assets/Resources/ScriptableObjects/ShopItems/Scroll.asset.meta similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Scroll.asset.meta rename to Assets/Resources/ScriptableObjects/ShopItems/Scroll.asset.meta diff --git a/Assets/Game/ScriptableObjects/ShopItems/Sheid.asset b/Assets/Resources/ScriptableObjects/ShopItems/Sheid.asset similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Sheid.asset rename to Assets/Resources/ScriptableObjects/ShopItems/Sheid.asset diff --git a/Assets/Game/ScriptableObjects/ShopItems/Sheid.asset.meta b/Assets/Resources/ScriptableObjects/ShopItems/Sheid.asset.meta similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Sheid.asset.meta rename to Assets/Resources/ScriptableObjects/ShopItems/Sheid.asset.meta diff --git a/Assets/Game/ScriptableObjects/ShopItems/Sword.asset b/Assets/Resources/ScriptableObjects/ShopItems/Sword.asset similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Sword.asset rename to Assets/Resources/ScriptableObjects/ShopItems/Sword.asset diff --git a/Assets/Game/ScriptableObjects/ShopItems/Sword.asset.meta b/Assets/Resources/ScriptableObjects/ShopItems/Sword.asset.meta similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Sword.asset.meta rename to Assets/Resources/ScriptableObjects/ShopItems/Sword.asset.meta diff --git a/Assets/Game/ScriptableObjects/ShopItems/Timer.asset b/Assets/Resources/ScriptableObjects/ShopItems/Timer.asset similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Timer.asset rename to Assets/Resources/ScriptableObjects/ShopItems/Timer.asset diff --git a/Assets/Game/ScriptableObjects/ShopItems/Timer.asset.meta b/Assets/Resources/ScriptableObjects/ShopItems/Timer.asset.meta similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/Timer.asset.meta rename to Assets/Resources/ScriptableObjects/ShopItems/Timer.asset.meta diff --git a/Assets/Game/ScriptableObjects/ShopItems/key.asset b/Assets/Resources/ScriptableObjects/ShopItems/key.asset similarity index 97% rename from Assets/Game/ScriptableObjects/ShopItems/key.asset rename to Assets/Resources/ScriptableObjects/ShopItems/key.asset index 4c38b946d..d75db3f16 100644 --- a/Assets/Game/ScriptableObjects/ShopItems/key.asset +++ b/Assets/Resources/ScriptableObjects/ShopItems/key.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 1e0f25debf988f94daf1dedf149c9494, type: 3} - m_Name: Key + m_Name: key m_EditorClassIdentifier: itemName: Secrets price: 2500 diff --git a/Assets/Game/ScriptableObjects/ShopItems/key.asset.meta b/Assets/Resources/ScriptableObjects/ShopItems/key.asset.meta similarity index 100% rename from Assets/Game/ScriptableObjects/ShopItems/key.asset.meta rename to Assets/Resources/ScriptableObjects/ShopItems/key.asset.meta diff --git a/UPF.sln b/UPF.sln new file mode 100644 index 000000000..d562d7d18 --- /dev/null +++ b/UPF.sln @@ -0,0 +1,33 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{f8f3d981-3ac9-a8b7-ea43-2868619efe2a}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Whinarn.UnityMeshSimplifier.Runtime", "Whinarn.UnityMeshSimplifier.Runtime.csproj", "{b99ffb8c-f6f2-f646-802e-7cb2e62d8c0c}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Unity.com.consulo.ide.Editor", "Unity.com.consulo.ide.Editor.csproj", "{f3918ae7-b834-5fa8-e000-01833c449c8e}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Whinarn.UnityMeshSimplifier.Editor", "Whinarn.UnityMeshSimplifier.Editor.csproj", "{9c3e4793-780d-e333-1ec5-d5e17feec6f2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{20764e99-32a2-613b-c7bd-2b420a48759f}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {f8f3d981-3ac9-a8b7-ea43-2868619efe2a}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {f8f3d981-3ac9-a8b7-ea43-2868619efe2a}.Debug|Any CPU.Build.0 = Debug|Any CPU + {b99ffb8c-f6f2-f646-802e-7cb2e62d8c0c}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {b99ffb8c-f6f2-f646-802e-7cb2e62d8c0c}.Debug|Any CPU.Build.0 = Debug|Any CPU + {f3918ae7-b834-5fa8-e000-01833c449c8e}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {f3918ae7-b834-5fa8-e000-01833c449c8e}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9c3e4793-780d-e333-1ec5-d5e17feec6f2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9c3e4793-780d-e333-1ec5-d5e17feec6f2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {20764e99-32a2-613b-c7bd-2b420a48759f}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {20764e99-32a2-613b-c7bd-2b420a48759f}.Debug|Any CPU.Build.0 = Debug|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache index e10581187..ddc6366af 100644 Binary files a/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache and b/obj/Debug/Assembly-CSharp-Editor.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache index d5afb2ba5..3967d4287 100644 Binary files a/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache and b/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Unity.AutoLOD.Editor.csproj.AssemblyReference.cache b/obj/Debug/Unity.AutoLOD.Editor.csproj.AssemblyReference.cache index 57eec4ce8..f5e894aea 100644 Binary files a/obj/Debug/Unity.AutoLOD.Editor.csproj.AssemblyReference.cache and b/obj/Debug/Unity.AutoLOD.Editor.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Unity.AutoLOD.csproj.AssemblyReference.cache b/obj/Debug/Unity.AutoLOD.csproj.AssemblyReference.cache index ec4d5cd0e..f5e894aea 100644 Binary files a/obj/Debug/Unity.AutoLOD.csproj.AssemblyReference.cache and b/obj/Debug/Unity.AutoLOD.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/Unity.com.consulo.ide.Editor.csproj.AssemblyReference.cache b/obj/Debug/Unity.com.consulo.ide.Editor.csproj.AssemblyReference.cache index 02f0f1960..d4e8e9bb3 100644 Binary files a/obj/Debug/Unity.com.consulo.ide.Editor.csproj.AssemblyReference.cache and b/obj/Debug/Unity.com.consulo.ide.Editor.csproj.AssemblyReference.cache differ diff --git a/unoptimized.apk b/unoptimized.apk new file mode 100644 index 000000000..6b628c665 Binary files /dev/null and b/unoptimized.apk differ