Pull request #78: UpgradeIndividuel

Merge in CGD/gather-and-defend from UpgradeIndividuel to main

* commit '196740676df3a8b2b1cfa877b0b61dabdda497e0':
  Permettre 1 à 3 upgrades
  Suppression debug logs
  Revert UI
  Utilisation du UI d'Élia
  Ajout ScriptableObject pour UnitUpgrades
  Affichage bouttons interactifs + Suppression dummy gameobjects in Game scene
  Debuggins
  Change l'unité par l'upgrade choisi
  Début lien entre upgradeUI et Unité
  Rendu UpgradePlacementButton.cs indépendant des héritages de UnitPlacementButtons.
  Prefab UpgadeButtons, utilisation de EventSystems pour clique sur unités.
  Tentative d'associer le clique utilisateur à une position sur le jeu
This commit is contained in:
Ader Alisma 01 2024-10-27 20:28:26 +00:00
commit f06f619174
27 changed files with 2311 additions and 286 deletions

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: befdb05cb99add747b22bd3872618b81
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d1391306ffe53984bb2bc314f1d2919f, type: 3}
m_Name: Upgrade1
m_EditorClassIdentifier:
_upgradeUnitCard: {fileID: 11400000, guid: 9ff4b606166b07d4bb3afb15e5a23f41, type: 2}
_upgradePrefab: {fileID: 5531237550998824024, guid: 6cd87b398e7a0e94580f4fcbe2fd310a, type: 3}
_upgradeCardArt: {fileID: 21300000, guid: 178d3231a9182834aa1a4394bd40b644, type: 3}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0c3268393deaed84d87f041b2a4f970c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d1391306ffe53984bb2bc314f1d2919f, type: 3}
m_Name: Upgrade2
m_EditorClassIdentifier:
_upgradeUnitCard: {fileID: 11400000, guid: 0334115ab72f6d5449497db1bb50377e, type: 2}
_upgradePrefab: {fileID: 2230360378425099702, guid: ece16a59d4dca2246817fbb1b23f17ba, type: 3}
_upgradeCardArt: {fileID: 21300000, guid: b98e80d2b7d70264b800b1e6aa98a092, type: 3}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1639cd6a5b9ac1f4c96319ebfcac741a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -768,6 +768,7 @@ GameObject:
- component: {fileID: 4251894621246849979}
- component: {fileID: -488994066602243508}
- component: {fileID: 9177659942431061517}
- component: {fileID: -8508458510402479271}
- component: {fileID: -6673723252830894487}
m_Layer: 0
m_Name: archerStick

View File

@ -1196,6 +1196,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 6962989255644195631}
- component: {fileID: 8097481706580133022}
- component: {fileID: 8585520847943034727}
- component: {fileID: -1491803373025033585}
- component: {fileID: -7538281095464317747}
@ -1227,6 +1228,23 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8097481706580133022
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6962989255644195630}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: edcd1782caa73a747b1f060d18ce0f18, type: 3}
m_Name:
m_EditorClassIdentifier:
_upgradeUI: {fileID: 4817988606444742093, guid: 1d481c7093a8d2443a04261fd7c72be2, type: 3}
_upgradeList:
- {fileID: 11400000, guid: 0c3268393deaed84d87f041b2a4f970c, type: 2}
- {fileID: 11400000, guid: 1639cd6a5b9ac1f4c96319ebfcac741a, type: 2}
- {fileID: 11400000, guid: 0c3268393deaed84d87f041b2a4f970c, type: 2}
--- !u!114 &8585520847943034727
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@ -201,10 +201,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
_outlineMaterial: {fileID: 2100000, guid: 7f87c7d6b4237a34ea92984757e5c269, type: 2}
_detectionRangeSprite: {fileID: 21300000, guid: b14c454dd8569ab4780d0f8a904a110b, type: 3}
_wood: 0
_rock: 0
_food: 0
_cooldownInSeconds: 3
_unitCardInformation: {fileID: 0}
_foodLabel: {fileID: 907652129260736055}
_woodLabel: {fileID: 2551561112895533431}
_rockLabel: {fileID: 3195941792010457804}

