Compare commits

..

3 Commits

Author SHA1 Message Date
fd002a54a8 Remove includes preventing build (#20)
Reviewed-on: #20
Co-authored-by: William <william-gin1@hotmail.com>
Co-committed-by: William <william-gin1@hotmail.com>
2025-11-09 15:39:42 +00:00
b2621bf03d Adjusted tooltip descriptions (#19)
Ajout de descriptions spécifiques aux unités alliées

Co-authored-by: Ader Alisma 01 <adeder22@hotmail.com>
Reviewed-on: #19
Reviewed-by: EliaGingras1 <william-gin1@hotmail.com>
2025-10-15 18:55:35 +00:00
da5add33e8 fixed house upgrade bug 2025-10-13 00:32:40 -04:00
35 changed files with 104 additions and 683 deletions

View File

@ -16,4 +16,4 @@ MonoBehaviour:
_rock: 0
_food: 0
_cooldownInSeconds: 2
_tooltipString:
_tooltipString: "Archer\nAttaque longue port\xE9e"

View File

@ -16,4 +16,6 @@ MonoBehaviour:
_rock: 0
_food: 0
_cooldownInSeconds: 10
_tooltipString:
_tooltipString: 'Forgerie
+5 population | +15% vitesse production de roches'

View File

@ -16,3 +16,6 @@ MonoBehaviour:
_rock: 0
_food: 0
_cooldownInSeconds: 1
_tooltipString: 'Lanceur de bolas
Ralentit les ennemis'

View File

@ -16,4 +16,4 @@ MonoBehaviour:
_rock: 350
_food: 0
_cooldownInSeconds: 30
_tooltipString:
_tooltipString: "Ch\xE2teau sentinelle\nTire une rafale de projectiles d\xE9vastatrices"

View File

@ -1,19 +0,0 @@
%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: a92d696df7037b44585aaac56ec9ed98, type: 3}
m_Name: CorruptedFactory
m_EditorClassIdentifier:
_wood: 100
_rock: 100
_food: 100
_cooldownInSeconds: 10
_tooltipString:

View File

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

View File

@ -16,4 +16,5 @@ MonoBehaviour:
_rock: 0
_food: 0
_cooldownInSeconds: 0
_tooltipString:
_tooltipString: "Plantation de nourriture\nPermet \xE0 un fermier de r\xE9colter
de la nourriture"

View File

@ -16,4 +16,5 @@ MonoBehaviour:
_rock: 0
_food: 10
_cooldownInSeconds: 0
_tooltipString:
_tooltipString: "Agriculteur de ressources\nR\xE9colte tout type de ressources
(Nourriture / Bois / Roche)"

View File

@ -16,4 +16,5 @@ MonoBehaviour:
_rock: 0
_food: 20
_cooldownInSeconds: 1
_tooltipString: Agressive farmer's association MOB
_tooltipString: "MOB agressive de l'association des fermiers\nFournissent un mur
d\xE9fensif efficace"

View File

@ -16,4 +16,6 @@ MonoBehaviour:
_rock: 0
_food: 0
_cooldownInSeconds: 1
_tooltipString:
_tooltipString: 'Maison
+10 population'

View File

@ -16,4 +16,6 @@ MonoBehaviour:
_rock: 0
_food: 100
_cooldownInSeconds: 15
_tooltipString:
_tooltipString: 'Chevalier
Fournis un mur imbattable'

View File

@ -16,3 +16,5 @@ MonoBehaviour:
_rock: 0
_food: 10
_cooldownInSeconds: 1
_tooltipString: "Chevalier jouteur\nAttaque m\xEAl\xE9e + attaque per\xE7ante dans
la rang\xE9e"

View File

@ -16,4 +16,6 @@ MonoBehaviour:
_rock: 0
_food: 0
_cooldownInSeconds: 10
_tooltipString:
_tooltipString: 'Moulin
+5 population | +15% vitesse production de nourriture'

View File

@ -16,3 +16,4 @@ MonoBehaviour:
_rock: 0
_food: 0
_cooldownInSeconds: 2
_tooltipString: "Scorpion\nAttaque per\xE7ante longue port\xE9e"

View File

@ -16,3 +16,4 @@ MonoBehaviour:
_rock: 0
_food: 0
_cooldownInSeconds: 1
_tooltipString: "Lanceur de pierres\nAttaques longue port\xE9e"

View File

@ -16,3 +16,6 @@ MonoBehaviour:
_rock: 0
_food: 30
_cooldownInSeconds: 4
_tooltipString: 'Apprenti chevalier
Fournis un mur durable'

View File

@ -16,4 +16,6 @@ MonoBehaviour:
_rock: 0
_food: 0
_cooldownInSeconds: 10
_tooltipString:
_tooltipString: 'Workshop
+5 population | +15% vitesse production de bois'

View File

@ -1,17 +0,0 @@
%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: Upgrade_CorruptedFactory
m_EditorClassIdentifier:
_upgradeUnitCard: {fileID: 11400000, guid: 05ab917027b0e5d478d27c906a31aa64, type: 2}
_upgradePrefab: {fileID: 1038659306882990064, guid: d03c6a18b62c84943967226ab159e1c4, type: 3}
_upgradeCardArt: {fileID: 21300000, guid: 2debbbaa18345ef44b32b72cbcad01b0, type: 3}

View File

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

View File

@ -1,397 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1038659306882990064
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7635908653065262707}
- component: {fileID: 4893380182456950857}
- component: {fileID: 5051996996752872273}
- component: {fileID: -1239601138929197919}
m_Layer: 0
m_Name: CorruptedFactory
m_TagString: Ally
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7635908653065262707
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1038659306882990064}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -7.402152, y: 0.39607596, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5939671854127199056}
- {fileID: 6770826418803405524}
- {fileID: 1049296725658017964}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &4893380182456950857
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1038659306882990064}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0, y: 0}
oldSize: {x: 0, y: 0}
newSize: {x: 0, y: 0}
adaptiveTilingThreshold: 0
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!50 &5051996996752872273
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1038659306882990064}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1000000
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 0
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 4
--- !u!114 &-1239601138929197919
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1038659306882990064}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f02fef000728c82449ae7993a564e37c, type: 3}
m_Name:
m_EditorClassIdentifier:
_lifeBar: {fileID: 4795252161776368380}
_hp: 0
_speed: 0
_attack_damage: 2
_attack_interval: 2
_enemy: {fileID: 0}
rangeOutline: {fileID: 0}
_range: 0
_multiplier: 0
_yieldPrefabs:
- {fileID: 6962989255644195630, guid: a2dc5d9672c10074fa9c35c12f6339c1, type: 3}
- {fileID: 6962989255644195630, guid: 484f0eca1c74ae34694692de56a36739, type: 3}
- {fileID: 6962989255644195630, guid: f20569b5452c2b341a95d656b7534b7e, type: 3}
_randomPositionConfig: 0.5
_harvestDuration: 5
_yieldAmountPerResource: 5
--- !u!1 &5799165302180276253
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6770826418803405524}
- component: {fileID: 4877144423808268021}
- component: {fileID: 2468754937282593442}
m_Layer: 6
m_Name: range_outline
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6770826418803405524
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5799165302180276253}
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: 7635908653065262707}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &4877144423808268021
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5799165302180276253}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 3.26, y: 4.88}
newSize: {x: 3.26, y: 4.88}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3, y: 3}
m_EdgeRadius: 0
--- !u!114 &2468754937282593442
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5799165302180276253}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 531d7966d86bd0c4d83baf58bcb56cd5, type: 3}
m_Name:
m_EditorClassIdentifier:
_entityLinked: {fileID: 0}
--- !u!1 &6453988705367329854
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5939671854127199056}
- component: {fileID: 8933452427527575608}
m_Layer: 0
m_Name: root
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5939671854127199056
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6453988705367329854}
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: 4768125905524963531}
m_Father: {fileID: 7635908653065262707}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &8933452427527575608
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6453988705367329854}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6d42b38c305a679498e86d4396f18a9b, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &8199056397416991447
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4768125905524963531}
- component: {fileID: 4033240441719088282}
m_Layer: 0
m_Name: workshop_building
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4768125905524963531
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8199056397416991447}
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: 5939671854127199056}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4033240441719088282
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8199056397416991447}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 364159097
m_SortingLayer: 1
m_SortingOrder: 4
m_Sprite: {fileID: 21300000, guid: 2debbbaa18345ef44b32b72cbcad01b0, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.59, y: 1.47}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &1868518140432677422
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 7635908653065262707}
m_Modifications:
- target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3}
propertyPath: m_LocalPosition.y
value: 0.57
objectReference: {fileID: 0}
- target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8131035023550608747, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3}
propertyPath: m_Name
value: HPSlider
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3}
--- !u!4 &1049296725658017964 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1684793252178254466, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3}
m_PrefabInstance: {fileID: 1868518140432677422}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4795252161776368380 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6584939087328067794, guid: 19b269ca2b00e9b4dbff3fa28761992a, type: 3}
m_PrefabInstance: {fileID: 1868518140432677422}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ff4f0f23ad79f2e4c92d0c20fe06071b, type: 3}
m_Name:
m_EditorClassIdentifier:

