From f0f43e316dbff4785aa76dcc2db5b529a0cd17c0 Mon Sep 17 00:00:00 2001 From: AlexMamontow Date: Mon, 30 Aug 2021 17:40:10 +0300 Subject: [PATCH] old version changes --- Assets/Prefabs_NEW/UI/ActionsPanel.prefab | 1011 +++++++++++++++++ .../Prefabs_NEW/UI/ActionsPanel.prefab.meta | 7 + Assets/Prefabs_NEW/UI/GoldPanel.prefab | 77 ++ Assets/Prefabs_NEW/UI/GoldPanel.prefab.meta | 7 + Assets/Scripts/Attack.cs | 2 +- Assets/Scripts/TileManagment.cs | 3 +- 6 files changed, 1104 insertions(+), 3 deletions(-) create mode 100644 Assets/Prefabs_NEW/UI/ActionsPanel.prefab create mode 100644 Assets/Prefabs_NEW/UI/ActionsPanel.prefab.meta create mode 100644 Assets/Prefabs_NEW/UI/GoldPanel.prefab create mode 100644 Assets/Prefabs_NEW/UI/GoldPanel.prefab.meta diff --git a/Assets/Prefabs_NEW/UI/ActionsPanel.prefab b/Assets/Prefabs_NEW/UI/ActionsPanel.prefab new file mode 100644 index 00000000..97831a76 --- /dev/null +++ b/Assets/Prefabs_NEW/UI/ActionsPanel.prefab @@ -0,0 +1,1011 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2270456895283614691 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2270456895283614688} + - component: {fileID: 2270456895283614718} + - component: {fileID: 2270456895283614689} + - component: {fileID: 2270456895283614719} + m_Layer: 5 + m_Name: AttackPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2270456895283614688 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2270456895283614691} + 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: 2270456894557909366} + - {fileID: 6572365857004866262} + - {fileID: 6572365856364028115} + m_Father: {fileID: 2270456895332910045} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -400, y: 20} + m_SizeDelta: {x: 768, y: 400} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2270456895283614718 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2270456895283614691} + m_CullTransparentMesh: 1 +--- !u!114 &2270456895283614689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2270456895283614691} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 77006036430563a45a08b64e6762db67, 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!114 &2270456895283614719 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2270456895283614691} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 80 + m_Right: 0 + m_Top: 150 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 100, y: 100} + m_Spacing: {x: 52, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!1 &2270456895332910044 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2270456895332910045} + - component: {fileID: 2270456895332910042} + m_Layer: 5 + m_Name: ActionsPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2270456895332910045 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2270456895332910044} + 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: 2270456895283614688} + - {fileID: 2270456895389200880} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 120} + m_SizeDelta: {x: 0, y: 240} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2270456895332910042 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2270456895332910044} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dcaef10ad2610f14296dc4a33ee71126, type: 3} + m_Name: + m_EditorClassIdentifier: + attackBonusParent: {fileID: 2270456895283614688} + protectBonusParent: {fileID: 2270456895389200880} + bonusController: {fileID: 0} +--- !u!1 &2270456895389200883 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2270456895389200880} + - component: {fileID: 2270456895389200910} + - component: {fileID: 2270456895389200881} + - component: {fileID: 2270456895389200911} + m_Layer: 5 + m_Name: DefendPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2270456895389200880 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2270456895389200883} + 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: 6572365856194206079} + - {fileID: 6572365855962572122} + - {fileID: 6572365855654424306} + m_Father: {fileID: 2270456895332910045} + 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: 400, y: 20} + m_SizeDelta: {x: 768, y: 400} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2270456895389200910 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2270456895389200883} + m_CullTransparentMesh: 1 +--- !u!114 &2270456895389200881 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2270456895389200883} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: deb3a6d0147ecd44d9a144c50656bcfd, 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!114 &2270456895389200911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2270456895389200883} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 80 + m_Top: 150 + m_Bottom: 0 + m_ChildAlignment: 2 + m_StartCorner: 1 + m_StartAxis: 0 + m_CellSize: {x: 100, y: 100} + m_Spacing: {x: 52, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!1001 &2270456894017329736 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2270456895283614688} + m_Modifications: + - target: {fileID: 4951693946268334740, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Name + value: BonusSlot (2) + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a95a7d5560852f3439e46688e499ec65, type: 3} +--- !u!224 &6572365856364028115 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + m_PrefabInstance: {fileID: 2270456894017329736} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2270456894182794212 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2270456895389200880} + m_Modifications: + - target: {fileID: 4951693946268334740, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Name + value: BonusSlot + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a95a7d5560852f3439e46688e499ec65, type: 3} +--- !u!224 &6572365856194206079 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + m_PrefabInstance: {fileID: 2270456894182794212} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2270456894725723241 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2270456895389200880} + m_Modifications: + - target: {fileID: 4951693946268334740, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Name + value: BonusSlot (2) + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a95a7d5560852f3439e46688e499ec65, type: 3} +--- !u!224 &6572365855654424306 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + m_PrefabInstance: {fileID: 2270456894725723241} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2270456894949203905 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2270456895389200880} + m_Modifications: + - target: {fileID: 4951693946268334740, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Name + value: BonusSlot (1) + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a95a7d5560852f3439e46688e499ec65, type: 3} +--- !u!224 &6572365855962572122 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + m_PrefabInstance: {fileID: 2270456894949203905} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2270456896058617933 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2270456895283614688} + m_Modifications: + - target: {fileID: 4951693946268334740, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Name + value: BonusSlot (1) + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a95a7d5560852f3439e46688e499ec65, type: 3} +--- !u!224 &6572365857004866262 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + m_PrefabInstance: {fileID: 2270456896058617933} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6572365855822400493 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2270456895283614688} + m_Modifications: + - target: {fileID: 4951693946268334740, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Name + value: BonusSlot + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a95a7d5560852f3439e46688e499ec65, type: 3} +--- !u!224 &2270456894557909366 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4951693946268334747, guid: a95a7d5560852f3439e46688e499ec65, + type: 3} + m_PrefabInstance: {fileID: 6572365855822400493} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs_NEW/UI/ActionsPanel.prefab.meta b/Assets/Prefabs_NEW/UI/ActionsPanel.prefab.meta new file mode 100644 index 00000000..2f7bfd02 --- /dev/null +++ b/Assets/Prefabs_NEW/UI/ActionsPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0377511198ddbef47aa7a6baccb27cd5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs_NEW/UI/GoldPanel.prefab b/Assets/Prefabs_NEW/UI/GoldPanel.prefab new file mode 100644 index 00000000..4227a211 --- /dev/null +++ b/Assets/Prefabs_NEW/UI/GoldPanel.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4146064639503085160 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4146064639503085167} + - component: {fileID: 4146064639503085165} + - component: {fileID: 4146064639503085166} + m_Layer: 5 + m_Name: GoldPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4146064639503085167 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4146064639503085160} + 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: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 256, y: -108} + m_SizeDelta: {x: 384, y: 216} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4146064639503085165 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4146064639503085160} + m_CullTransparentMesh: 1 +--- !u!114 &4146064639503085166 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4146064639503085160} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: f172a9662bd775c489257587680b1afb, 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 diff --git a/Assets/Prefabs_NEW/UI/GoldPanel.prefab.meta b/Assets/Prefabs_NEW/UI/GoldPanel.prefab.meta new file mode 100644 index 00000000..1ee6fec3 --- /dev/null +++ b/Assets/Prefabs_NEW/UI/GoldPanel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5fc5e9c823e76a14792d49b7399af906 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Attack.cs b/Assets/Scripts/Attack.cs index 8892cc61..70edffe3 100644 --- a/Assets/Scripts/Attack.cs +++ b/Assets/Scripts/Attack.cs @@ -120,6 +120,6 @@ public class Attack : PlayerAction public bool IsReady() { - return _isReady; + return _isReady; } } diff --git a/Assets/Scripts/TileManagment.cs b/Assets/Scripts/TileManagment.cs index 602f321a..04ca3f2e 100644 --- a/Assets/Scripts/TileManagment.cs +++ b/Assets/Scripts/TileManagment.cs @@ -79,8 +79,7 @@ public class TileManagment : MonoBehaviour CheckSurroundedTiles(levelTiles, newOwner, oldOwner); - OnAnyTileCaptured?.Invoke(); - + OnAnyTileCaptured?.Invoke(); } public static void AssignBuildingToTile(TileInfo tile, GameObject building)