View File

@ -193,7 +193,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 128.4, y: -161}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &4817988606444742080

View File

@ -0,0 +1,635 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4817988606444742093
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4817988606444742094}
- component: {fileID: 4817988606444742080}
- component: {fileID: 4817988606444742082}
m_Layer: 5
m_Name: UpgradeButtons
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4817988606444742094
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4817988606444742093}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6716417799655040460}
- {fileID: 7628964284593499177}
- {fileID: 1691244495608687713}
- {fileID: 4817988606957756069}
m_Father: {fileID: 0}
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: 1088.4, y: 379}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &4817988606444742080
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4817988606444742093}
m_CullTransparentMesh: 1
--- !u!114 &4817988606444742082
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4817988606444742093}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 1
m_VerticalFit: 1
--- !u!1 &4817988606957756068
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4817988606957756069}
- component: {fileID: 4817988606957756070}
m_Layer: 5
m_Name: Upgrades
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &4817988606957756069
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4817988606957756068}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4817988606444742094}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 5.200012, y: -23}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &4817988606957756070
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4817988606957756068}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 5
m_Right: 5
m_Top: 5
m_Bottom: 5
m_ChildAlignment: 0
m_Spacing: 98.3
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1001 &2008641878076503636
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 4817988606444742094}
m_Modifications:
- target: {fileID: -7391144163609056699, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: _buttonContainer
value:
objectReference: {fileID: 4817988606444742093}
- target: {fileID: 907652127959947826, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Name
value: Upgrade3
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 203
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: -28
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652128235033332, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 178d3231a9182834aa1a4394bd40b644, type: 3}
- target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Color.b
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Color.g
value: 0.069076404
objectReference: {fileID: 0}
- target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
--- !u!224 &1691244495608687713 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
m_PrefabInstance: {fileID: 2008641878076503636}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5885398403682320377
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 4817988606444742094}
m_Modifications:
- target: {fileID: -7391144163609056699, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: _buttonContainer
value:
objectReference: {fileID: 4817988606444742093}
- target: {fileID: 907652127959947826, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Name
value: Upgrade1
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5.2000732
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 135
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Color.b
value: 0.33333334
objectReference: {fileID: 0}
- target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Color.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Color.r
value: 0.43529412
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
--- !u!224 &6716417799655040460 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
m_PrefabInstance: {fileID: 5885398403682320377}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7297843871482410524
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 4817988606444742094}
m_Modifications:
- target: {fileID: -7391144163609056699, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: _buttonContainer
value:
objectReference: {fileID: 4817988606444742093}
- target: {fileID: 907652127959947826, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Name
value: Upgrade2
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 179
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 83
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 907652128235033332, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 7f013ea28cc038c4794a38dc2f1b0685, type: 3}
- target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Color.b
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Color.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1078481983243672785, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5139721979244350189, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7106892478383455582, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7112938880036038065, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
--- !u!224 &7628964284593499177 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: 7a4156822defb3f4bb8a2ed6de7cacdb, type: 3}
m_PrefabInstance: {fileID: 7297843871482410524}
m_PrefabAsset: {fileID: 0}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1d481c7093a8d2443a04261fd7c72be2
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7a4156822defb3f4bb8a2ed6de7cacdb
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -160,6 +160,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 2118220732422767659}
m_Modifications:
- target: {fileID: 962025096442550070, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: _buttonContainer
value:
objectReference: {fileID: 2118220733331082121}
- target: {fileID: 3013207445655681334, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_text
value: 0
@ -174,19 +178,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchoredPosition.y
value: -26.970634
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207446160532222, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_IsActive
@ -302,19 +306,19 @@ PrefabInstance:
objectReference: {fileID: 21300000, guid: 66cd3a50885846743981bc57aa5f7b72, type: 3}
- target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchoredPosition.y
value: -48.94127
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207446742728181, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_IsActive
@ -322,19 +326,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchoredPosition.y
value: -5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3921547832887455157, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_SpriteState.m_HighlightedSprite
@ -354,6 +358,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 2118220732422767659}
m_Modifications:
- target: {fileID: 962025096442550070, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: _buttonContainer
value:
objectReference: {fileID: 2118220733331082121}
- target: {fileID: 3013207445655681334, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_text
value: 0
@ -516,6 +524,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 2118220732422767659}
m_Modifications:
- target: {fileID: 962025096442550070, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: _buttonContainer
value:
objectReference: {fileID: 2118220733331082121}
- target: {fileID: 3013207445655681334, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_text
value: 0
@ -526,19 +538,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207446160532221, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchoredPosition.y
value: -26.970634
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207446175879013, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_Sprite
@ -650,35 +662,35 @@ PrefabInstance:
objectReference: {fileID: 21300000, guid: 66cd3a50885846743981bc57aa5f7b72, type: 3}
- target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207446742728180, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchoredPosition.y
value: -48.94127
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3013207447116908153, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_AnchoredPosition.y
value: -5
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3921547832887455157, guid: 4789f524a7e1b7b40be6fefda32f600e, type: 3}
propertyPath: m_SpriteState.m_HighlightedSprite

View File

@ -554,9 +554,9 @@ RectTransform:
m_Father: {fileID: 3013207447181477519}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 5, y: -26.970634}
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_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3013207446160532220
@ -857,6 +857,7 @@ GameObject:
- component: {fileID: 3013207446659063112}
- component: {fileID: 3013207446659063111}
- component: {fileID: 3921547832887455157}
- component: {fileID: 962025096442550070}
m_Layer: 5
m_Name: unitUpgrade_optionButton
m_TagString: Untagged
@ -943,6 +944,31 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &962025096442550070
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3013207446659063113}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 26a731ab13b65cc4eabb568482ef1832, type: 3}
m_Name:
m_EditorClassIdentifier:
_foodLabel: {fileID: 3013207445808733941}
_woodLabel: {fileID: 3013207445760102698}
_rockLabel: {fileID: 3013207445655681334}
_backgroundImage: {fileID: 3013207446705226711}
_availableBackgroundImage: {fileID: 21300000, guid: 518e2f9bad4807641a02fc3815fc0033, type: 3}
_unavailableBackgroundImage: {fileID: 21300000, guid: 66cd3a50885846743981bc57aa5f7b72, type: 3}
_backgroundImageHover: {fileID: 3921547832887455157}
_availableBackgroundImageHover: {fileID: 21300000, guid: a2f9422294367ee45aad61a14882acd0, type: 3}
_unavailableBackgroundImageHover: {fileID: 21300000, guid: 83e9ee3059b8ac742963bc8f2835ff63, type: 3}
_unitArt: {fileID: 3013207446175879013}
_buttonContainer: {fileID: 0}
_prefab: {fileID: 0}
_unitCardInformation: {fileID: 0}
--- !u!1 &3013207446705226713
GameObject:
m_ObjectHideFlags: 0
@ -1053,9 +1079,9 @@ RectTransform:
m_Father: {fileID: 3013207447181477519}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 5, y: -48.94127}
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_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3013207446742728179
@ -1106,9 +1132,9 @@ RectTransform:
m_Father: {fileID: 3013207447181477519}
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: 5, y: -5}
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_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3013207447116908152

