Browse Source

Infantry Icon Part 1

master
laurids 2 years ago
parent
commit
c163fcef47
3 changed files with 290 additions and 13 deletions
  1. +271
    -5
      Assets/GWConquest/Prefabs/UI/BattleUnitIcon.prefab
  2. +8
    -8
      Assets/GWConquest/Scenes/GalaxyMap.unity
  3. +11
    -0
      Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs

+ 271
- 5
Assets/GWConquest/Prefabs/UI/BattleUnitIcon.prefab View File

@ -28,6 +28,7 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 7612512099407127390} m_Father: {fileID: 7612512099407127390}
m_RootOrder: 0 m_RootOrder: 0
@ -103,6 +104,7 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1299465307853908425} m_Father: {fileID: 1299465307853908425}
m_RootOrder: 0 m_RootOrder: 0
@ -176,7 +178,10 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 3613406984414568876}
- {fileID: 968728054296979172}
- {fileID: 1687732571317619598} - {fileID: 1687732571317619598}
m_Father: {fileID: 1687732570946376589} m_Father: {fileID: 1687732570946376589}
m_RootOrder: 2 m_RootOrder: 2
@ -214,6 +219,7 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1619096850430010799} m_Father: {fileID: 1619096850430010799}
m_RootOrder: 1 m_RootOrder: 1
@ -289,6 +295,7 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1619096850538365564} - {fileID: 1619096850538365564}
- {fileID: 1619096849984119125} - {fileID: 1619096849984119125}
@ -349,6 +356,7 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1619096850430010799} m_Father: {fileID: 1619096850430010799}
m_RootOrder: 0 m_RootOrder: 0
@ -428,6 +436,7 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1395217871626499769} - {fileID: 1395217871626499769}
- {fileID: 914397066647810572} - {fileID: 914397066647810572}
@ -499,6 +508,9 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
IconImage: {fileID: 1687732571317619599} IconImage: {fileID: 1687732571317619599}
AdditionalImages:
- {fileID: 2270891946058410284}
- {fileID: 4477794739276850993}
HealthBarGO: {fileID: 1619096850430010796} HealthBarGO: {fileID: 1619096850430010796}
HealthBar: {fileID: 1619096849984119124} HealthBar: {fileID: 1619096849984119124}
ShieldsBar: {fileID: 5040336344168261707} ShieldsBar: {fileID: 5040336344168261707}
@ -520,7 +532,7 @@ MonoBehaviour:
IsDraggable: 1 IsDraggable: 1
--- !u!95 &2103027038577876570 --- !u!95 &2103027038577876570
Animator: Animator:
serializedVersion: 3
serializedVersion: 4
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@ -533,6 +545,7 @@ Animator:
m_UpdateMode: 0 m_UpdateMode: 0
m_ApplyRootMotion: 0 m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0 m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage: m_WarningMessage:
m_HasTransformHierarchy: 1 m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1 m_AllowConstantClipSamplingOptimization: 1
@ -617,6 +630,7 @@ GameObject:
- component: {fileID: 1687732571317619596} - component: {fileID: 1687732571317619596}
- component: {fileID: 1687732571317619599} - component: {fileID: 1687732571317619599}
- component: {fileID: 1762255484671951402} - component: {fileID: 1762255484671951402}
- component: {fileID: 4691832230448927028}
m_Layer: 5 m_Layer: 5
m_Name: UnitSprite m_Name: UnitSprite
m_TagString: Untagged m_TagString: Untagged
@ -634,13 +648,14 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 1299465307853908425} - {fileID: 1299465307853908425}
m_Father: {fileID: 634451363950775190} m_Father: {fileID: 634451363950775190}
m_RootOrder: 0
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchorMin: {x: 0.0075426283, y: -0.07717377}
m_AnchorMax: {x: 0.9924574, y: 0.9077402}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
@ -695,6 +710,34 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_ShowMaskGraphic: 1 m_ShowMaskGraphic: 1
--- !u!114 &4691832230448927028
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1687732571317619585}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3}
m_Name:
m_EditorClassIdentifier:
size: 2.19
spread: 0.827
offsetAngle: 74.307144
offsetDistance: 0
offset: {x: 0, y: -0}
color: {r: 0, g: 0, b: 0, a: 0.89411765}
inset: 0
blendMode: 0
useCasterAlpha: 1
ignoreCasterColor: 0
colorBleedMode: 2
shadowAsSibling: 0
cutout: 0
baked: 0
modifiedFromInspector: 0
bakedShadows: []
--- !u!1 &2713061642984264109 --- !u!1 &2713061642984264109
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -723,6 +766,7 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1687732570946376589} m_Father: {fileID: 1687732570946376589}
m_RootOrder: 1 m_RootOrder: 1
@ -798,6 +842,7 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 618981756705671180} - {fileID: 618981756705671180}
- {fileID: 4495087916889732225} - {fileID: 4495087916889732225}
@ -819,7 +864,7 @@ CanvasRenderer:
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!95 &1422647275022463733 --- !u!95 &1422647275022463733
Animator: Animator:
serializedVersion: 3
serializedVersion: 4
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@ -832,10 +877,221 @@ Animator:
m_UpdateMode: 0 m_UpdateMode: 0
m_ApplyRootMotion: 0 m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0 m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage: m_WarningMessage:
m_HasTransformHierarchy: 1 m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1 m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0 m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &3235150457380999153
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 968728054296979172}
- component: {fileID: 7545719421541286325}
- component: {fileID: 4477794739276850993}
- component: {fileID: 5883761824999773318}
m_Layer: 5
m_Name: UnitSprite (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &968728054296979172
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3235150457380999153}
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: 634451363950775190}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: -0.15911601, y: 0.18360202}
m_AnchorMax: {x: 0.6840236, y: 1.0267407}
m_AnchoredPosition: {x: 0.1899414, y: -4.5740967}
m_SizeDelta: {x: -0.6741028, y: -0.67414093}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7545719421541286325
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3235150457380999153}
m_CullTransparentMesh: 0
--- !u!114 &4477794739276850993
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3235150457380999153}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.29803923}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &5883761824999773318
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3235150457380999153}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3}
m_Name:
m_EditorClassIdentifier:
size: 2.19
spread: 0.827
offsetAngle: 74.307144
offsetDistance: 0
offset: {x: 0, y: -0}
color: {r: 0, g: 0, b: 0, a: 1}
inset: 0
blendMode: 0
useCasterAlpha: 1
ignoreCasterColor: 0
colorBleedMode: 2
shadowAsSibling: 0
cutout: 0
baked: 0
modifiedFromInspector: 0
bakedShadows: []
--- !u!1 &3527442623986464800
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3613406984414568876}
- component: {fileID: 6439516263815035679}
- component: {fileID: 2270891946058410284}
- component: {fileID: 3683734377202395651}
m_Layer: 5
m_Name: UnitSprite (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &3613406984414568876
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3527442623986464800}
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: 634451363950775190}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.3159763, y: 0.18360202}
m_AnchorMax: {x: 1.1591159, y: 1.0267407}
m_AnchoredPosition: {x: -0.1899414, y: -4.5740967}
m_SizeDelta: {x: -0.6741028, y: -0.67414093}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6439516263815035679
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3527442623986464800}
m_CullTransparentMesh: 0
--- !u!114 &2270891946058410284
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3527442623986464800}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.29803923}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &3683734377202395651
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3527442623986464800}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3}
m_Name:
m_EditorClassIdentifier:
size: 2.19
spread: 0.827
offsetAngle: 74.307144
offsetDistance: 0
offset: {x: 0, y: -0}
color: {r: 0, g: 0, b: 0, a: 1}
inset: 0
blendMode: 0
useCasterAlpha: 1
ignoreCasterColor: 0
colorBleedMode: 2
shadowAsSibling: 0
cutout: 0
baked: 0
modifiedFromInspector: 0
bakedShadows: []
--- !u!1 &3676496466977087648 --- !u!1 &3676496466977087648
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -864,6 +1120,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: -0.061048605, w: 0.99813485} m_LocalRotation: {x: 0, y: 0, z: -0.061048605, w: 0.99813485}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1299465307853908425} m_Father: {fileID: 1299465307853908425}
m_RootOrder: 1 m_RootOrder: 1
@ -939,6 +1196,7 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1687732570946376589} m_Father: {fileID: 1687732570946376589}
m_RootOrder: 0 m_RootOrder: 0
@ -1014,6 +1272,7 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1619096850430010799} m_Father: {fileID: 1619096850430010799}
m_RootOrder: 2 m_RootOrder: 2
@ -1089,6 +1348,7 @@ RectTransform:
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: -1} m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1687732570946376589} m_Father: {fileID: 1687732570946376589}
m_RootOrder: 7 m_RootOrder: 7
@ -1164,6 +1424,7 @@ RectTransform:
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: -1} m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1687732570946376589} m_Father: {fileID: 1687732570946376589}
m_RootOrder: 8 m_RootOrder: 8
@ -1239,6 +1500,7 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1687732570946376589} m_Father: {fileID: 1687732570946376589}
m_RootOrder: 10 m_RootOrder: 10
@ -1314,6 +1576,7 @@ RectTransform:
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.05993837} m_LocalPosition: {x: 0, y: 0, z: -0.05993837}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1687732570946376589} m_Father: {fileID: 1687732570946376589}
m_RootOrder: 6 m_RootOrder: 6
@ -1389,6 +1652,7 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1687732570946376589} m_Father: {fileID: 1687732570946376589}
m_RootOrder: 3 m_RootOrder: 3
@ -1465,6 +1729,7 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 1687732570946376589} m_Father: {fileID: 1687732570946376589}
m_RootOrder: 9 m_RootOrder: 9
@ -1553,6 +1818,7 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 3841032389196704495} - {fileID: 3841032389196704495}
m_Father: {fileID: 1687732570946376589} m_Father: {fileID: 1687732570946376589}