View File

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

View File

@ -12,7 +12,6 @@ GameObject:
- component: {fileID: 4893380182456950857}
- component: {fileID: 5051996996752872273}
- component: {fileID: 6061630371781146510}
- component: {fileID: 5887580710472258969}
m_Layer: 0
m_Name: Mill
m_TagString: Ally
@ -106,21 +105,6 @@ MonoBehaviour:
rangeOutline: {fileID: 4877144423808268021}
_range: 1
_multiplier: 10
--- !u!114 &5887580710472258969
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1038659306882990064}
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: 8667059f364a1c440935b2b86552103f, type: 2}
--- !u!1 &1371331378727130647
GameObject:
m_ObjectHideFlags: 0

View File

@ -12,7 +12,6 @@ GameObject:
- component: {fileID: 4893380182456950857}
- component: {fileID: 5051996996752872273}
- component: {fileID: 3252807573666191813}
- component: {fileID: -7576367453348939844}
m_Layer: 0
m_Name: Workshop
m_TagString: Ally
@ -106,21 +105,6 @@ MonoBehaviour:
rangeOutline: {fileID: 4877144423808268021}
_range: 1
_multiplier: 10
--- !u!114 &-7576367453348939844
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1038659306882990064}
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: 8667059f364a1c440935b2b86552103f, type: 2}
--- !u!1 &5799165302180276253
GameObject:
m_ObjectHideFlags: 0