View File

@ -945,6 +945,7 @@ GameObject:
- component: {fileID: 519420032}
- component: {fileID: 519420031}
- component: {fileID: 519420030}
- component: {fileID: 519420033}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@ -1043,6 +1044,22 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &519420033
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 519420028}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 56666c5a40171f54783dd416a44f42bf, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EventMask:
serializedVersion: 2
m_Bits: 4294967295
m_MaxRayIntersections: 0
--- !u!1 &590036741 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 809914571449911858, guid: 5497dc5adfbe67341980c9d946816424, type: 3}
@ -1989,7 +2006,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 884382837}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
@ -2350,7 +2367,6 @@ RectTransform:
- {fileID: 405102485}
- {fileID: 115274809}
- {fileID: 179679298}
- {fileID: 1937287992}
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3756,11 +3772,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1761692192}
m_CullTransparentMesh: 1
--- !u!224 &1937287992 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
m_PrefabInstance: {fileID: 2118220733588545726}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2019202046
GameObject:
m_ObjectHideFlags: 0
@ -4127,244 +4138,3 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2118220733588545726
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1092900232}
m_Modifications:
- target: {fileID: 2118220733285982972, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2118220733285982972, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2118220733285982972, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2118220733285982972, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.y
value: -26.970634
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_RootOrder
value: 8
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_SizeDelta.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.x
value: -744.6
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.y
value: -197.7
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082118, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2118220733331082121, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_Name
value: UnitUpgrade
objectReference: {fileID: 0}
- target: {fileID: 2118220733403498104, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2118220733403498104, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2118220733403498104, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2118220733403498104, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.y
value: -5
objectReference: {fileID: 0}
- target: {fileID: 2118220733703028213, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2118220733703028213, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2118220733703028213, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2118220733703028213, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.y
value: -48.94127
objectReference: {fileID: 0}
- target: {fileID: 3673783019430489409, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3673783019430489409, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3673783019430489409, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3673783019430489409, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3673783020794982984, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3673783020794982984, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3673783020794982984, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3673783020794982984, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3673783021158713797, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3673783021158713797, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3673783021158713797, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3673783021158713797, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8873777844269887265, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8873777844269887265, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8873777844269887265, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8873777844269887265, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8873777845461240741, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8873777845461240741, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8873777845461240741, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8873777845461240741, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8873777845624418344, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8873777845624418344, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8873777845624418344, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8873777845624418344, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3dea9da5643f37b43ac6145f65859558, type: 3}

View File

@ -36,6 +36,11 @@ public class Ally : Entity
AttackSpeedWait += Time.deltaTime;
}
public Vector3 GetPosition()
{
return transform.position;
}
public override void LevelStart()
{
base.LevelStart();

View File

@ -0,0 +1,56 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
{
[SerializeField]
private GameObject _upgradeUI;
[SerializeField]
private List<UnitUpgrade> _upgradeList = new List<UnitUpgrade>();
private GameObject _instance = null;
public void OnPointerClick(PointerEventData eventData)
{
if (eventData.button == 0) //Left click
{
if (!_instance)
{
GameObject sceneCanvas = GameObject.Find("Canvas");
if (sceneCanvas != null)
{
Canvas canvas = sceneCanvas.GetComponent<Canvas>();
if (canvas == null)
{
Debug.Log("Canvas introuvable...");
}
else
{
_instance = Instantiate(_upgradeUI, Camera.main.WorldToScreenPoint(transform.position), Quaternion.identity, canvas.transform);
AssignUpgrades(canvas);
}
}
}
else
{
Destroy(_instance);
}
}
}
private void AssignUpgrades(Canvas canvas)
{
// Assign upgrade Prefabs
for (int i = 0; i < _instance.transform.childCount - 1; i++)
{
if (_upgradeList[i] != null)
{
GameObject upgradeEnfant = _instance.transform.GetChild(i).gameObject;
UpgradePlacementButton button = upgradeEnfant.GetComponent<UpgradePlacementButton>();
button.Initialize(_upgradeList[i], gameObject, canvas);
}
}
}}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: edcd1782caa73a747b1f060d18ce0f18
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,16 @@
using UnityEngine;
[CreateAssetMenu(menuName = "Gather And Defend/Upgradable Unit")]
public class UnitUpgrade : ScriptableObject
{
[SerializeField]
protected UnitCard _upgradeUnitCard;
[SerializeField]
protected GameObject _upgradePrefab;
[SerializeField]
protected Sprite _upgradeCardArt;
public UnitCard UpgradeUnitCard => _upgradeUnitCard;
public GameObject UpgradePrefab => _upgradePrefab;
public Sprite UpgradeCardArt => _upgradeCardArt;
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: d1391306ffe53984bb2bc314f1d2919f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ac84ea181a6f6e04b86aba7687fdeef9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,36 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
public class UnitTreeDisplay : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
{
//private Vector3 _originPosition;
private Vector2 _size;
private RectTransform _rectTransform;
// Start is called before the first frame update
void Start()
{
Debug.Log("Rect formed");
_rectTransform = GetComponent<RectTransform>();
_size = _rectTransform.sizeDelta;
_rectTransform.anchoredPosition = transform.position;
}
public void SetPosition(Vector3 position)
{
_rectTransform.anchoredPosition = position;
}
public void OnPointerEnter(PointerEventData eventData)
{
_rectTransform.sizeDelta = _size * 1.05f;
}
public void OnPointerExit(PointerEventData eventData)
{
_rectTransform.sizeDelta = _size;
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: c5b5766d35112224bba2fdd9a1c98d52
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,96 @@
using System;
using TMPro;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler
{
private Button _button;
[SerializeField]
private TMP_Text _foodLabel;
[SerializeField]
private TMP_Text _woodLabel;
[SerializeField]
private TMP_Text _rockLabel;
[SerializeField]
private Image _backgroundImage;
[SerializeField]
private Image _unitArt;
[SerializeField]
private GameObject _buttonContainer;
[SerializeField]
private GameObject _prefab;
[SerializeField]
protected UnitCard _unitCardInformation;
private GameObject _unitGameObject;
private Canvas _canvas;
public Button Button => _button;
void Start()
{
_button = GetComponent<Button>();
if (_unitCardInformation == null)
{
Destroy(gameObject);
}
}
void Update()
{
if (_unitCardInformation != null)
{
_button.interactable = CanUse();
if (CanUse())
{
_backgroundImage.color = Color.green;
}
else
{
_backgroundImage.color = Color.red;
}
}
}
private bool CanUse()
{
return ResourceManager.Instance.EnoughFor(_unitCardInformation.Rock, _unitCardInformation.Wood, _unitCardInformation.Food);
}
void SetTextFor(TMP_Text label, int value)
{
label.transform.parent.gameObject.SetActive(value > 0);
label.text = "" + value;
}
public void OnPointerClick(PointerEventData eventData)
{
if (CanUse())
{
//Change parent GameObject
Vector3 instantiatePosition = _unitGameObject.transform.position;
Instantiate(_prefab, instantiatePosition, Quaternion.identity, _canvas.transform);
ResourceManager resourceManager = ResourceManager.Instance;
resourceManager.Remove(_unitCardInformation.Rock, _unitCardInformation.Wood, _unitCardInformation.Food);
Destroy(_unitGameObject);
Destroy(_buttonContainer);
}
}
public void Initialize(UnitUpgrade unitUpgrade, GameObject parentGameObject, Canvas canvas)
{
Debug.Log(unitUpgrade.name);
_unitCardInformation = unitUpgrade.UpgradeUnitCard;
SetTextFor(_foodLabel, _unitCardInformation.Food);
SetTextFor(_woodLabel, _unitCardInformation.Wood);
SetTextFor(_rockLabel, _unitCardInformation.Rock);
_prefab = unitUpgrade.UpgradePrefab;
_unitGameObject = parentGameObject;
_canvas = canvas;
_unitArt.sprite = unitUpgrade.UpgradeCardArt;
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 26a731ab13b65cc4eabb568482ef1832
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -10,6 +10,7 @@ TagManager:
- Food
- Wood
- Rock
- Upgrade
layers:
- Default
- TransparentFX