+ 8
- 8
Assets/GWConquest/Scenes/GalaxyMap.unity View File

@ -31795,7 +31795,7 @@ PrefabInstance:
- target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, - target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3} type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 12.521121
value: 12
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, - target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3} type: 3}
@ -31916,7 +31916,7 @@ PrefabInstance:
- target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, - target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: -65.32112
value: -64.8
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5945601791339210574, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, - target: {fileID: 5945601791339210574, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3} type: 3}
@ -70929,7 +70929,7 @@ PrefabInstance:
- target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, - target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3} type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 12.521121
value: 12
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4096209424460686483, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, - target: {fileID: 4096209424460686483, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3} type: 3}
@ -70980,7 +70980,7 @@ PrefabInstance:
- target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, - target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 65.391235
value: 64.87012
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5945601791339210574, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, - target: {fileID: 5945601791339210574, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3} type: 3}
@ -114594,7 +114594,7 @@ PrefabInstance:
- target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, - target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3} type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 12.521121
value: 12
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, - target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3} type: 3}
@ -114720,7 +114720,7 @@ PrefabInstance:
- target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, - target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: -65.32112
value: -64.8
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5945601791339210574, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, - target: {fileID: 5945601791339210574, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3} type: 3}
@ -128152,7 +128152,7 @@ PrefabInstance:
- target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, - target: {fileID: 4096209424460686482, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3} type: 3}
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 12.521121
value: 12
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4096209424460686483, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, - target: {fileID: 4096209424460686483, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3} type: 3}
@ -128177,7 +128177,7 @@ PrefabInstance:
- target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, - target: {fileID: 4411086135142167815, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 65.391235
value: 64.87012
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5945601791339210574, guid: ada9ee8cb263a4e4ba2f5874cfe9098d, - target: {fileID: 5945601791339210574, guid: ada9ee8cb263a4e4ba2f5874cfe9098d,
type: 3} type: 3}


