diff --git a/Assets/GWConquest/Prefabs/FormationPanel.prefab b/Assets/GWConquest/Prefabs/FormationPanel.prefab
new file mode 100644
index 0000000..42fdf66
--- /dev/null
+++ b/Assets/GWConquest/Prefabs/FormationPanel.prefab
@@ -0,0 +1,132 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1708373284979538649
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1708373284979538650}
+ - component: {fileID: 1708373284979538652}
+ - component: {fileID: 1708373284979538651}
+ m_Layer: 5
+ m_Name: FormationTitle
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1708373284979538650
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1708373284979538649}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1708373286441865770}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 17}
+ m_Pivot: {x: 0, y: 1}
+--- !u!222 &1708373284979538652
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1708373284979538649}
+ m_CullTransparentMesh: 0
+--- !u!114 &1708373284979538651
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1708373284979538649}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 0.7882353}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3}
+ m_FontSize: 14
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 1
+ m_MaxSize: 112
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "Fleet 1\n\t"
+--- !u!1 &1708373286441865769
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1708373286441865770}
+ - component: {fileID: 2074407632541709644}
+ m_Layer: 5
+ m_Name: FormationPanel
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1708373286441865770
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1708373286441865769}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 1708373284979538650}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 17}
+ m_Pivot: {x: 0.5, y: 1}
+--- !u!114 &2074407632541709644
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1708373286441865769}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 1c0e43d1dc685d84e91c202da724b6d3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ FormationNameText: {fileID: 1708373284979538651}
+ UnitPanelPrefab: {fileID: 4461107318606652521, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ UnitPanelHeight: 17
diff --git a/Assets/GWConquest/Prefabs/FormationPanel.prefab.meta b/Assets/GWConquest/Prefabs/FormationPanel.prefab.meta
new file mode 100644
index 0000000..00d8698
--- /dev/null
+++ b/Assets/GWConquest/Prefabs/FormationPanel.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a6a199668f204da4980f4edf1c2f4fea
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/GWConquest/Prefabs/GuiPanel.prefab b/Assets/GWConquest/Prefabs/GuiPanel.prefab
new file mode 100644
index 0000000..a2fcc17
--- /dev/null
+++ b/Assets/GWConquest/Prefabs/GuiPanel.prefab
@@ -0,0 +1,149 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3709556431398436641
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7870129596896663125}
+ - component: {fileID: 5413735710222757955}
+ - component: {fileID: 6066937026882375993}
+ m_Layer: 5
+ m_Name: GuiPanel
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7870129596896663125
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3709556431398436641}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 7169136399962620445}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ 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: 0, y: 0}
+ m_SizeDelta: {x: 150, y: 150}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5413735710222757955
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3709556431398436641}
+ m_CullTransparentMesh: 0
+--- !u!114 &6066937026882375993
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3709556431398436641}
+ 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: 0, g: 0, b: 0, a: 0.8784314}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1.8
+--- !u!1 &4108209800669813447
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 7169136399962620445}
+ - component: {fileID: 5899782003992863072}
+ - component: {fileID: 7264797158076383403}
+ m_Layer: 5
+ m_Name: Border
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &7169136399962620445
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4108209800669813447}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 7870129596896663125}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5899782003992863072
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4108209800669813447}
+ m_CullTransparentMesh: 0
+--- !u!114 &7264797158076383403
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4108209800669813447}
+ 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.5529412}
+ m_RaycastTarget: 0
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+ m_Type: 1
+ m_PreserveAspect: 0
+ m_FillCenter: 0
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 2
diff --git a/Assets/GWConquest/Prefabs/GuiPanel.prefab.meta b/Assets/GWConquest/Prefabs/GuiPanel.prefab.meta
new file mode 100644
index 0000000..85fdd33
--- /dev/null
+++ b/Assets/GWConquest/Prefabs/GuiPanel.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8b0edf9c7ac699a4da4b06f9b352ff47
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/GWConquest/Prefabs/UnitPanel.prefab b/Assets/GWConquest/Prefabs/UnitPanel.prefab
new file mode 100644
index 0000000..0e3b9ff
--- /dev/null
+++ b/Assets/GWConquest/Prefabs/UnitPanel.prefab
@@ -0,0 +1,276 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4461107317180991733
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4461107317180991734}
+ - component: {fileID: 4461107317180991728}
+ - component: {fileID: 4461107317180991735}
+ m_Layer: 5
+ m_Name: Count
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4461107317180991734
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4461107317180991733}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 4461107318606652522}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 19, y: 0}
+ m_Pivot: {x: 1, y: 1}
+--- !u!222 &4461107317180991728
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4461107317180991733}
+ m_CullTransparentMesh: 0
+--- !u!114 &4461107317180991735
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4461107317180991733}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 0.7882353}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3}
+ m_FontSize: 12
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 1
+ m_MaxSize: 112
+ m_Alignment: 2
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "x13\n\n\t"
+--- !u!1 &4461107317294241808
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4461107317294241809}
+ - component: {fileID: 4461107317294241811}
+ - component: {fileID: 4461107317294241810}
+ m_Layer: 5
+ m_Name: Name
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4461107317294241809
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4461107317294241808}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 4461107318606652522}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 19, y: 0}
+ m_SizeDelta: {x: -38, y: 0}
+ m_Pivot: {x: 0, y: 1}
+--- !u!222 &4461107317294241811
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4461107317294241808}
+ m_CullTransparentMesh: 0
+--- !u!114 &4461107317294241810
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4461107317294241808}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 0.7882353}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3}
+ m_FontSize: 12
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 1
+ m_MaxSize: 112
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "Fighter Squadron\n\n\t"
+--- !u!1 &4461107317436715333
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4461107317436715334}
+ - component: {fileID: 4461107317436715328}
+ - component: {fileID: 4461107317436715335}
+ m_Layer: 5
+ m_Name: Icon
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4461107317436715334
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4461107317436715333}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 4461107318606652522}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 17, y: 0}
+ m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &4461107317436715328
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4461107317436715333}
+ m_CullTransparentMesh: 0
+--- !u!114 &4461107317436715335
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4461107317436715333}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 52e22bcf1988b2b4da1b4da2ffba5c9d, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4461107318606652521
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4461107318606652522}
+ - component: {fileID: 4461107318606652523}
+ m_Layer: 5
+ m_Name: UnitPanel
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4461107318606652522
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4461107318606652521}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 4461107317294241809}
+ - {fileID: 4461107317436715334}
+ - {fileID: 4461107317180991734}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: -17}
+ m_SizeDelta: {x: 0, y: 17}
+ m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &4461107318606652523
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4461107318606652521}
+ m_CullTransparentMesh: 0
diff --git a/Assets/GWConquest/Prefabs/UnitPanel.prefab.meta b/Assets/GWConquest/Prefabs/UnitPanel.prefab.meta
new file mode 100644
index 0000000..4498d08
--- /dev/null
+++ b/Assets/GWConquest/Prefabs/UnitPanel.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 94778366cfbff894aafdef5ec6b24d19
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity
index ee50f39..2404239 100644
--- a/Assets/GWConquest/Scenes/GalaxyMap.unity
+++ b/Assets/GWConquest/Scenes/GalaxyMap.unity
@@ -294,7 +294,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 116
+ value: 115
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -535,6 +535,27 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9301248}
m_CullTransparentMesh: 0
+--- !u!1 &18126404 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ m_PrefabInstance: {fileID: 364491334}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &18126405
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 18126404}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5d18c4f05f567d740a67f00ca1311ebb, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ FormationUIPrefab: {fileID: 1708373286441865769, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ FormationParent: {fileID: 2078559588}
--- !u!1001 &20024162
PrefabInstance:
m_ObjectHideFlags: 0
@@ -615,7 +636,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 95
+ value: 94
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -1712,7 +1733,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 74
+ value: 73
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -2221,7 +2242,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 89
+ value: 88
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -3270,7 +3291,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 111
+ value: 109
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -3375,7 +3396,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 108
+ value: 106
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -3425,79 +3446,6 @@ MonoBehaviour:
sign: -1
drawCircle: 0
circle: {fileID: 2800000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3}
---- !u!1 &121290817
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 121290818}
- - component: {fileID: 121290820}
- - component: {fileID: 121290819}
- m_Layer: 5
- m_Name: Border
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &121290818
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 121290817}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1721390053}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &121290819
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 121290817}
- 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.5529412}
- m_RaycastTarget: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 0
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 2
---- !u!222 &121290820
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 121290817}
- m_CullTransparentMesh: 0
--- !u!1 &125481610
GameObject:
m_ObjectHideFlags: 0
@@ -3558,6 +3506,141 @@ MonoBehaviour:
sign: -1
drawCircle: 0
circle: {fileID: 2800000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3}
+--- !u!1001 &140575598
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 2116474895}
+ m_Modifications:
+ - target: {fileID: 1708373286441865769, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_Name
+ value: FormationPanel
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865769, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 51
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 2074407632541709644, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ propertyPath: UnitPanelHeight
+ value: 17
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: a6a199668f204da4980f4edf1c2f4fea, type: 3}
+--- !u!224 &140575599 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 1708373286441865770, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ m_PrefabInstance: {fileID: 140575598}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &153502806
GameObject:
m_ObjectHideFlags: 0
@@ -4198,7 +4281,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 83
+ value: 82
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -4618,7 +4701,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 112
+ value: 111
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -5618,7 +5701,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 76
+ value: 75
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -5786,79 +5869,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &284240303
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 284240304}
- - component: {fileID: 284240306}
- - component: {fileID: 284240305}
- m_Layer: 5
- m_Name: Border
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &284240304
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 284240303}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1664006269}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &284240305
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 284240303}
- 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.5529412}
- m_RaycastTarget: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 0
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 2
---- !u!222 &284240306
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 284240303}
- m_CullTransparentMesh: 0
--- !u!1001 &286802685
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5939,7 +5949,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 105
+ value: 103
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -6838,7 +6848,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 62
+ value: 61
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -6917,7 +6927,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1517137663}
+ m_Father: {fileID: 3373509298190984196}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -6990,8 +7000,8 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1664006269}
- m_RootOrder: 6
+ m_Father: {fileID: 1002982022}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90.00001}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -7208,7 +7218,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 657809897}
- m_RootOrder: 6
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@@ -7385,7 +7395,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 94
+ value: 93
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -7588,7 +7598,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 99
+ value: 98
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -7766,7 +7776,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 61
+ value: 60
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -7934,6 +7944,136 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1001 &364491334
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 657809897}
+ m_Modifications:
+ - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_Name
+ value: EnemyFleetPanel
+ objectReference: {fileID: 0}
+ - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 7
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 300
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 50
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 160
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 320
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3}
+--- !u!224 &364491336 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ m_PrefabInstance: {fileID: 364491334}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &367665710
GameObject:
m_ObjectHideFlags: 0
@@ -8368,7 +8508,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 92
+ value: 91
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -8393,79 +8533,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 382071276}
m_PrefabAsset: {fileID: 0}
---- !u!1 &385889961
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 385889962}
- - component: {fileID: 385889964}
- - component: {fileID: 385889963}
- m_Layer: 5
- m_Name: Image (3)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &385889962
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 385889961}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1664006269}
- m_RootOrder: 5
- 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: -42.499992, y: 55.699997}
- m_SizeDelta: {x: 16, y: 16}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &385889963
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 385889961}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: ae548785829024145b06993a6c449a28, type: 3}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &385889964
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 385889961}
- m_CullTransparentMesh: 0
--- !u!1001 &390578860
PrefabInstance:
m_ObjectHideFlags: 0
@@ -8714,7 +8781,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 85
+ value: 84
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -9185,7 +9252,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 97
+ value: 96
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -9457,7 +9524,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 657809897}
- m_RootOrder: 7
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@@ -9634,7 +9701,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 59
+ value: 58
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -9844,7 +9911,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 86
+ value: 85
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -10115,7 +10182,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 81
+ value: 80
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -10220,7 +10287,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 56
+ value: 55
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -10455,7 +10522,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 102
+ value: 101
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -10560,7 +10627,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 113
+ value: 112
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -12108,7 +12175,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 114
+ value: 113
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -12213,7 +12280,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 77
+ value: 76
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -12659,7 +12726,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 68
+ value: 67
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -13059,7 +13126,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 45
+ value: 44
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -13494,7 +13561,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 88
+ value: 87
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -13599,7 +13666,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 91
+ value: 90
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -14508,14 +14575,14 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- - {fileID: 1517137663}
- - {fileID: 2121636957}
+ - {fileID: 3373509298190984196}
+ - {fileID: 1847976299}
- {fileID: 367665711}
- - {fileID: 1664006269}
- - {fileID: 1721390053}
- {fileID: 1623103718}
- {fileID: 349347007}
- {fileID: 411538224}
+ - {fileID: 1002982022}
+ - {fileID: 364491336}
m_Father: {fileID: 494226835}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -14537,8 +14604,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
PlanetNameText: {fileID: 817441368}
- PlayerFleetPanel: {fileID: 1664006268}
- EnemyFleetPlanel: {fileID: 1721390052}
+ PlayerFleetPanel: {fileID: 1002982021}
+ EnemyFleetPanel: {fileID: 18126404}
+ PlayerStrengthBar: {fileID: 2088730627}
+ EnemyStrengthBar: {fileID: 337027206}
+ StrengthBarParts: 15
+ MaxFormationStrength: 100
PlanetSelection: {fileID: 1798411514}
--- !u!1 &663080992
GameObject:
@@ -15229,7 +15300,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 106
+ value: 104
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -15532,7 +15603,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 47
+ value: 46
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -15637,7 +15708,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 46
+ value: 45
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -15915,7 +15986,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 110
+ value: 108
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -16045,6 +16116,125 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 703871101}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &707804163
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 140575599}
+ m_Modifications:
+ - target: {fileID: 4461107318606652521, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_Name
+ value: UnitPanel
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -17
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 17
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 94778366cfbff894aafdef5ec6b24d19, type: 3}
--- !u!1001 &708461427
PrefabInstance:
m_ObjectHideFlags: 0
@@ -16125,7 +16315,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 87
+ value: 86
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -16255,7 +16445,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 66
+ value: 65
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -16591,79 +16781,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &734201681
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 734201682}
- - component: {fileID: 734201684}
- - component: {fileID: 734201683}
- m_Layer: 5
- m_Name: Image
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &734201682
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 734201681}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1664006269}
- m_RootOrder: 2
- 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: -58.6, y: 111.4}
- m_SizeDelta: {x: 16, y: 16}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &734201683
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 734201681}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: a725f0b3a4d26a945a5b8ccbcffef516, type: 3}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &734201684
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 734201681}
- m_CullTransparentMesh: 0
--- !u!1001 &736557149
PrefabInstance:
m_ObjectHideFlags: 0
@@ -17388,7 +17505,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 50
+ value: 49
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -17666,7 +17783,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 101
+ value: 100
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -18613,7 +18730,6 @@ Transform:
- {fileID: 932981218}
- {fileID: 22509609}
- {fileID: 326020192}
- - {fileID: 1765599134}
- {fileID: 1580433177}
- {fileID: 575247647}
- {fileID: 695531157}
@@ -18679,9 +18795,9 @@ Transform:
- {fileID: 1150859385}
- {fileID: 102187272}
- {fileID: 1477877797}
- - {fileID: 909849837}
- {fileID: 701680360}
- {fileID: 99114496}
+ - {fileID: 909849837}
- {fileID: 204525060}
- {fileID: 461822467}
- {fileID: 528383328}
@@ -19174,7 +19290,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 69
+ value: 68
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -20983,7 +21099,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 54
+ value: 53
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -21485,7 +21601,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 57
+ value: 56
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -22096,6 +22212,157 @@ RectTransform:
m_AnchoredPosition: {x: 88, y: -37}
m_SizeDelta: {x: 500, y: 500}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1001 &1002982020
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 657809897}
+ m_Modifications:
+ - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_Name
+ value: PlayerFleetPanel
+ objectReference: {fileID: 0}
+ - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 6
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -300
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 50
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 160
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 320
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3}
+--- !u!1 &1002982021 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ m_PrefabInstance: {fileID: 1002982020}
+ m_PrefabAsset: {fileID: 0}
+--- !u!224 &1002982022 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ m_PrefabInstance: {fileID: 1002982020}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1002982023
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1002982021}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5d18c4f05f567d740a67f00ca1311ebb, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ FormationUIPrefab: {fileID: 1708373286441865769, guid: a6a199668f204da4980f4edf1c2f4fea,
+ type: 3}
+ FormationParent: {fileID: 2116474894}
--- !u!1001 &1003745661
PrefabInstance:
m_ObjectHideFlags: 0
@@ -22349,7 +22616,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 84
+ value: 83
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -23001,79 +23268,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1037385797}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1 &1053329233
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1053329234}
- - component: {fileID: 1053329236}
- - component: {fileID: 1053329235}
- m_Layer: 5
- m_Name: Image (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1053329234
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1053329233}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1664006269}
- 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: -58.6, y: 124.3}
- m_SizeDelta: {x: 16, y: 16}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1053329235
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1053329233}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 52e22bcf1988b2b4da1b4da2ffba5c9d, type: 3}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &1053329236
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1053329233}
- m_CullTransparentMesh: 0
--- !u!1 &1053591719
GameObject:
m_ObjectHideFlags: 0
@@ -23506,7 +23700,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 65
+ value: 64
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -23995,7 +24189,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 48
+ value: 47
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -24100,7 +24294,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 53
+ value: 52
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -25347,7 +25541,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 67
+ value: 66
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -26028,7 +26222,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 107
+ value: 105
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -26469,79 +26663,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &1197403819
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1197403820}
- - component: {fileID: 1197403822}
- - component: {fileID: 1197403821}
- m_Layer: 5
- m_Name: Image (2)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1197403820
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1197403819}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1664006269}
- m_RootOrder: 4
- 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: -42.5, y: 68.9}
- m_SizeDelta: {x: 16, y: 16}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1197403821
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1197403819}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 786a3ea2d13439a4ca7336fb1bbfb695, type: 3}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1
---- !u!222 &1197403822
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1197403819}
- m_CullTransparentMesh: 0
--- !u!1 &1209616464
GameObject:
m_ObjectHideFlags: 0
@@ -27024,7 +27145,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 78
+ value: 77
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -27222,7 +27343,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 71
+ value: 70
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -27996,7 +28117,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 58
+ value: 57
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -28299,7 +28420,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 96
+ value: 95
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -28850,7 +28971,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 55
+ value: 54
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -29857,7 +29978,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 80
+ value: 79
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -30130,7 +30251,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 109
+ value: 107
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -30544,7 +30665,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 79
+ value: 78
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -30754,7 +30875,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 75
+ value: 74
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -30779,81 +30900,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1508465622}
m_PrefabAsset: {fileID: 0}
---- !u!1 &1517137662
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1517137663}
- - component: {fileID: 1517137665}
- - component: {fileID: 1517137664}
- m_Layer: 5
- m_Name: EnemyStrengthBarPanel
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1517137663
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1517137662}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 1809064133}
- - {fileID: 337027205}
- m_Father: {fileID: 657809897}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0}
- m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 300, y: 15}
- m_SizeDelta: {x: 160, y: 30}
- m_Pivot: {x: 0.5, y: 0}
---- !u!114 &1517137664
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1517137662}
- 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: 0, g: 0, b: 0, a: 0.8784314}
- m_RaycastTarget: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1.8
---- !u!222 &1517137665
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1517137662}
- m_CullTransparentMesh: 0
--- !u!1001 &1517273784
PrefabInstance:
m_ObjectHideFlags: 0
@@ -30934,7 +30980,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 52
+ value: 51
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -31571,7 +31617,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 100
+ value: 99
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -31676,7 +31722,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 64
+ value: 63
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -32052,7 +32098,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 44
+ value: 43
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -32486,7 +32532,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 115
+ value: 114
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -32913,7 +32959,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 657809897}
- m_RootOrder: 5
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
@@ -33090,7 +33136,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 93
+ value: 92
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -33383,87 +33429,6 @@ MonoBehaviour:
sign: -1
drawCircle: 0
circle: {fileID: 2800000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3}
---- !u!1 &1664006268
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1664006269}
- - component: {fileID: 1664006271}
- - component: {fileID: 1664006270}
- m_Layer: 5
- m_Name: PlayerFleetPanel
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &1664006269
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1664006268}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 284240304}
- - {fileID: 2066930237}
- - {fileID: 734201682}
- - {fileID: 1053329234}
- - {fileID: 1197403820}
- - {fileID: 385889962}
- - {fileID: 338855353}
- - {fileID: 1698295841}
- m_Father: {fileID: 657809897}
- m_RootOrder: 3
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0}
- m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: -300, y: 50}
- m_SizeDelta: {x: 160, y: 320}
- m_Pivot: {x: 0.5, y: 0}
---- !u!114 &1664006270
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1664006268}
- 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: 0, g: 0, b: 0, a: 0.8784314}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1.8
---- !u!222 &1664006271
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1664006268}
- m_CullTransparentMesh: 0
--- !u!1001 &1665094428
PrefabInstance:
m_ObjectHideFlags: 0
@@ -34111,12 +34076,12 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1698295840}
- 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: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 1664006269}
- m_RootOrder: 7
+ m_Father: {fileID: 1002982022}
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -34552,7 +34517,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 103
+ value: 102
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -34602,80 +34567,6 @@ MonoBehaviour:
sign: -1
drawCircle: 0
circle: {fileID: 2800000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3}
---- !u!1 &1721390052
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1721390053}
- - component: {fileID: 1721390055}
- - component: {fileID: 1721390054}
- m_Layer: 5
- m_Name: EnemyFleetPanel
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &1721390053
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1721390052}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 121290818}
- m_Father: {fileID: 657809897}
- m_RootOrder: 4
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0}
- m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 300, y: 50}
- m_SizeDelta: {x: 160, y: 320}
- m_Pivot: {x: 0.5, y: 0}
---- !u!114 &1721390054
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1721390052}
- 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: 0, g: 0, b: 0, a: 0.8784314}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1.8
---- !u!222 &1721390055
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1721390052}
- m_CullTransparentMesh: 0
--- !u!1001 &1722574099
PrefabInstance:
m_ObjectHideFlags: 0
@@ -35122,7 +35013,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 49
+ value: 48
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -35172,86 +35063,125 @@ MonoBehaviour:
sign: -1
drawCircle: 0
circle: {fileID: 2800000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3}
---- !u!1001 &1765599133
+--- !u!1001 &1766182746
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
- m_TransformParent: {fileID: 850140851}
+ m_TransformParent: {fileID: 140575599}
m_Modifications:
- - target: {fileID: 526244009083771565, guid: d65f827586fd5c04e9caf7f4ff7338e6,
- type: 3}
- propertyPath: planet1
- value:
- objectReference: {fileID: 1363409545}
- - target: {fileID: 5208040857522702120, guid: d65f827586fd5c04e9caf7f4ff7338e6,
+ - target: {fileID: 4461107318606652521, guid: 94778366cfbff894aafdef5ec6b24d19,
type: 3}
propertyPath: m_Name
- value: PlanetConnection
+ value: UnitPanel (1)
objectReference: {fileID: 0}
- - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
type: 3}
propertyPath: m_RootOrder
- value: 43
+ value: 2
objectReference: {fileID: 0}
- - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -34
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 17
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4461107318606652522, guid: 94778366cfbff894aafdef5ec6b24d19,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: d65f827586fd5c04e9caf7f4ff7338e6, type: 3}
---- !u!4 &1765599134 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
- type: 3}
- m_PrefabInstance: {fileID: 1765599133}
- m_PrefabAsset: {fileID: 0}
+ m_SourcePrefab: {fileID: 100100000, guid: 94778366cfbff894aafdef5ec6b24d19, type: 3}
--- !u!1001 &1766312938
PrefabInstance:
m_ObjectHideFlags: 0
@@ -35858,7 +35788,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 90
+ value: 89
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -35934,134 +35864,6 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
---- !u!1 &1809064132
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1809064133}
- - component: {fileID: 1809064135}
- - component: {fileID: 1809064134}
- - component: {fileID: 1809064136}
- m_Layer: 5
- m_Name: Border
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1809064133
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1809064132}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1517137663}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1809064134
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1809064132}
- 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.5529412}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 0
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 2
---- !u!222 &1809064135
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1809064132}
- m_CullTransparentMesh: 0
---- !u!114 &1809064136
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1809064132}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 1
- m_Colors:
- m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
- m_HighlightedColor: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 0.7294118}
- m_PressedColor: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1}
- m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_SelectedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_SelectedTrigger: Selected
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 1809064134}
- m_OnClick:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 657809898}
- m_MethodName: ShowEnemyFleetPanel
- m_Mode: 1
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
--- !u!1001 &1809759629
PrefabInstance:
m_ObjectHideFlags: 0
@@ -36373,79 +36175,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &1814479410
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1814479411}
- - component: {fileID: 1814479413}
- - component: {fileID: 1814479412}
- m_Layer: 5
- m_Name: Border
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1814479411
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1814479410}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 2121636957}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 0, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1814479412
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1814479410}
- 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.5529412}
- m_RaycastTarget: 0
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 0
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 2
---- !u!222 &1814479413
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1814479410}
- m_CullTransparentMesh: 0
--- !u!1001 &1821819292
PrefabInstance:
m_ObjectHideFlags: 0
@@ -36669,7 +36398,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 82
+ value: 81
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -37135,6 +36864,218 @@ MonoBehaviour:
sign: -1
drawCircle: 0
circle: {fileID: 2800000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3}
+--- !u!1001 &1847976298
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 657809897}
+ m_Modifications:
+ - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_Name
+ value: PlayerStrengthBarPanel
+ objectReference: {fileID: 0}
+ - target: {fileID: 6066937026882375993, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_Color.r
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6066937026882375993, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_Color.g
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6066937026882375993, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_Color.b
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: -300
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 15
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 160
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 30
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3}
+--- !u!224 &1847976299 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ m_PrefabInstance: {fileID: 1847976298}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &1847976300 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ m_PrefabInstance: {fileID: 1847976298}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1847976301 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 6066937026882375993, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ m_PrefabInstance: {fileID: 1847976298}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1847976300}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &1847976302
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1847976300}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 0, g: 0, b: 0, a: 1}
+ m_HighlightedColor: {r: 0.07, g: 0.07, b: 0.07, a: 1}
+ m_PressedColor: {r: 0.07058824, g: 0.07058824, b: 0.07058824, a: 1}
+ m_SelectedColor: {r: 0.07058824, g: 0.07058824, b: 0.07058824, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 1847976301}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 657809898}
+ m_MethodName: ShowPlayerFleetPanel
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
--- !u!1 &1849002053
GameObject:
m_ObjectHideFlags: 0
@@ -38485,7 +38426,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 70
+ value: 69
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -38935,7 +38876,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 51
+ value: 50
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -39040,7 +38981,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 60
+ value: 59
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -41477,85 +41418,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2052893629}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1 &2066930236
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 2066930237}
- - component: {fileID: 2066930239}
- - component: {fileID: 2066930238}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &2066930237
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2066930236}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 1664006269}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: -20, y: -20}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &2066930238
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2066930236}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 0.7882353}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_FontData:
- m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3}
- m_FontSize: 12
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 1
- m_MaxSize: 112
- m_Alignment: 0
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text: "Fleet 1\n\t\tFighter Squadron x3\n\t\tFrigate Squadron
- x3\n\t\tmore\n\t\tTransport:\n\t\t\t Infantry Platoon x2\n\t\t\t
- Tank Division x1\n\t"
---- !u!222 &2066930239
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2066930236}
- m_CullTransparentMesh: 0
--- !u!1 &2072143107
GameObject:
m_ObjectHideFlags: 0
@@ -41709,7 +41571,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 63
+ value: 62
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -41902,6 +41764,41 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!1 &2078559588
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2078559589}
+ m_Layer: 5
+ m_Name: TextPanel
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2078559589
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2078559588}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 364491336}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: -20, y: -20}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &2087330812
GameObject:
m_ObjectHideFlags: 0
@@ -42024,7 +41921,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 2121636957}
+ m_Father: {fileID: 1847976299}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -42390,7 +42287,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 73
+ value: 72
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -43013,7 +42910,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 98
+ value: 97
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -43038,6 +42935,42 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2112479743}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &2116474894
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2116474895}
+ m_Layer: 5
+ m_Name: TextPanel
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &2116474895
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2116474894}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 140575599}
+ m_Father: {fileID: 1002982022}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: -20, y: -20}
+ m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &2118327520
PrefabInstance:
m_ObjectHideFlags: 0
@@ -43181,136 +43114,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!1 &2121636956
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 2121636957}
- - component: {fileID: 2121636959}
- - component: {fileID: 2121636958}
- - component: {fileID: 2121636960}
- m_Layer: 5
- m_Name: PlayerStrengthBarPanel
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &2121636957
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2121636956}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children:
- - {fileID: 1814479411}
- - {fileID: 2088730626}
- m_Father: {fileID: 657809897}
- m_RootOrder: 1
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0}
- m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: -300, y: 15}
- m_SizeDelta: {x: 160, y: 30}
- m_Pivot: {x: 0.5, y: 0}
---- !u!114 &2121636958
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2121636956}
- 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.8784314}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
- m_UseSpriteMesh: 0
- m_PixelsPerUnitMultiplier: 1.8
---- !u!222 &2121636959
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2121636956}
- m_CullTransparentMesh: 0
---- !u!114 &2121636960
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2121636956}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Navigation:
- m_Mode: 3
- m_SelectOnUp: {fileID: 0}
- m_SelectOnDown: {fileID: 0}
- m_SelectOnLeft: {fileID: 0}
- m_SelectOnRight: {fileID: 0}
- m_Transition: 1
- m_Colors:
- m_NormalColor: {r: 0, g: 0, b: 0, a: 1}
- m_HighlightedColor: {r: 0.07, g: 0.07, b: 0.07, a: 1}
- m_PressedColor: {r: 0.07058824, g: 0.07058824, b: 0.07058824, a: 1}
- m_SelectedColor: {r: 0.07058824, g: 0.07058824, b: 0.07058824, a: 1}
- m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
- m_ColorMultiplier: 1
- m_FadeDuration: 0.1
- m_SpriteState:
- m_HighlightedSprite: {fileID: 0}
- m_PressedSprite: {fileID: 0}
- m_SelectedSprite: {fileID: 0}
- m_DisabledSprite: {fileID: 0}
- m_AnimationTriggers:
- m_NormalTrigger: Normal
- m_HighlightedTrigger: Highlighted
- m_PressedTrigger: Pressed
- m_SelectedTrigger: Selected
- m_DisabledTrigger: Disabled
- m_Interactable: 1
- m_TargetGraphic: {fileID: 2121636958}
- m_OnClick:
- m_PersistentCalls:
- m_Calls:
- - m_Target: {fileID: 657809898}
- m_MethodName: ShowPlayerFleetPanel
- m_Mode: 1
- m_Arguments:
- m_ObjectArgument: {fileID: 0}
- m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
- m_IntArgument: 0
- m_FloatArgument: 0
- m_StringArgument:
- m_BoolArgument: 0
- m_CallState: 2
--- !u!1 &2127353493
GameObject:
m_ObjectHideFlags: 0
@@ -43509,7 +43312,7 @@ PrefabInstance:
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
propertyPath: m_RootOrder
- value: 72
+ value: 71
objectReference: {fileID: 0}
- target: {fileID: 5208040857522702122, guid: d65f827586fd5c04e9caf7f4ff7338e6,
type: 3}
@@ -43534,3 +43337,205 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 2140711667}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &3373509298190984195
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 657809897}
+ m_Modifications:
+ - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_Name
+ value: EnemyStrengthBarPanel
+ objectReference: {fileID: 0}
+ - target: {fileID: 7264797158076383403, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_RaycastTarget
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 300
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 15
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 160
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 30
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ propertyPath: m_Pivot.y
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3}
+--- !u!224 &3373509298190984196 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ m_PrefabInstance: {fileID: 3373509298190984195}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &3373509298190984197 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 4108209800669813447, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ m_PrefabInstance: {fileID: 3373509298190984195}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &3373509298190984198 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 7264797158076383403, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+ type: 3}
+ m_PrefabInstance: {fileID: 3373509298190984195}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3373509298190984197}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!114 &3373509298190984199
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3373509298190984197}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 0.7294118}
+ m_PressedColor: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Selected
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 3373509298190984198}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 657809898}
+ m_MethodName: ShowEnemyFleetPanel
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
diff --git a/Assets/GWConquest/Scripts/Editor/PlanetEditor.cs b/Assets/GWConquest/Scripts/Editor/PlanetEditor.cs
index ad49425..ae20331 100644
--- a/Assets/GWConquest/Scripts/Editor/PlanetEditor.cs
+++ b/Assets/GWConquest/Scripts/Editor/PlanetEditor.cs
@@ -27,6 +27,7 @@ namespace GWConquest
EditorGUILayout.BeginHorizontal();
if (GUILayout.Button("X", GUILayout.Width(20)))
{
+ Undo.RecordObject(conn.gameObject, "Delete planet connection");
DestroyImmediate(conn.gameObject);
}
if (conn.planet1 != planet)
diff --git a/Assets/GWConquest/Scripts/EntityList.cs b/Assets/GWConquest/Scripts/EntityList.cs
index 1f775eb..e2348e3 100644
--- a/Assets/GWConquest/Scripts/EntityList.cs
+++ b/Assets/GWConquest/Scripts/EntityList.cs
@@ -74,7 +74,7 @@ namespace GWConquest
public IEnumerator GetEnumerator()
{
- return Token.Entities.GetEnumerator() as IEnumerator;
+ return new GenericListEnumerator(this);
}
public int IndexOf(BoltEntity item)
@@ -109,7 +109,35 @@ namespace GWConquest
IEnumerator IEnumerable.GetEnumerator()
{
- return Token.Entities.GetEnumerator();
+ return new GenericListEnumerator(this);
+ }
+ }
+
+ public class GenericListEnumerator : IEnumerator
+ {
+ private int position = -1;
+ private IList list;
+
+ public GenericListEnumerator(IList _list)
+ {
+ list = _list;
+ }
+
+ public T Current => list[position];
+
+ object IEnumerator.Current => list[position];
+
+ public void Dispose() { }
+
+ public bool MoveNext()
+ {
+ position++;
+ return position < list.Count;
+ }
+
+ public void Reset()
+ {
+ position = -1;
}
}
diff --git a/Assets/GWConquest/Scripts/FleetPanelUI.cs b/Assets/GWConquest/Scripts/FleetPanelUI.cs
new file mode 100644
index 0000000..9180d26
--- /dev/null
+++ b/Assets/GWConquest/Scripts/FleetPanelUI.cs
@@ -0,0 +1,54 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace GWConquest
+{
+ public class FleetPanelUI : MonoBehaviour
+ {
+ public GameObject FormationUIPrefab;
+ public GameObject FormationParent;
+
+ private Formation[] formations;
+ private List formationUIList = new List();
+
+ public void SetFormations(Formation[] fs)
+ {
+ formations = fs;
+ UpdateUI();
+ }
+
+ private void OnDisable()
+ {
+ formations = null;
+ }
+
+ public void UpdateUI()
+ {
+ foreach(FormationUI ui in formationUIList)
+ {
+ Destroy(ui.gameObject);
+ }
+ formationUIList.Clear();
+
+ if(formations != null && formations.Length > 0)
+ {
+ float yPos = 0;
+ for (int i = 0; i < formations.Length; i++)
+ {
+ GameObject go = Instantiate(FormationUIPrefab.gameObject);
+ RectTransform rt = go.GetComponent();
+ rt.SetParent(FormationParent.transform, false);
+ rt.anchoredPosition = new Vector2(0, yPos);
+
+ FormationUI ui = go.GetComponent();
+ ui.FormationNameText.text = "Fleet " + (i + 1);
+ ui.SetFormation(formations[i]);
+ formationUIList.Add(ui);
+
+ yPos += rt.sizeDelta.y;
+ }
+ }
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/GWConquest/Scripts/FleetPanelUI.cs.meta b/Assets/GWConquest/Scripts/FleetPanelUI.cs.meta
new file mode 100644
index 0000000..c6a4a29
--- /dev/null
+++ b/Assets/GWConquest/Scripts/FleetPanelUI.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5d18c4f05f567d740a67f00ca1311ebb
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/GWConquest/Scripts/Formation.cs b/Assets/GWConquest/Scripts/Formation.cs
index 1470eb8..d9489bc 100644
--- a/Assets/GWConquest/Scripts/Formation.cs
+++ b/Assets/GWConquest/Scripts/Formation.cs
@@ -1,5 +1,6 @@
using UnityEngine;
using System.Linq;
+using System;
namespace GWConquest
{
@@ -54,7 +55,12 @@ namespace GWConquest
private float animDistanceCovered = 0;
- public EntityList Units;
+ public EntityList UnitEntities;
+
+ public Unit[] Units
+ {
+ get => Array.ConvertAll(UnitEntities.ToArray(), e => e.GetComponent());
+ }
public GameObject unitIcon;
@@ -181,7 +187,7 @@ namespace GWConquest
public override void Attached()
{
BoltLog.Info("Formation attached: {0}", this);
- Units = new EntityList(state, "Units");
+ UnitEntities = new EntityList(state, "Units");
if(entity.IsOwner)
{
@@ -193,16 +199,24 @@ namespace GWConquest
state.AddCallback("IsInTransit", OnTransitBegun);
state.AddCallback("CurrentZone", OnZoneChanged);
+
}
public float GetFormationStrength()
{
- BoltLog.Info("Getting formation strength for {0}", Units);
- return Units.Sum(unit => {
- BoltLog.Info("processing unit {0}", unit);
- return 1f;
- });
+ return UnitEntities.Sum(unit => unit.GetComponent().Class.UnitStrength);
+ }
+
+
+ public void OnUnitAdded(Unit unit)
+ {
+ BoltLog.Info("Unit {0} added to formation {1}", unit, this);
+ if(currentZone != null)
+ {
+ currentZone.OnFormationChanged(this);
+ }
}
+
}
diff --git a/Assets/GWConquest/Scripts/FormationUI.cs b/Assets/GWConquest/Scripts/FormationUI.cs
new file mode 100644
index 0000000..5267fcf
--- /dev/null
+++ b/Assets/GWConquest/Scripts/FormationUI.cs
@@ -0,0 +1,73 @@
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace GWConquest
+{
+ public class FormationUI : MonoBehaviour
+ {
+ public Text FormationNameText;
+ public GameObject UnitPanelPrefab;
+ public float UnitPanelHeight;
+
+ private Formation formation;
+ private readonly List unitPanels = new List();
+
+ private class UnitClassEntry
+ {
+ public UnitClass Class;
+ public int Count;
+ }
+
+ public void SetFormation(Formation f)
+ {
+ formation = f;
+ UpdateUI();
+ }
+
+ public void UpdateUI()
+ {
+ foreach(GameObject go in unitPanels)
+ {
+ Destroy(go);
+ }
+ unitPanels.Clear();
+
+ if(formation != null)
+ {
+ Dictionary unitClassMap = new Dictionary();
+ foreach(Unit unit in formation.Units)
+ {
+ if(unitClassMap.ContainsKey(unit.Class))
+ {
+ unitClassMap[unit.Class].Count++;
+ }
+ else
+ {
+ unitClassMap[unit.Class] = new UnitClassEntry() { Class = unit.Class, Count = 1 };
+ }
+ }
+ List entries = new List(unitClassMap.Values);
+ entries.Sort((e1, e2) => e2.Count - e1.Count);
+ for(int i = 0; i < entries.Count; i++)
+ {
+ UnitClass unitClass = entries[i].Class;
+ int count = entries[i].Count;
+
+ GameObject unitPanel = Instantiate(UnitPanelPrefab);
+ RectTransform rt = unitPanel.GetComponent();
+ rt.SetParent(transform, false);
+ rt.anchoredPosition = new Vector2(0, -(i + 1) * UnitPanelHeight);
+
+ rt.Find("Name").GetComponent().text = unitClass.FullName;
+ rt.Find("Count").GetComponent().text = "x" + count;
+ rt.Find("Icon").GetComponent().sprite = unitClass.Sprite;
+
+ unitPanels.Add(unitPanel);
+ }
+ }
+
+ GetComponent().sizeDelta = new Vector2(0, (unitPanels.Count + 1) * UnitPanelHeight);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/GWConquest/Scripts/FormationUI.cs.meta b/Assets/GWConquest/Scripts/FormationUI.cs.meta
new file mode 100644
index 0000000..09e4814
--- /dev/null
+++ b/Assets/GWConquest/Scripts/FormationUI.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 1c0e43d1dc685d84e91c202da724b6d3
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/GWConquest/Scripts/GalaxyMapUI.cs b/Assets/GWConquest/Scripts/GalaxyMapUI.cs
index de8db16..635db29 100644
--- a/Assets/GWConquest/Scripts/GalaxyMapUI.cs
+++ b/Assets/GWConquest/Scripts/GalaxyMapUI.cs
@@ -1,4 +1,6 @@
-using UnityEngine;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
using UnityEngine.UI;
namespace GWConquest
@@ -8,7 +10,13 @@ namespace GWConquest
public Text PlanetNameText;
public GameObject PlayerFleetPanel;
- public GameObject EnemyFleetPlanel;
+ public GameObject EnemyFleetPanel;
+
+ public Image PlayerStrengthBar;
+ public Image EnemyStrengthBar;
+
+ public float StrengthBarParts;
+ public float MaxFormationStrength;
public GameObject PlanetSelection;
@@ -16,23 +24,48 @@ namespace GWConquest
public void SelectPlanet(Planet planet)
{
- SelectedPlanet = planet;
+ if(planet != SelectedPlanet)
+ {
+ if(SelectedPlanet != null)
+ {
+ SelectedPlanet.FormationsChanged -= PlanetFormationsChanged;
+ }
- if(SelectedPlanet != null)
+ SelectedPlanet = planet;
+
+ if (SelectedPlanet != null)
+ {
+
+ gameObject.SetActive(true);
+ PlanetSelection.SetActive(true);
+ PlanetSelection.transform.SetParent(planet.transform, false);
+ PlanetNameText.text = SelectedPlanet.planetName;
+
+ UpdateIndicator();
+
+ SelectedPlanet.FormationsChanged += PlanetFormationsChanged;
+ }
+ else
+ {
+ PlanetSelection.SetActive(false);
+ EnemyFleetPanel.SetActive(false);
+ PlayerFleetPanel.SetActive(false);
+ gameObject.SetActive(false);
+ }
+ }
+
+ }
+
+ public void PlanetFormationsChanged()
+ {
+ if(PlayerFleetPanel.activeInHierarchy)
{
- gameObject.SetActive(true);
- PlanetSelection.SetActive(true);
- PlanetSelection.transform.SetParent(planet.transform, false);
- PlanetNameText.text = SelectedPlanet.planetName;
+ ShowPlayerFleetPanel();
}
- else
+ if(EnemyFleetPanel.activeInHierarchy)
{
- gameObject.SetActive(false);
- PlanetSelection.SetActive(false);
- EnemyFleetPlanel.SetActive(false);
- PlayerFleetPanel.SetActive(false);
+ ShowEnemyFleetPanel();
}
-
}
public void BuildFleet(string unitClass)
@@ -45,8 +78,6 @@ namespace GWConquest
ev.UnitClass = unitClass;
ev.Send();
- gameObject.SetActive(false);
- SelectedPlanet = null;
}
}
@@ -54,11 +85,42 @@ namespace GWConquest
public void ShowPlayerFleetPanel()
{
PlayerFleetPanel.SetActive(true);
+ IEnumerable formations = SelectedPlanet
+ .GetAllFormations(ZoneType.Space)
+ .Where(f => f.Player == Player.CurrentPlayer);
+ PlayerFleetPanel.GetComponent().SetFormations(formations.ToArray());
}
public void ShowEnemyFleetPanel()
{
- EnemyFleetPlanel.SetActive(true);
+ EnemyFleetPanel.SetActive(true);
+ IEnumerable formations = SelectedPlanet
+ .GetAllFormations(ZoneType.Space)
+ .Where(f => f.Player != Player.CurrentPlayer);
+ EnemyFleetPanel.GetComponent().SetFormations(formations.ToArray());
+ }
+
+ private void FixedUpdate()
+ {
+ UpdateIndicator();
+ }
+
+ public void UpdateIndicator()
+ {
+ if(SelectedPlanet != null)
+ {
+ IEnumerable formations = SelectedPlanet.GetAllFormations(ZoneType.Space);
+ float playerStrength = formations.Sum(f => f.Player == Player.CurrentPlayer ? f.GetFormationStrength() : 0f);
+ float enemyStrength = formations.Sum(f => f.Player != Player.CurrentPlayer ? f.GetFormationStrength() : 0f);
+
+ playerStrength *= StrengthBarParts / MaxFormationStrength;
+ enemyStrength *= StrengthBarParts / MaxFormationStrength;
+
+ PlayerStrengthBar.fillAmount = Mathf.Ceil(playerStrength) / StrengthBarParts;
+ EnemyStrengthBar.fillAmount = Mathf.Ceil(enemyStrength) / StrengthBarParts;
+ }
+
+
}
}
}
\ No newline at end of file
diff --git a/Assets/GWConquest/Scripts/Planet.cs b/Assets/GWConquest/Scripts/Planet.cs
index cf0c2f4..ffb2759 100644
--- a/Assets/GWConquest/Scripts/Planet.cs
+++ b/Assets/GWConquest/Scripts/Planet.cs
@@ -105,7 +105,7 @@ namespace GWConquest
return GetAllFormations(zoneType, player).Sum(formation => formation.GetFormationStrength());
}
- private void Update()
+ private void FixedUpdate()
{
if(indicatorUI != null)
{
@@ -113,6 +113,13 @@ namespace GWConquest
}
}
+ public event Action FormationsChanged;
+
+ public void OnFormationsChanged()
+ {
+ FormationsChanged?.Invoke();
+ }
+
#if UNITY_EDITOR
diff --git a/Assets/GWConquest/Scripts/ServerCallbacks.cs b/Assets/GWConquest/Scripts/ServerCallbacks.cs
index 33e8ce4..bda1b07 100644
--- a/Assets/GWConquest/Scripts/ServerCallbacks.cs
+++ b/Assets/GWConquest/Scripts/ServerCallbacks.cs
@@ -42,7 +42,7 @@ namespace GWConquest
Unit unit = unitEntity.GetComponent();
unit.Class = UnitClass.FromName(evnt.UnitClass);
unit.Formation = playerFormation;
- playerFormation.Units.Add(unitEntity);
+ playerFormation.UnitEntities.Add(unitEntity);
}
diff --git a/Assets/GWConquest/Scripts/Unit.cs b/Assets/GWConquest/Scripts/Unit.cs
index ca5fa90..90ca470 100644
--- a/Assets/GWConquest/Scripts/Unit.cs
+++ b/Assets/GWConquest/Scripts/Unit.cs
@@ -19,10 +19,21 @@
public Formation Formation
{
- get => state.Formation.GetState();
+ get => state.Formation.GetComponent();
set => state.Formation = value.entity;
}
-
+ public override void Attached()
+ {
+ state.AddCallback("Formation", () =>
+ {
+ if(Formation != null)
+ {
+ Formation.OnUnitAdded(this);
+ }
+ });
+ }
+
+
}
}
\ No newline at end of file
diff --git a/Assets/GWConquest/Scripts/UnitClass.cs b/Assets/GWConquest/Scripts/UnitClass.cs
index 5a33755..c438dfe 100644
--- a/Assets/GWConquest/Scripts/UnitClass.cs
+++ b/Assets/GWConquest/Scripts/UnitClass.cs
@@ -35,7 +35,6 @@ namespace GWConquest
}
if (classMap.ContainsKey(name))
{
- BoltLog.Info("Unit class {0} found.", name);
return classMap[name];
}
else
@@ -45,6 +44,7 @@ namespace GWConquest
}
}
+ public string FullName;
public Sprite Sprite;
public ZoneType ZoneType;
diff --git a/Assets/GWConquest/Scripts/Zone.cs b/Assets/GWConquest/Scripts/Zone.cs
index 69cf50e..68fc7bb 100644
--- a/Assets/GWConquest/Scripts/Zone.cs
+++ b/Assets/GWConquest/Scripts/Zone.cs
@@ -73,11 +73,18 @@ namespace GWConquest
public void OnFormationArrived(Formation formation)
{
formations.Add(formation);
+ planet.OnFormationsChanged();
}
public void OnFormationDeparting(Formation formation)
{
formations.Remove(formation);
+ planet.OnFormationsChanged();
+ }
+
+ public void OnFormationChanged(Formation formation)
+ {
+ planet.OnFormationsChanged();
}
#if UNITY_EDITOR
diff --git a/Assets/GWConquest/Units/Cruiser.asset b/Assets/GWConquest/Units/Cruiser.asset
index 3b425ac..08f3457 100644
--- a/Assets/GWConquest/Units/Cruiser.asset
+++ b/Assets/GWConquest/Units/Cruiser.asset
@@ -12,6 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 866efe5bcc98fde42bdab9c01ab3b6ba, type: 3}
m_Name: Cruiser
m_EditorClassIdentifier:
+ FullName: Battlecruiser
Sprite: {fileID: 21300000, guid: ce4e8e58b24032c41813c44cf346ac9c, type: 3}
ZoneType: 0
UnitStrength: 20
diff --git a/Assets/GWConquest/Units/Fighter.asset b/Assets/GWConquest/Units/Fighter.asset
index 67b871d..aaf705b 100644
--- a/Assets/GWConquest/Units/Fighter.asset
+++ b/Assets/GWConquest/Units/Fighter.asset
@@ -12,7 +12,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 866efe5bcc98fde42bdab9c01ab3b6ba, type: 3}
m_Name: Fighter
m_EditorClassIdentifier:
+ FullName: Fighter Squadron
Sprite: {fileID: 21300000, guid: 52e22bcf1988b2b4da1b4da2ffba5c9d, type: 3}
ZoneType: 0
- UnitStrength: 0
+ UnitStrength: 2
MaxHealth: 0
diff --git a/Assets/GWConquest/Units/Frigate.asset b/Assets/GWConquest/Units/Frigate.asset
index 490815d..d10baea 100644
--- a/Assets/GWConquest/Units/Frigate.asset
+++ b/Assets/GWConquest/Units/Frigate.asset
@@ -12,6 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 866efe5bcc98fde42bdab9c01ab3b6ba, type: 3}
m_Name: Frigate
m_EditorClassIdentifier:
+ FullName: Frigate Squadron
Sprite: {fileID: 21300000, guid: a725f0b3a4d26a945a5b8ccbcffef516, type: 3}
ZoneType: 0
UnitStrength: 10