diff --git a/Assets/GWConquest/Prefabs/Planet.prefab b/Assets/GWConquest/Prefabs/Planet.prefab index a83b686..1fef33f 100644 --- a/Assets/GWConquest/Prefabs/Planet.prefab +++ b/Assets/GWConquest/Prefabs/Planet.prefab @@ -82,7 +82,7 @@ MonoBehaviour: m_EditorClassIdentifier: NearScalingDistance: 550 FarScalingDistance: 550 - FixPlanetSize: 0.95 + FixPlanetSize: 1.12 --- !u!114 &4678135251219452001 MonoBehaviour: m_ObjectHideFlags: 0 @@ -110,6 +110,8 @@ MonoBehaviour: planetCameraTransform: {fileID: 3266501631720423375} AdditionalObjects: {fileID: 0} InTransitFormations: [] + VisibilityStatus: 0 + OriginalDesaturation: 0 connections: [] --- !u!114 &8925700613145171218 MonoBehaviour: diff --git a/Assets/GWConquest/Prefabs/UI/BattleUnitIconFlankSpace.prefab b/Assets/GWConquest/Prefabs/UI/BattleUnitIconFlankSpace.prefab index fd16514..0c821c0 100644 --- a/Assets/GWConquest/Prefabs/UI/BattleUnitIconFlankSpace.prefab +++ b/Assets/GWConquest/Prefabs/UI/BattleUnitIconFlankSpace.prefab @@ -84,12 +84,12 @@ PrefabInstance: - target: {fileID: 1687732570946376589, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3} propertyPath: m_SizeDelta.x - value: 97.5 + value: 86 objectReference: {fileID: 0} - target: {fileID: 1687732570946376589, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3} propertyPath: m_SizeDelta.y - value: 97.5 + value: 86 objectReference: {fileID: 0} - target: {fileID: 1687732570946376589, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3} diff --git a/Assets/GWConquest/Prefabs/UI/BattleUnitIconSpace.prefab b/Assets/GWConquest/Prefabs/UI/BattleUnitIconSpace.prefab index 6fab75e..18535e4 100644 --- a/Assets/GWConquest/Prefabs/UI/BattleUnitIconSpace.prefab +++ b/Assets/GWConquest/Prefabs/UI/BattleUnitIconSpace.prefab @@ -50,12 +50,12 @@ PrefabInstance: - target: {fileID: 1687732570946376589, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3} propertyPath: m_SizeDelta.x - value: 97.5 + value: 72 objectReference: {fileID: 0} - target: {fileID: 1687732570946376589, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3} propertyPath: m_SizeDelta.y - value: 97.5 + value: 72 objectReference: {fileID: 0} - target: {fileID: 1687732570946376589, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3} diff --git a/Assets/GWConquest/Prefabs/UI/FlankUI.prefab b/Assets/GWConquest/Prefabs/UI/FlankUI.prefab index ef47abd..bae4a2f 100644 --- a/Assets/GWConquest/Prefabs/UI/FlankUI.prefab +++ b/Assets/GWConquest/Prefabs/UI/FlankUI.prefab @@ -110,6 +110,7 @@ RectTransform: - {fileID: 8085052938175271119} - {fileID: 3536641625903406562} - {fileID: 2784919200071465695} + - {fileID: 6769882531712760617} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -142,6 +143,7 @@ MonoBehaviour: DisabledAlpha: 0.25 BombardedImageLeft: {fileID: 4435938290225379374} BombardedImageRight: {fileID: 9221938974357844206} + TitleText: {fileID: 5959453350297802611} --- !u!225 &8668185966868266328 CanvasGroup: m_ObjectHideFlags: 0 @@ -395,6 +397,84 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 2.32 +--- !u!1 &7400446663348275466 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6769882531712760617} + - component: {fileID: 3083850318465946828} + - component: {fileID: 5959453350297802611} + m_Layer: 5 + m_Name: TitleText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6769882531712760617 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7400446663348275466} + 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: 2893350996044003037} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 10} + m_SizeDelta: {x: 322.46326, y: 28.029785} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &3083850318465946828 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7400446663348275466} + m_CullTransparentMesh: 0 +--- !u!114 &5959453350297802611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7400446663348275466} + 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.34901962} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 56 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Allied Frontline --- !u!1 &7510832164935520711 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Prefabs/UI/FlankUISpace.prefab b/Assets/GWConquest/Prefabs/UI/FlankUISpace.prefab index 724b999..a401515 100644 --- a/Assets/GWConquest/Prefabs/UI/FlankUISpace.prefab +++ b/Assets/GWConquest/Prefabs/UI/FlankUISpace.prefab @@ -120,7 +120,7 @@ PrefabInstance: - target: {fileID: 3369366501850651800, guid: 2b9452b3918dbac4dba70a0ee84d8ab4, type: 3} propertyPath: IconSize - value: 97.5 + value: 86 objectReference: {fileID: 0} - target: {fileID: 3369366501850651800, guid: 2b9452b3918dbac4dba70a0ee84d8ab4, type: 3} diff --git a/Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab b/Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab index 0f8b57c..714b9da 100644 --- a/Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab +++ b/Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab @@ -363,6 +363,72 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1573826406629317414} m_CullTransparentMesh: 0 +--- !u!1 &1784721267558110017 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6852626612145593344} + - component: {fileID: 1165772359589297660} + - component: {fileID: 6531222724722378478} + m_Layer: 5 + m_Name: DistrictSymbols + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6852626612145593344 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1784721267558110017} + 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: 7384831771431062766} + 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: 0, y: -60.1} + m_SizeDelta: {x: 0, y: 15} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1165772359589297660 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1784721267558110017} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a51d6fb8b751b22409332061042af80c, type: 3} + m_Name: + m_EditorClassIdentifier: + Padding: 0 + Spacing: 7 +--- !u!114 &6531222724722378478 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1784721267558110017} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68d57de996f29404f8d57bdeb85ab942, type: 3} + m_Name: + m_EditorClassIdentifier: + Padding: 0 + Horizontal: 1 + Vertical: 0 --- !u!1 &2095399765145761935 GameObject: m_ObjectHideFlags: 0 @@ -657,7 +723,7 @@ RectTransform: 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.0008392157, y: -40} + m_AnchoredPosition: {x: -0.0008392157, y: -38.7} m_SizeDelta: {x: 200, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8817467615109816757 @@ -700,7 +766,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: + m_Text: MENAXURIE --- !u!114 &8442851035215243681 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1082,6 +1148,7 @@ RectTransform: m_Children: - {fileID: 7493439069602050584} - {fileID: 3206999086042524838} + - {fileID: 6852626612145593344} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1136,6 +1203,26 @@ MonoBehaviour: MaxFormationStrength: 100 FactionImage: {fileID: 7197385088179281400} NeutralColor: {r: 0.6862745, g: 0.6862745, b: 0.6862745, a: 1} + DistrictSymbols: {fileID: 6852626612145593344} + DistrictSymbolPrefab: {fileID: 7541130419680964748, guid: 8fca0dbef7b398042895a2af57b648ea, + type: 3} + DistrictSymbolTypes: + - DistrictType: 0 + Icon: {fileID: 21300000, guid: e08b397bc0cb6f642bfe7743721d644f, type: 3} + - DistrictType: 1 + Icon: {fileID: 21300000, guid: d6a99e4127bc1b64d9063cd2d1555439, type: 3} + - DistrictType: 2 + Icon: {fileID: 21300000, guid: eb2e846cc08c4064d8c4955a8ea81cf5, type: 3} + - DistrictType: 3 + Icon: {fileID: 21300000, guid: b724aa86e8fd31f4f9258e385e3a6757, type: 3} + - DistrictType: 4 + Icon: {fileID: 21300000, guid: 4fb8dc43dcaf1a240b82465fc3e9ae63, type: 3} + - DistrictType: 5 + Icon: {fileID: 21300000, guid: db5bbf45ac428c240a974c5887ce8dce, type: 3} + - DistrictType: 7 + Icon: {fileID: 21300000, guid: 451f948452dceda4cac8ed980695cf82, type: 3} + - DistrictType: 6 + Icon: {fileID: 21300000, guid: a8b2bb0f05ad6834c934a24e73d0d532, type: 3} --- !u!114 &7384831771431062767 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Prefabs/UI/PlanetIndicatorDistrictSymbol.prefab b/Assets/GWConquest/Prefabs/UI/PlanetIndicatorDistrictSymbol.prefab new file mode 100644 index 0000000..8c17924 --- /dev/null +++ b/Assets/GWConquest/Prefabs/UI/PlanetIndicatorDistrictSymbol.prefab @@ -0,0 +1,183 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7541130419680964748 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7541130419680964749} + - component: {fileID: 7541130419680964747} + - component: {fileID: 7541130419680964746} + - component: {fileID: 6281905439376641608} + m_Layer: 5 + m_Name: PlanetIndicatorDistrictSymbol + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7541130419680964749 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7541130419680964748} + 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: 5640206779338511740} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 9.5, y: -9.499992} + m_SizeDelta: {x: 13, y: 13} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7541130419680964747 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7541130419680964748} + m_CullTransparentMesh: 0 +--- !u!114 &7541130419680964746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7541130419680964748} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: eb2e846cc08c4064d8c4955a8ea81cf5, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6281905439376641608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7541130419680964748} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.63529414} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!1 &8644822413282706300 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5640206779338511740} + - component: {fileID: 8489971881928985428} + - component: {fileID: 2380150125148524420} + - component: {fileID: 7035351003660383945} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5640206779338511740 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8644822413282706300} + 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: 7541130419680964749} + 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: 17, y: 17} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8489971881928985428 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8644822413282706300} + m_CullTransparentMesh: 0 +--- !u!114 &2380150125148524420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8644822413282706300} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0055e38087b03e04dbfa4f836125f31d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7035351003660383945 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8644822413282706300} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.63529414} + m_EffectDistance: {x: 0.5, y: -0.5} + m_UseGraphicAlpha: 1 diff --git a/Assets/GWConquest/Prefabs/UI/PlanetIndicatorDistrictSymbol.prefab.meta b/Assets/GWConquest/Prefabs/UI/PlanetIndicatorDistrictSymbol.prefab.meta new file mode 100644 index 0000000..dee2148 --- /dev/null +++ b/Assets/GWConquest/Prefabs/UI/PlanetIndicatorDistrictSymbol.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8fca0dbef7b398042895a2af57b648ea +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Resources/UnitIcons/Battleship old.png b/Assets/GWConquest/Resources/UnitIcons/Battleship old.png new file mode 100644 index 0000000..4c3a3da Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/Battleship old.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/Battleship old.png.meta b/Assets/GWConquest/Resources/UnitIcons/Battleship old.png.meta new file mode 100644 index 0000000..e861975 --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/Battleship old.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: f5aa90c30c2a93c46a29171b3f0656f6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Resources/UnitIcons/Battleship.png b/Assets/GWConquest/Resources/UnitIcons/Battleship.png index 4c3a3da..d7e6688 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/Battleship.png and b/Assets/GWConquest/Resources/UnitIcons/Battleship.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/Battleship.png.meta b/Assets/GWConquest/Resources/UnitIcons/Battleship.png.meta index e861975..968753e 100644 --- a/Assets/GWConquest/Resources/UnitIcons/Battleship.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/Battleship.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f5aa90c30c2a93c46a29171b3f0656f6 +guid: ab8085661cb35e9469bcd4f6ddb9ee73 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -48,7 +48,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 diff --git a/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry.png b/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry.png index 83546a9..c4bfd11 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry.png and b/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry.png.meta index cc20c0f..2e2482a 100644 --- a/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/HeavyInfantry.png.meta @@ -48,7 +48,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 + alphaUsage: 2 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 diff --git a/Assets/GWConquest/Resources/UnitIcons/HeroFileyCattai.png b/Assets/GWConquest/Resources/UnitIcons/HeroFileyCattai.png new file mode 100644 index 0000000..529d754 Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/HeroFileyCattai.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/HeroFileyCattai.png.meta b/Assets/GWConquest/Resources/UnitIcons/HeroFileyCattai.png.meta new file mode 100644 index 0000000..89021cc --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/HeroFileyCattai.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: a0cdce8be14d0484180786fc65272490 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Resources/UnitIcons/HeroHyronimusHoth.png b/Assets/GWConquest/Resources/UnitIcons/HeroHyronimusHoth.png index 84feb15..6f41cc8 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/HeroHyronimusHoth.png and b/Assets/GWConquest/Resources/UnitIcons/HeroHyronimusHoth.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/MediumTank old.png b/Assets/GWConquest/Resources/UnitIcons/MediumTank old.png new file mode 100644 index 0000000..64e5430 Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/MediumTank old.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/MediumTank old.png.meta b/Assets/GWConquest/Resources/UnitIcons/MediumTank old.png.meta new file mode 100644 index 0000000..3bba402 --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/MediumTank old.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 81fb00a935363934d959d3a9d3dd397c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Resources/UnitIcons/MediumTank.png b/Assets/GWConquest/Resources/UnitIcons/MediumTank.png index 64e5430..6bc5bc0 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/MediumTank.png and b/Assets/GWConquest/Resources/UnitIcons/MediumTank.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/MediumTank.png.meta b/Assets/GWConquest/Resources/UnitIcons/MediumTank.png.meta index 3bba402..126edd4 100644 --- a/Assets/GWConquest/Resources/UnitIcons/MediumTank.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/MediumTank.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 81fb00a935363934d959d3a9d3dd397c +guid: fe503603591f1df488e39213adc3618d TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -48,7 +48,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 diff --git a/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers old.png b/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers old.png new file mode 100644 index 0000000..1570092 Binary files /dev/null and b/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers old.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers old.png.meta b/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers old.png.meta new file mode 100644 index 0000000..a5fa509 --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers old.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: e60526d82a2b617468e0f8c0fffb9fd5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers.png b/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers.png index 1570092..9ec1042 100644 Binary files a/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers.png and b/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers.png differ diff --git a/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers.png.meta b/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers.png.meta index a5fa509..80493d0 100644 --- a/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers.png.meta +++ b/Assets/GWConquest/Resources/UnitIcons/RokurantStormPioneers.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e60526d82a2b617468e0f8c0fffb9fd5 +guid: 12fa015e9fb915842a688911e85110c1 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -48,7 +48,7 @@ TextureImporter: spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 2 + alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 8 diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index 9582d69..32c3099 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -348,7 +348,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -1227,7 +1227,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -1448,7 +1448,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -1716,7 +1716,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -1860,7 +1860,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -2112,7 +2112,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 313423042} - m_RootOrder: 11 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &32943764 MonoBehaviour: @@ -2193,7 +2193,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -3006,7 +3006,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -3249,7 +3249,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -4388,7 +4388,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -4655,7 +4655,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1487285352} - m_RootOrder: 7 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &76328709 MonoBehaviour: @@ -5053,7 +5053,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 905375158} - m_RootOrder: 9 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &89695239 MonoBehaviour: @@ -5187,7 +5187,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -5528,7 +5528,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -5791,7 +5791,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -7156,7 +7156,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -7817,7 +7817,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1248703575} - m_RootOrder: 9 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &120250339 MonoBehaviour: @@ -8422,7 +8422,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} propertyPath: m_LocalScale.x @@ -8867,7 +8867,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1190252336} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &147799133 MonoBehaviour: @@ -8977,7 +8977,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 11 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -9100,7 +9100,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -10437,7 +10437,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 12 + value: 10 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -11239,7 +11239,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -11487,7 +11487,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -12364,7 +12364,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 996610188} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &212967441 MonoBehaviour: @@ -12834,7 +12834,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -13427,7 +13427,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -13956,7 +13956,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -14868,7 +14868,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -15604,7 +15604,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4428860687156642, guid: 00cbbb3475b1b0640a802c21a905203b, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4428860687156642, guid: 00cbbb3475b1b0640a802c21a905203b, type: 3} propertyPath: m_LocalScale.x @@ -15908,7 +15908,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -17157,7 +17157,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -17339,7 +17339,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -18089,7 +18089,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 11 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -18866,7 +18866,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -19731,7 +19731,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -20725,7 +20725,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -21845,7 +21845,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -22223,7 +22223,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 13 + value: 10 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -22532,7 +22532,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -22690,7 +22690,7 @@ PrefabInstance: - target: {fileID: 841831665631638574, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 13 + value: 12 objectReference: {fileID: 0} - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -22705,7 +22705,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -25670,7 +25670,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 904552829} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &435860291 MonoBehaviour: @@ -26066,7 +26066,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} propertyPath: m_LocalScale.x @@ -26744,7 +26744,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -27064,7 +27064,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -27230,7 +27230,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -27943,7 +27943,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -28340,7 +28340,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -28546,7 +28546,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -28997,7 +28997,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -29161,7 +29161,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -30048,7 +30048,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -30196,7 +30196,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2118327521} - m_RootOrder: 9 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &555215529 MonoBehaviour: @@ -30678,7 +30678,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -31834,7 +31834,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1810618283} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &610472505 MonoBehaviour: @@ -32375,7 +32375,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -32503,7 +32503,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -33551,7 +33551,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -33767,7 +33767,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -34374,7 +34374,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -34615,7 +34615,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -35172,7 +35172,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -38461,7 +38461,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -38704,7 +38704,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -39036,7 +39036,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 11 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -39675,7 +39675,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -40087,7 +40087,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -40266,7 +40266,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -40548,7 +40548,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 201122156} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &755114450 MonoBehaviour: @@ -40669,7 +40669,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -41290,7 +41290,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -41558,7 +41558,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1011885988} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &769496624 MonoBehaviour: @@ -41981,7 +41981,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1766312939} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &774224437 MonoBehaviour: @@ -42259,7 +42259,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 12 + value: 10 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -42797,7 +42797,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -43386,7 +43386,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -43542,7 +43542,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 12 + value: 10 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -43749,7 +43749,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -44670,7 +44670,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -45049,7 +45049,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -46260,7 +46260,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -46604,7 +46604,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 871949502} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &876500677 MonoBehaviour: @@ -46640,7 +46640,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -47780,7 +47780,7 @@ PrefabInstance: - target: {fileID: 8976613798547922808, guid: 14229f06e6aafa148bfa5d9f50fcc726, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 8976613798547922808, guid: 14229f06e6aafa148bfa5d9f50fcc726, type: 3} @@ -48199,7 +48199,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4581280878649260, guid: 142df2703269e424cb799982a34327ec, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 4581280878649260, guid: 142df2703269e424cb799982a34327ec, type: 3} propertyPath: m_LocalScale.x @@ -48296,7 +48296,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -48534,7 +48534,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -50198,7 +50198,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -51357,7 +51357,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -51480,7 +51480,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 11 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -51673,7 +51673,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1011885988} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &964029400 MonoBehaviour: @@ -51843,7 +51843,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -52538,7 +52538,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 92487209} - m_RootOrder: 9 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &974295115 MonoBehaviour: @@ -52881,7 +52881,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -53409,7 +53409,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -53537,7 +53537,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -53881,7 +53881,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -55295,7 +55295,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -55959,7 +55959,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -56613,7 +56613,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 11 + value: 10 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -57164,7 +57164,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -57367,7 +57367,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -58002,7 +58002,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 11 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -58139,7 +58139,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -58377,7 +58377,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -59009,7 +59009,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 193885455} - m_RootOrder: 9 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1095021218 MonoBehaviour: @@ -59077,7 +59077,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -59216,7 +59216,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -59369,7 +59369,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 282969351} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1097368429 MonoBehaviour: @@ -59414,7 +59414,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7904167} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1099716638 MonoBehaviour: @@ -59455,7 +59455,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -60212,7 +60212,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -60544,7 +60544,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -61603,7 +61603,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -62030,7 +62030,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -62267,7 +62267,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -62775,7 +62775,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 766573528} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1147370010 MonoBehaviour: @@ -64012,7 +64012,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -64295,7 +64295,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} propertyPath: m_LocalScale.x @@ -65058,7 +65058,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -65266,7 +65266,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 12 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -65911,7 +65911,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 511551466} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1213153683 MonoBehaviour: @@ -67097,7 +67097,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -68126,7 +68126,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1248703575} - m_RootOrder: 11 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1263829413 MonoBehaviour: @@ -69586,84 +69586,6 @@ RectTransform: m_AnchoredPosition: {x: 68.7, y: -9.3} m_SizeDelta: {x: 455.79993, y: 39.15039} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1301264614 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1301264615} - - component: {fileID: 1301264617} - - component: {fileID: 1301264616} - m_Layer: 5 - m_Name: OwnText (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1301264615 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1301264614} - 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: 853420528} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.75, y: 0.5} - m_AnchorMax: {x: 0.75, y: 0.5} - m_AnchoredPosition: {x: 0, y: 368} - m_SizeDelta: {x: 322.46326, y: 48.029785} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &1301264616 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1301264614} - 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.34901962} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} - m_FontSize: 20 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 56 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Enemy Frontline ---- !u!222 &1301264617 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1301264614} - m_CullTransparentMesh: 0 --- !u!1 &1303392264 GameObject: m_ObjectHideFlags: 0 @@ -69966,7 +69888,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -70094,7 +70016,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -75078,7 +75000,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -75589,7 +75511,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -78392,7 +78314,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -78558,7 +78480,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 904552829} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1412114077 MonoBehaviour: @@ -78988,7 +78910,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 11 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -80421,7 +80343,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -80948,7 +80870,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -81080,7 +81002,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1766312939} - m_RootOrder: 9 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1466570030 MonoBehaviour: @@ -81509,7 +81431,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -81966,7 +81888,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -82273,7 +82195,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -82852,7 +82774,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -83356,7 +83278,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1526261021} - m_RootOrder: 9 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1513784179 MonoBehaviour: @@ -83811,7 +83733,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -84427,7 +84349,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -85720,7 +85642,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -86208,7 +86130,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1082704439} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1584068338 MonoBehaviour: @@ -86692,7 +86614,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -87192,7 +87114,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -88643,7 +88565,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -91167,7 +91089,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 14 + value: 11 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -91896,7 +91818,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -92217,7 +92139,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 904552829} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1719814136 MonoBehaviour: @@ -92510,7 +92432,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 11 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -93307,7 +93229,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -94632,7 +94554,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -94973,7 +94895,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -101110,7 +101032,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -102085,7 +102007,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -102458,7 +102380,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -103296,7 +103218,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -104037,7 +103959,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -104619,7 +104541,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1066016891} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1864226274 MonoBehaviour: @@ -105075,7 +104997,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -106033,7 +105955,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -106410,7 +106332,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -107150,7 +107072,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -107339,7 +107261,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -107952,7 +107874,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 12 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -108096,7 +108018,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -108887,7 +108809,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -109201,7 +109123,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -109596,7 +109518,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -110355,7 +110277,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 343902120} - m_RootOrder: 9 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1972712767 MonoBehaviour: @@ -110514,7 +110436,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 8 + value: 6 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -110840,7 +110762,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 11 + value: 9 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -111501,7 +111423,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 313423042} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1988671000 MonoBehaviour: @@ -111741,8 +111663,8 @@ MonoBehaviour: mainCam: {fileID: 663080998} additionalCameras: - {fileID: 197337108} - cameraTranslationSpeedMinZoom: 1000 - cameraTranslationSpeedMaxZoom: 3500 + cameraTranslationSpeedMinZoom: 5000 + cameraTranslationSpeedMaxZoom: 2000 scrollRegionSize: 10 cameraRotationSpeed: 200 cameraZoomSpeed: -40000 @@ -111752,7 +111674,7 @@ MonoBehaviour: minCameraAngle: 20 maxCameraAngle: 90 minCameraZoom: 500 - maxCameraZoom: 4000 + maxCameraZoom: 2130 --- !u!4 &1992706994 Transform: m_ObjectHideFlags: 0 @@ -112371,7 +112293,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -113058,84 +112980,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} ---- !u!1 &2013485552 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2013485553} - - component: {fileID: 2013485555} - - component: {fileID: 2013485554} - m_Layer: 5 - m_Name: OwnText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2013485553 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2013485552} - 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: 853420528} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.25, y: 0.5} - m_AnchorMax: {x: 0.25, y: 0.5} - m_AnchoredPosition: {x: 0, y: 368} - m_SizeDelta: {x: 322.46326, y: 48.029785} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &2013485554 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2013485552} - 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.34901962} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} - m_FontSize: 20 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 56 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Allied Frontline ---- !u!222 &2013485555 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2013485552} - m_CullTransparentMesh: 0 --- !u!1 &2013757098 GameObject: m_ObjectHideFlags: 0 @@ -113664,7 +113508,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -114558,7 +114402,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} @@ -115408,7 +115252,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -116565,7 +116409,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -116892,7 +116736,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -117249,7 +117093,7 @@ PrefabInstance: - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: FixPlanetSize - value: 0.95 + value: 1.12 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -117584,7 +117428,7 @@ PrefabInstance: - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} propertyPath: m_RootOrder - value: 9 + value: 7 objectReference: {fileID: 0} - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} diff --git a/Assets/GWConquest/Scenes/GalaxyMapProfile.asset b/Assets/GWConquest/Scenes/GalaxyMapProfile.asset index e08dcbd..7b8ef42 100644 --- a/Assets/GWConquest/Scenes/GalaxyMapProfile.asset +++ b/Assets/GWConquest/Scenes/GalaxyMapProfile.asset @@ -1,5 +1,49 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3645560255796084296 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 40b924e2dad56384a8df2a1e111bb675, type: 3} + m_Name: Vignette + m_EditorClassIdentifier: + active: 1 + enabled: + overrideState: 1 + value: 1 + mode: + overrideState: 1 + value: 1 + color: + overrideState: 0 + value: {r: 0, g: 0, b: 0, a: 1} + center: + overrideState: 0 + value: {x: 0.5, y: 0.5} + intensity: + overrideState: 1 + value: 0.663 + smoothness: + overrideState: 1 + value: 0.319 + roundness: + overrideState: 1 + value: 0 + rounded: + overrideState: 0 + value: 0 + mask: + overrideState: 1 + value: {fileID: 2800000, guid: c5b6af1955143ec4798ea75bd87fbca9, type: 3} + defaultState: 1 + opacity: + overrideState: 1 + value: 0.816 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15,6 +59,7 @@ MonoBehaviour: settings: - {fileID: 871097430085704242} - {fileID: 318509760781841033} + - {fileID: -3645560255796084296} --- !u!114 &318509760781841033 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/GWConquest/Scripts/District.cs b/Assets/GWConquest/Scripts/District.cs index f2119f9..09da376 100644 --- a/Assets/GWConquest/Scripts/District.cs +++ b/Assets/GWConquest/Scripts/District.cs @@ -170,6 +170,43 @@ namespace GWConquest } } + public DistrictTypeFull GetFullType() + { + switch(DistrictType) + { + case DistrictType.Factory: + DistrictFactory f = GetComponent(); + switch(f.FactoryType) + { + case FactoryType.City: + return DistrictTypeFull.Civil; + case FactoryType.Supplies: + return DistrictTypeFull.FactorySupplies; + case FactoryType.Fuel: + return DistrictTypeFull.FactoryFuel; + case FactoryType.Infantry: + return DistrictTypeFull.FactoryInfantry; + case FactoryType.Armour: + return DistrictTypeFull.FactoryArmor; + case FactoryType.Space: + return DistrictTypeFull.SpaceStation; + default: + return DistrictTypeFull.Special; + } + case DistrictType.Civil: + return DistrictTypeFull.Civil; + case DistrictType.Food: + return DistrictTypeFull.Food; + case DistrictType.SpaceStation: + return DistrictTypeFull.SpaceStation; + case DistrictType.Special: + return DistrictTypeFull.Special; + default: + return DistrictTypeFull.Special; + + } + } + #if UNITY_EDITOR public void SetDefaultSprite() @@ -199,5 +236,17 @@ namespace GWConquest SpaceStation } + public enum DistrictTypeFull + { + Civil, + FactorySupplies, + FactoryFuel, + FactoryInfantry, + FactoryArmor, + Food, + Special, + SpaceStation + } + } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/Planet.cs b/Assets/GWConquest/Scripts/Planet.cs index 6e8b13a..a40e80a 100644 --- a/Assets/GWConquest/Scripts/Planet.cs +++ b/Assets/GWConquest/Scripts/Planet.cs @@ -400,7 +400,7 @@ namespace GWConquest { conn.GetComponent().enabled = false; } - else if(conn.planet1.VisibilityStatus == PlanetVisibilityStatus.Visible || conn.planet2.VisibilityStatus == PlanetVisibilityStatus.Visible) + else if(DebugUI.ShowAllPlanets || conn.planet1.VisibilityStatus == PlanetVisibilityStatus.Visible || conn.planet2.VisibilityStatus == PlanetVisibilityStatus.Visible) { conn.GetComponent().enabled = true; } diff --git a/Assets/GWConquest/Scripts/UI/BattleFlankUI.cs b/Assets/GWConquest/Scripts/UI/BattleFlankUI.cs index ac9a6b2..4e779b5 100644 --- a/Assets/GWConquest/Scripts/UI/BattleFlankUI.cs +++ b/Assets/GWConquest/Scripts/UI/BattleFlankUI.cs @@ -1,4 +1,5 @@ using UnityEngine; +using UnityEngine.UI; using System.Linq; using Photon.Bolt; using Photon.Bolt.Utils; @@ -22,6 +23,8 @@ namespace GWConquest { public GameObject BombardedImageLeft; public GameObject BombardedImageRight; + public Text TitleText; + private BattleUI battleUI; public RectTransform RectTransform { diff --git a/Assets/GWConquest/Scripts/UI/BattleUI.cs b/Assets/GWConquest/Scripts/UI/BattleUI.cs index c8b65c4..4153858 100644 --- a/Assets/GWConquest/Scripts/UI/BattleUI.cs +++ b/Assets/GWConquest/Scripts/UI/BattleUI.cs @@ -144,8 +144,19 @@ namespace GWConquest float startY = (float)(PlayerUIs.Count - 1) / 2f * FlankUIOffset; for (int i = 0; i < PlayerUIs.Count; i++) { + var ui = PlayerUIs[i]; var pos = new Vector2(-x, startY - i * FlankUIOffset); - PlayerUIs[i].RectTransform.anchoredPosition = pos; + ui.RectTransform.anchoredPosition = pos; + + if(i==0) + { + ui.TitleText.text = "Allied Frontline"; + ui.TitleText.enabled = true; + } + else + { + ui.TitleText.enabled = false; + } } } @@ -157,8 +168,19 @@ namespace GWConquest float startY = (float)(EnemyUIs.Count - 1) / 2f * FlankUIOffset; for (int i = 0; i < EnemyUIs.Count; i++) { + var ui = EnemyUIs[i]; var pos = new Vector2(x, startY - i * FlankUIOffset); - EnemyUIs[i].RectTransform.anchoredPosition = pos; + ui.RectTransform.anchoredPosition = pos; + + if (i == 0) + { + ui.TitleText.text = "Enemy Frontline"; + ui.TitleText.enabled = true; + } + else + { + ui.TitleText.enabled = false; + } } } diff --git a/Assets/GWConquest/Scripts/UI/HorizontalLayout.cs b/Assets/GWConquest/Scripts/UI/HorizontalLayout.cs new file mode 100644 index 0000000..a095faa --- /dev/null +++ b/Assets/GWConquest/Scripts/UI/HorizontalLayout.cs @@ -0,0 +1,61 @@ +using UnityEngine; + +namespace GWConquest +{ + + [RequireComponent(typeof(RectTransform))] + [ExecuteInEditMode] + public class HorizontalLayout : MonoBehaviour, ILayoutElement + { + public float Padding; + public float Spacing; + + private RectTransform _rectTransform; + private RectTransform rectTransform + { + get + { + if (_rectTransform == null) + { + _rectTransform = GetComponent(); + } + return _rectTransform; + } + } + + public void UpdateLayout() + { + if (!isActiveAndEnabled) + return; + + float currentX = Padding; + + for (int i = 0; i < rectTransform.childCount; i++) + { + var child = rectTransform.GetChild(i) as RectTransform; + + if (child.gameObject.activeSelf) + { + GWLayout.SetChildAlongAxis(child, 0, currentX); + + currentX += child.sizeDelta.x * child.localScale.x + Spacing; + } + } + } + + protected void OnEnable() + { + UpdateLayout(); + } + +#if UNITY_EDITOR + protected void OnValidate() + { + UpdateLayout(); + } + +#endif + } +} + + diff --git a/Assets/GWConquest/Scripts/UI/HorizontalLayout.cs.meta b/Assets/GWConquest/Scripts/UI/HorizontalLayout.cs.meta new file mode 100644 index 0000000..4b00d64 --- /dev/null +++ b/Assets/GWConquest/Scripts/UI/HorizontalLayout.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a51d6fb8b751b22409332061042af80c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs b/Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs index 707174a..2004f0b 100644 --- a/Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs +++ b/Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs @@ -27,6 +27,20 @@ namespace GWConquest public Image FactionImage; public Color NeutralColor; + public RectTransform DistrictSymbols; + public GameObject DistrictSymbolPrefab; + + [System.Serializable] + public class DistrictSymbolType + { + public DistrictTypeFull DistrictType; + public Sprite Icon; + } + + public DistrictSymbolType[] DistrictSymbolTypes; + + private Dictionary DistrictSymbolDict = new Dictionary(); + [System.NonSerialized] private Planet Planet; @@ -35,6 +49,21 @@ namespace GWConquest Planet = planet; PlanetNameText.text = planet.PlanetName.ToUpper(); PlanetNameText.gameObject.SetActive(planet.showPlanetName); + + foreach(var d in planet.GetComponentsInChildren()) + { + var type = d.GetFullType(); + if(!DistrictSymbolDict.ContainsKey(type)) + { + var go = Instantiate(DistrictSymbolPrefab); + GWLayout.InitRectTransform(go.GetComponent(), DistrictSymbols); + var comp = go.GetComponent(); + comp.sprite = DistrictSymbolTypes.Where(e => e.DistrictType == type).FirstOrDefault().Icon; + DistrictSymbolDict.Add(type, comp); + } + } + + GWLayout.UpdateLayout(DistrictSymbols); } public void UpdateIndicator() @@ -95,6 +124,8 @@ namespace GWConquest FactionImage.color = Util.UpdateColorRGB(FactionImage.color, controllingPlayer.Faction.FactionColor); PlanetNameText.color = Util.UpdateColorRGB(PlanetNameText.color, controllingPlayer.Faction.FactionColor); + + } else { FactionImage.gameObject.SetActive(false); @@ -102,6 +133,35 @@ namespace GWConquest PlanetNameText.color = Util.UpdateColorRGB(PlanetNameText.color, NeutralColor); } + var districts = Planet.GetComponentsInChildren(); + foreach(var type in DistrictSymbolDict.Keys) + { + var typeDistricts = districts.Where(d => d.GetFullType() == type); + + Color color = NeutralColor; + + if(typeDistricts.All(d => d.ControllingPlayer == Player.CurrentPlayer)) + { + if (typeDistricts.All(d => d.GetComponent() != null)) + { + if(typeDistricts.All(d => d.GetComponent().IsProducing)) + { + color = controllingPlayer.Faction.FactionColor; + } + } + else + { + color = controllingPlayer.Faction.FactionColor; + } + } + + foreach(Image img in DistrictSymbolDict[type].GetComponentsInChildren()) + { + img.color = Util.UpdateColorRGB(img.color, color); + } + + } + GetComponent().SetBool("Battle", Planet.HasBattle); } diff --git a/Assets/GWConquest/Textures/Icons/Planet Icon Barracks MINI.png b/Assets/GWConquest/Textures/Icons/Planet Icon Barracks MINI.png new file mode 100644 index 0000000..d518269 Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Planet Icon Barracks MINI.png differ diff --git a/Assets/GWConquest/Textures/Icons/Planet Icon Barracks MINI.png.meta b/Assets/GWConquest/Textures/Icons/Planet Icon Barracks MINI.png.meta new file mode 100644 index 0000000..6762fe4 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Planet Icon Barracks MINI.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: b724aa86e8fd31f4f9258e385e3a6757 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/Planet Icon City MINI.png b/Assets/GWConquest/Textures/Icons/Planet Icon City MINI.png new file mode 100644 index 0000000..4ce045a Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Planet Icon City MINI.png differ diff --git a/Assets/GWConquest/Textures/Icons/Planet Icon City MINI.png.meta b/Assets/GWConquest/Textures/Icons/Planet Icon City MINI.png.meta new file mode 100644 index 0000000..7c255f3 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Planet Icon City MINI.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: e08b397bc0cb6f642bfe7743721d644f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/Planet Icon Factory MINI.png b/Assets/GWConquest/Textures/Icons/Planet Icon Factory MINI.png new file mode 100644 index 0000000..bd35dd8 Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Planet Icon Factory MINI.png differ diff --git a/Assets/GWConquest/Textures/Icons/Planet Icon Factory MINI.png.meta b/Assets/GWConquest/Textures/Icons/Planet Icon Factory MINI.png.meta new file mode 100644 index 0000000..21922eb --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Planet Icon Factory MINI.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 4fb8dc43dcaf1a240b82465fc3e9ae63 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/Planet Icon Food MINI.png b/Assets/GWConquest/Textures/Icons/Planet Icon Food MINI.png new file mode 100644 index 0000000..5e8403c Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Planet Icon Food MINI.png differ diff --git a/Assets/GWConquest/Textures/Icons/Planet Icon Food MINI.png.meta b/Assets/GWConquest/Textures/Icons/Planet Icon Food MINI.png.meta new file mode 100644 index 0000000..4f76966 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Planet Icon Food MINI.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: db5bbf45ac428c240a974c5887ce8dce +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/Planet Icon Fuel 2 MINI.png b/Assets/GWConquest/Textures/Icons/Planet Icon Fuel 2 MINI.png new file mode 100644 index 0000000..40ac570 Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Planet Icon Fuel 2 MINI.png differ diff --git a/Assets/GWConquest/Textures/Icons/Planet Icon Fuel 2 MINI.png.meta b/Assets/GWConquest/Textures/Icons/Planet Icon Fuel 2 MINI.png.meta new file mode 100644 index 0000000..c151138 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Planet Icon Fuel 2 MINI.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: eb2e846cc08c4064d8c4955a8ea81cf5 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/Planet Icon Fuel MINI.png b/Assets/GWConquest/Textures/Icons/Planet Icon Fuel MINI.png new file mode 100644 index 0000000..cfe2203 Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Planet Icon Fuel MINI.png differ diff --git a/Assets/GWConquest/Textures/Icons/Planet Icon Fuel MINI.png.meta b/Assets/GWConquest/Textures/Icons/Planet Icon Fuel MINI.png.meta new file mode 100644 index 0000000..819a5e5 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Planet Icon Fuel MINI.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 09cf4bee977deea45a74e2d713876231 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/Planet Icon Station MINI.png b/Assets/GWConquest/Textures/Icons/Planet Icon Station MINI.png new file mode 100644 index 0000000..0a46193 Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Planet Icon Station MINI.png differ diff --git a/Assets/GWConquest/Textures/Icons/Planet Icon Station MINI.png.meta b/Assets/GWConquest/Textures/Icons/Planet Icon Station MINI.png.meta new file mode 100644 index 0000000..397d503 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Planet Icon Station MINI.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 451f948452dceda4cac8ed980695cf82 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/Planet Icon Supplies MINI.png b/Assets/GWConquest/Textures/Icons/Planet Icon Supplies MINI.png new file mode 100644 index 0000000..5dc8844 Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/Planet Icon Supplies MINI.png differ diff --git a/Assets/GWConquest/Textures/Icons/Planet Icon Supplies MINI.png.meta b/Assets/GWConquest/Textures/Icons/Planet Icon Supplies MINI.png.meta new file mode 100644 index 0000000..7d6db19 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/Planet Icon Supplies MINI.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: d6a99e4127bc1b64d9063cd2d1555439 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/STAR.png b/Assets/GWConquest/Textures/Icons/STAR.png new file mode 100644 index 0000000..4ac446c Binary files /dev/null and b/Assets/GWConquest/Textures/Icons/STAR.png differ diff --git a/Assets/GWConquest/Textures/Icons/STAR.png.meta b/Assets/GWConquest/Textures/Icons/STAR.png.meta new file mode 100644 index 0000000..ddc3ca5 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/STAR.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: a8b2bb0f05ad6834c934a24e73d0d532 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/X_aim444.png b/Assets/GWConquest/Textures/Icons/X_aim444.png index aaf6d94..d9fa6ea 100644 Binary files a/Assets/GWConquest/Textures/Icons/X_aim444.png and b/Assets/GWConquest/Textures/Icons/X_aim444.png differ diff --git a/Assets/GWConquest/Textures/UI/warum hab ich ne maske auf.png b/Assets/GWConquest/Textures/UI/warum hab ich ne maske auf.png new file mode 100644 index 0000000..7e8f4e5 Binary files /dev/null and b/Assets/GWConquest/Textures/UI/warum hab ich ne maske auf.png differ diff --git a/Assets/GWConquest/Textures/UI/warum hab ich ne maske auf.png.meta b/Assets/GWConquest/Textures/UI/warum hab ich ne maske auf.png.meta new file mode 100644 index 0000000..40c8629 --- /dev/null +++ b/Assets/GWConquest/Textures/UI/warum hab ich ne maske auf.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: c5b6af1955143ec4798ea75bd87fbca9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 0 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 10 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb index f0efeb3..4dfecdf 100644 Binary files a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb and b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb differ