View File

@ -38,7 +38,6 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@ -1416,35 +1415,6 @@ MonoBehaviour:
m_ShadowIntensity: 0.75
m_ShadowVolumeIntensityEnabled: 0
m_ShadowVolumeIntensity: 0.75
m_Vertices:
- position: {x: 0.9985302, y: 0.9985302, z: 0}
color: {r: 0.70710677, g: 0.70710677, b: 0, a: 0}
uv: {x: 0, y: 0}
- position: {x: 0.9985302, y: 0.9985302, z: 0}
color: {r: 0, g: 0, b: 0, a: 1}
uv: {x: 0, y: 0}
- position: {x: -0.9985302, y: 0.9985302, z: 0}
color: {r: -0.70710677, g: 0.70710677, b: 0, a: 0}
uv: {x: 0, y: 0}
- position: {x: -0.9985302, y: 0.9985302, z: 0}
color: {r: 0, g: 0, b: 0, a: 1}
uv: {x: 0, y: 0}
- position: {x: -0.99853003, y: -0.9985304, z: 0}
color: {r: -0.70710665, g: -0.7071069, b: 0, a: 0}
uv: {x: 0, y: 0}
- position: {x: -0.99853003, y: -0.9985304, z: 0}
color: {r: 0, g: 0, b: 0, a: 1}
uv: {x: 0, y: 0}
- position: {x: 0.99853003, y: -0.9985304, z: 0}
color: {r: 0.70710665, g: -0.7071069, b: 0, a: 0}
uv: {x: 0, y: 0}
- position: {x: 0.99853003, y: -0.9985304, z: 0}
color: {r: 0, g: 0, b: 0, a: 1}
uv: {x: 0, y: 0}
- position: {x: 0, y: 0, z: 0}
color: {r: 0, g: 0, b: 0, a: 1}
uv: {x: 0, y: 0}
m_Triangles: 030001000800020000000100030002000100050003000800040002000300050004000300070005000800060004000500070006000500010007000800000006000700010000000700
m_LocalBounds:
m_Center: {x: 0, y: -0.00000011920929, z: 0}
m_Extent: {x: 0.9985302, y: 0.99853027, z: 0}
@ -2596,6 +2566,7 @@ Canvas:
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
@ -2945,6 +2916,7 @@ Canvas:
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 25
m_SortingLayerID: 0
m_SortingOrder: 0
@ -3127,11 +3099,11 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 400568530076150058, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 400568530076150058, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 400568530076150058, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3139,15 +3111,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400568530076150058, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -47.711605
objectReference: {fileID: 0}
- target: {fileID: 400568530484276529, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 400568530484276529, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 400568530484276529, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3155,7 +3127,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400568530484276529, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -47.711605
objectReference: {fileID: 0}
- target: {fileID: 703543387231767793, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
@ -3231,11 +3203,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3243,15 +3215,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 907652128862280229, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -5
objectReference: {fileID: 0}
- target: {fileID: 1361171379191865150, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1361171379191865150, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1361171379191865150, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3259,15 +3231,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1361171379191865150, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -6.0372024
objectReference: {fileID: 0}
- target: {fileID: 1366041080306649041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1366041080306649041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1366041080306649041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3275,7 +3247,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1366041080306649041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -26.874405
objectReference: {fileID: 0}
- target: {fileID: 1740692696410812620, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
@ -3295,11 +3267,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2335911515764278902, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2335911515764278902, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2335911515764278902, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3307,15 +3279,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2335911515764278902, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -6.0372024
objectReference: {fileID: 0}
- target: {fileID: 2335911516153004653, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2335911516153004653, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2335911516153004653, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3323,15 +3295,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2335911516153004653, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -6.0372024
objectReference: {fileID: 0}
- target: {fileID: 2340796561450327705, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2340796561450327705, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2340796561450327705, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3339,15 +3311,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2340796561450327705, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -26.874405
objectReference: {fileID: 0}
- target: {fileID: 2340796563190143618, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2340796563190143618, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2340796563190143618, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3355,7 +3327,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2340796563190143618, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -26.874405
objectReference: {fileID: 0}
- target: {fileID: 3181429381540750253, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
@ -3375,11 +3347,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3964878483247902818, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3964878483247902818, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3964878483247902818, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3387,7 +3359,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3964878483247902818, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -47.711605
objectReference: {fileID: 0}
- target: {fileID: 4453469705328566160, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
@ -3543,11 +3515,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5139721980499987197, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5139721980499987197, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5139721980499987197, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3555,15 +3527,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5139721980499987197, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -47.711605
objectReference: {fileID: 0}
- target: {fileID: 5316389173819650276, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5316389173819650276, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5316389173819650276, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3571,15 +3543,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5316389173819650276, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -26.874405
objectReference: {fileID: 0}
- target: {fileID: 5319145879937787915, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5319145879937787915, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5319145879937787915, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3587,15 +3559,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5319145879937787915, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -6.0372024
objectReference: {fileID: 0}
- target: {fileID: 5639720393060989426, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5639720393060989426, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5639720393060989426, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3603,15 +3575,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5639720393060989426, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -201.6
objectReference: {fileID: 0}
- target: {fileID: 5639720393720315369, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5639720393720315369, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5639720393720315369, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3619,15 +3591,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5639720393720315369, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -5
objectReference: {fileID: 0}
- target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3635,7 +3607,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5639720394252960041, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -103.3
objectReference: {fileID: 0}
- target: {fileID: 6044811384361869331, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_IsActive
@ -3675,11 +3647,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7106892479276285262, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7106892479276285262, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7106892479276285262, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3687,7 +3659,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7106892479276285262, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -26.874405
objectReference: {fileID: 0}
- target: {fileID: 7106892479944355554, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
@ -3739,11 +3711,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7112938881271752097, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7112938881271752097, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7112938881271752097, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3751,7 +3723,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7112938881271752097, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -6.0372024
objectReference: {fileID: 0}
- target: {fileID: 7488888111208117106, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_IsActive
@ -3775,11 +3747,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7797049475554395991, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7797049475554395991, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7797049475554395991, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3787,15 +3759,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7797049475554395991, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -47.711605
objectReference: {fileID: 0}
- target: {fileID: 8992921944992653498, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8992921944992653498, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8992921944992653498, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.x
@ -3803,7 +3775,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8992921944992653498, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -103.3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 306211cf6348ac747a78d89bd72fca3e, type: 3}
@ -4389,7 +4361,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 273.4146, y: 78.0236}
m_SizeDelta: {x: 273.4146, y: 128.02}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1661484071
MonoBehaviour:

View File

@ -48,10 +48,10 @@ public class AllyUpgrade : MonoBehaviour, IPointerClickHandler
{
if (_upgradeList.Count > i && _upgradeList[i] != null)
{
GameObject upgradeEnfant = _instance.transform.Find("Upgrade" + (i + 1)).gameObject;
if (upgradeEnfant.TryGetComponent<UpgradePlacementButton>(out UpgradePlacementButton button))
Transform upgradeEnfant = _instance.transform.Find("Upgrade" + (i + 1));
if (upgradeEnfant && upgradeEnfant.TryGetComponent<UpgradePlacementButton>(out UpgradePlacementButton button))
{
button.Initialize(_upgradeList[i], gameObject, canvas);
button.Initialize(_upgradeList[i], gameObject.gameObject, canvas);
}
}
}

View File

@ -2,5 +2,5 @@
public class Blacksmith : ProductionBuilding
{
protected override Enum.ResourceNodeType[] RessourceNodeType { get { return new Enum.ResourceNodeType[] { Enum.ResourceNodeType.Rock }; } }
protected override Enum.ResourceNodeType RessourceNodeType { get { return Enum.ResourceNodeType.Rock; } }
}

View File

@ -1,61 +0,0 @@
using System.Collections.Generic;
using UnityEngine;
public class CorruptedFactory : ProductionBuilding
{
//TODO: Si ceci détermine la resource produite, modifier pour que ce soit un tableau des trois différent types de resources.
protected override Enum.ResourceNodeType[] RessourceNodeType { get { return new Enum.ResourceNodeType [] { Enum.ResourceNodeType.Forest, Enum.ResourceNodeType.Rock, Enum.ResourceNodeType.BerryBush, Enum.ResourceNodeType.Farm}; } }
/**
* Yield Production
*/
[SerializeField]
private List<GameObject> _yieldPrefabs = new List<GameObject>(3);
[SerializeField]
[Range(0.0f, 5.0f)]
private float _randomPositionConfig = 0.5f;
[SerializeField]
private float _harvestDuration = 5.0f;
[SerializeField]
private int _yieldAmountPerResource = 1;
private float _yieldCounter = 0;
private float _yieldSpeedMultiplier = 1.0f;
public override void LevelStart()
{
base.LevelStart();
ResetYieldDuration();
}
public override void Update()
{
base.Update();
_yieldCounter -= Time.deltaTime;
if (_yieldCounter > 0) return;
ResetYieldDuration();
if (_yieldPrefabs.Count > 0)
{
for (int i = 0; i < _yieldPrefabs.Count; i++)
{
for (int j = 0; j < _yieldAmountPerResource; j++)
{
YieldResource(_yieldPrefabs[i]);
}
}
}
}
private void YieldResource(GameObject yield)
{
float rangeConfig = 0.5f + _randomPositionConfig;
Vector3 yieldPosition = new Vector3(Position.x + Random.Range(-rangeConfig, rangeConfig), Position.y, Position.z);
var yielded = Instantiate(yield, yieldPosition, Quaternion.identity);
yielded.transform.SetParent(LevelManager.Instance.LevelTransform);
}
private void ResetYieldDuration()
{
_yieldCounter = _harvestDuration / _yieldSpeedMultiplier;
}
}

View File

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

View File

@ -2,5 +2,5 @@
public class Mill : ProductionBuilding
{
protected override Enum.ResourceNodeType[] RessourceNodeType { get { return new Enum.ResourceNodeType[] { Enum.ResourceNodeType.BerryBush }; } }
protected override Enum.ResourceNodeType RessourceNodeType { get { return Enum.ResourceNodeType.BerryBush; } }
}

View File

@ -8,7 +8,7 @@ public abstract class ProductionBuilding : House
private float _multiplier;
public override float PopulationGiven => GlobalConfig.Instance.Current.populationGivenPerHouseUpgrade;
protected abstract Enum.ResourceNodeType[] RessourceNodeType { get; }
protected abstract Enum.ResourceNodeType RessourceNodeType { get; }
public int Range { get => _range; set => _range = value; }
private Vector3 _position;
@ -42,20 +42,10 @@ public abstract class ProductionBuilding : House
if (tile == default) continue;
var checkResourceType = tile.ResourceNodeType;
if (!isValidResourceType(tile.ResourceNodeType)) continue;
if (checkResourceType != RessourceNodeType) continue;
tile.YieldSpeedMultiplier *= multiplier;
}
}
}
private bool isValidResourceType (Enum.ResourceNodeType tileRessourceType)
{
for(int i = 0; i < RessourceNodeType.Length; i++)
{
if (tileRessourceType == RessourceNodeType[i]) return true;
}
return false;
}
}

View File

@ -2,5 +2,5 @@
public class Workshop : ProductionBuilding
{
protected override Enum.ResourceNodeType[] RessourceNodeType { get { return new Enum.ResourceNodeType[] { Enum.ResourceNodeType.Forest }; } }
protected override Enum.ResourceNodeType RessourceNodeType { get { return Enum.ResourceNodeType.Forest; } }
}

View File

@ -1,6 +1,5 @@
using System.Collections;
using System.Collections.Generic;
using UnityEditorInternal;
using UnityEngine;
[CreateAssetMenu(menuName = project_name + "/Global Config")]

View File

@ -1,6 +1,5 @@
using System.Collections;
using System.Collections.Generic;
using UnityEditorInternal;
using UnityEngine;
public class Opponent : Entity

View File

@ -1,6 +1,5 @@
using System.Collections;
using System.Collections.Generic;
using Unity.VisualScripting.YamlDotNet.Core.Tokens;
using UnityEngine;
public class Slow : Status

View File

@ -3,7 +3,6 @@ using TMPro;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
using static PlasticGui.LaunchDiffParameters;
public class UpgradePlacementButton : MonoBehaviour, IPointerClickHandler, IPointerEnterHandler, IPointerExitHandler
{