+ 11
- 0
Assets/GWConquest/Scripts/UI/BattleUnitIcon.cs View File

@ -9,6 +9,8 @@ namespace GWConquest {
public Image IconImage; public Image IconImage;
public Image[] AdditionalImages;
public GameObject HealthBarGO; public GameObject HealthBarGO;
public Image HealthBar; public Image HealthBar;
public Image ShieldsBar; public Image ShieldsBar;
@ -88,6 +90,11 @@ namespace GWConquest {
Unit.CurrentIcon = this; Unit.CurrentIcon = this;
IconImage.sprite = Unit.Class.Sprite; IconImage.sprite = Unit.Class.Sprite;
foreach(var img in AdditionalImages)
{
img.sprite = Unit.Class.Sprite;
img.gameObject.SetActive(true);
}
if(!DebugUI.ShowHiddenUnits && Unit.Player != Player.CurrentPlayer && Unit.RevealState == RevealState.ClassHidden) if(!DebugUI.ShowHiddenUnits && Unit.Player != Player.CurrentPlayer && Unit.RevealState == RevealState.ClassHidden)
{ {
GetComponent<Animator>().SetBool("Hidden", true); GetComponent<Animator>().SetBool("Hidden", true);
@ -105,6 +112,10 @@ namespace GWConquest {
else { else {
IconImage.sprite = null; IconImage.sprite = null;
IconImage.gameObject.SetActive(false); IconImage.gameObject.SetActive(false);
foreach(var img in AdditionalImages)
{
img.gameObject.SetActive(false);
}
} }
ImageTransform = IconImage.GetComponent<RectTransform>(); ImageTransform = IconImage.GetComponent<RectTransform>();


Loading…
Cancel
Save