Hex Grid Part 1 (WIP)

Assets/GWConquest/Prefabs/NetworkManager.prefab

@@ -0,0 +1,99 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2895585711290895149
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1964873977919645827}
+  - component: {fileID: 3156928614487451182}
+  - component: {fileID: 8764950240016691018}
+  m_Layer: 0
+  m_Name: NetworkManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1964873977919645827
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2895585711290895149}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 1276.0392, y: 517.60614, z: 659.94507}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3156928614487451182
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2895585711290895149}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 593a2fe42fa9d37498c96f9a383b6521, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  NetworkConfig:
+    ProtocolVersion: 0
+    NetworkTransport: {fileID: 8764950240016691018}
+    PlayerPrefab: {fileID: 0}
+    Prefabs:
+      NetworkPrefabsLists:
+      - {fileID: 11400000, guid: df94fd23d3398e54c9bd38ec5e26a04e, type: 2}
+    TickRate: 30
+    ClientConnectionBufferTimeout: 10
+    ConnectionApproval: 0
+    ConnectionData: 
+    EnableTimeResync: 0
+    TimeResyncInterval: 30
+    EnsureNetworkVariableLengthSafety: 0
+    EnableSceneManagement: 1
+    ForceSamePrefabs: 1
+    RecycleNetworkIds: 1
+    NetworkIdRecycleDelay: 120
+    RpcHashSize: 0
+    LoadSceneTimeOut: 120
+    SpawnTimeout: 1
+    EnableNetworkLogs: 1
+    OldPrefabList: []
+  RunInBackground: 1
+  LogLevel: 1
+--- !u!114 &8764950240016691018
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2895585711290895149}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6960e84d07fb87f47956e7a81d71c4e6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ProtocolType: 0
+  m_MaxPacketQueueSize: 128
+  m_MaxPayloadSize: 6144
+  m_HeartbeatTimeoutMS: 500
+  m_ConnectTimeoutMS: 1000
+  m_MaxConnectAttempts: 60
+  m_DisconnectTimeoutMS: 30000
+  ConnectionData:
+    Address: 127.0.0.1
+    Port: 7777
+    ServerListenAddress: 127.0.0.1
+  DebugSimulator:
+    PacketDelayMS: 0
+    PacketJitterMS: 0
+    PacketDropRate: 0

Assets/GWConquest/Prefabs/NetworkManager.prefab.meta

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

Assets/GWConquest/Prefabs/UI/BattleUnitIconFlank.prefab

@@ -5,8 +5,55 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 914397066647810572, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0.0000014305115
+      objectReference: {fileID: 0}
+    - target: {fileID: 914397066647810572, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0.00000166893
+      objectReference: {fileID: 0}
+    - target: {fileID: 914397066647810572, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 914397066647810572, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 968728054296979172, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -19.776
+      objectReference: {fileID: 0}
+    - target: {fileID: 968728054296979172, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: -19.776
+      objectReference: {fileID: 0}
+    - target: {fileID: 968728054296979172, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0.18994904
+      objectReference: {fileID: 0}
+    - target: {fileID: 1305083518370968854, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_Type
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1305083518370968854, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 5e6069bf34313bc44aeccf43d98fb633,
+        type: 3}
     - target: {fileID: 1305083518370968854, guid: 70bba337c1bb2d64e83a214cd4a781ea,
         type: 3}
       propertyPath: m_Color.a
@@ -27,6 +74,52 @@ PrefabInstance:
       propertyPath: m_Color.r
       value: 0.021
       objectReference: {fileID: 0}
+    - target: {fileID: 1305083518370968854, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_RaycastPadding.w
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 1305083518370968854, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_RaycastPadding.x
+      value: 13
+      objectReference: {fileID: 0}
+    - target: {fileID: 1305083518370968854, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_RaycastPadding.y
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 1305083518370968854, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_RaycastPadding.z
+      value: 13
+      objectReference: {fileID: 0}
+    - target: {fileID: 1687732570946376586, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_Type
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1687732570946376586, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 9f2edd4e433e6984f812b1df92d53164,
+        type: 3}
+    - target: {fileID: 1687732570946376586, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_UseSpriteMesh
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1687732570946376586, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_RaycastPadding.x
+      value: 8.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 1687732570946376586, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_RaycastPadding.z
+      value: 8.5
+      objectReference: {fileID: 0}
     - target: {fileID: 1687732570946376588, guid: 70bba337c1bb2d64e83a214cd4a781ea,
         type: 3}
       propertyPath: m_Name
@@ -70,12 +163,12 @@ PrefabInstance:
     - target: {fileID: 1687732570946376589, guid: 70bba337c1bb2d64e83a214cd4a781ea,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 90
+      value: 120
       objectReference: {fileID: 0}
     - target: {fileID: 1687732570946376589, guid: 70bba337c1bb2d64e83a214cd4a781ea,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 90
+      value: 120
       objectReference: {fileID: 0}
     - target: {fileID: 1687732570946376589, guid: 70bba337c1bb2d64e83a214cd4a781ea,
         type: 3}
@@ -137,7 +230,136 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1687732571317619598, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1687732571317619598, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1687732571317619598, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1687732571317619598, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1687732571317619598, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -22
+      objectReference: {fileID: 0}
+    - target: {fileID: 1687732571317619598, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: -22
+      objectReference: {fileID: 0}
+    - target: {fileID: 1687732571317619598, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1687732571317619598, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1687732571317619599, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 2270891946058410284, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 2270891946058410284, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3200922839386725618, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3235150457380999153, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3527442623986464800, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3613406984414568876, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -20.0529
+      objectReference: {fileID: 0}
+    - target: {fileID: 3613406984414568876, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: -20.0529
+      objectReference: {fileID: 0}
+    - target: {fileID: 4477794739276850993, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 4477794739276850993, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5712662313723679478, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6876257253298647874, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6876257253298647874, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_Padding.x
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 6876257253298647874, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      propertyPath: m_Padding.z
+      value: 7
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 1687732570946376588, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1944167245271204771}
+    - targetCorrespondingSourceObject: {fileID: 1162488441138915787, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 5603113574183130447}
+    - targetCorrespondingSourceObject: {fileID: 1162488441138915787, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4170411342755423844}
+    - targetCorrespondingSourceObject: {fileID: 1162488441138915787, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 6660687591994652966}
   m_SourcePrefab: {fileID: 100100000, guid: 70bba337c1bb2d64e83a214cd4a781ea, type: 3}
 --- !u!1 &6000337078063549025 stripped
 GameObject:
@@ -159,3 +381,60 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   parameter: IsFlank
   value: 1
+--- !u!1 &6055230501786873894 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1162488441138915787, guid: 70bba337c1bb2d64e83a214cd4a781ea,
+    type: 3}
+  m_PrefabInstance: {fileID: 4911594431217981933}
+  m_PrefabAsset: {fileID: 0}
+--- !u!222 &5603113574183130447
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6055230501786873894}
+  m_CullTransparentMesh: 1
+--- !u!114 &4170411342755423844
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6055230501786873894}
+  m_Enabled: 0
+  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 5e6069bf34313bc44aeccf43d98fb633, 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 &6660687591994652966
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6055230501786873894}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0

Assets/GWConquest/Prefabs/UI/FlankUI.prefab

@@ -31,7 +31,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2893350996044003037}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -107,15 +106,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 472968272626717507}
-  - {fileID: 3529282704362558771}
   - {fileID: 335503723518179647}
   - {fileID: 8085052938175271119}
   - {fileID: 3536641625903406562}
   - {fileID: 2784919200071465695}
-  - {fileID: 6769882531712760617}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -137,16 +132,12 @@ MonoBehaviour:
   BattleFlank: {fileID: 0}
   IconPrefab: {fileID: 6000337078063549025, guid: 9ca2c2b7050c3254bb98a6cb77f2a4ba,
     type: 3}
-  Cols: 3
-  IconSize: 90
+  IconSize: 119.5
   Icons: []
-  LeftFrontline: {fileID: 6585815961174857102}
-  RightFrontline: {fileID: 7510832164935520711}
   CanvasGroup: {fileID: 8668185966868266328}
   DisabledAlpha: 0.25
   BombardedImageLeft: {fileID: 4435938290225379374}
   BombardedImageRight: {fileID: 9221938974357844206}
-  TitleText: {fileID: 5959453350297802611}
 --- !u!225 &8668185966868266328
 CanvasGroup:
   m_ObjectHideFlags: 0
@@ -161,7 +152,7 @@ CanvasGroup:
   m_IgnoreParentGroups: 0
 --- !u!95 &3457511166033474778
 Animator:
-  serializedVersion: 4
+  serializedVersion: 7
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -175,10 +166,12 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &4435938290225379374
 GameObject:
   m_ObjectHideFlags: 0
@@ -210,7 +203,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2893350996044003037}
-  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -286,7 +278,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2893350996044003037}
-  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}
@@ -331,238 +322,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!1 &6585815961174857102
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 472968272626717507}
-  - component: {fileID: 2361316980752577659}
-  - component: {fileID: 8890018705248931018}
-  m_Layer: 5
-  m_Name: LeftFrontline
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &472968272626717507
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6585815961174857102}
-  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: 0}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2893350996044003037}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 12, y: -4}
-  m_Pivot: {x: 0, y: 0.5}
---- !u!222 &2361316980752577659
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6585815961174857102}
-  m_CullTransparentMesh: 0
---- !u!114 &8890018705248931018
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6585815961174857102}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.475, g: 0.475, b: 0.475, a: 0.9098039}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 14825355531a6db458fc1344cc89c33f, type: 3}
-  m_Type: 2
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  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_ConstrainProportionsScale: 0
-  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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  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
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3529282704362558771}
-  - component: {fileID: 560951851619819243}
-  - component: {fileID: 5711850360176843061}
-  m_Layer: 5
-  m_Name: RightFrontline
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &3529282704362558771
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7510832164935520711}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2893350996044003037}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 12, y: -4}
-  m_Pivot: {x: 0, y: 0.5}
---- !u!222 &560951851619819243
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7510832164935520711}
-  m_CullTransparentMesh: 0
---- !u!114 &5711850360176843061
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7510832164935520711}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.475, g: 0.475, b: 0.475, a: 0.9098039}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 14825355531a6db458fc1344cc89c33f, type: 3}
-  m_Type: 2
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 2.32
 --- !u!1 &9221938974357844206
 GameObject:
   m_ObjectHideFlags: 0
@@ -594,7 +353,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2893350996044003037}
-  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}

Assets/GWConquest/Scenes/MainMenu.unity

@@ -67,9 +67,6 @@ LightmapSettings:
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
     m_TextureCompression: 1
-    m_FinalGather: 0
-    m_FinalGatherFiltering: 1
-    m_FinalGatherRayCount: 256
     m_ReflectionCompression: 2
     m_MixedBakeMode: 2
     m_BakeBackend: 1
@@ -154,7 +151,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1404649293}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.4, y: 0}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -236,7 +232,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 552841626}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.4, y: 0}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -318,7 +313,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 696770047}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.4, y: 0}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -529,7 +523,6 @@ RectTransform:
   m_Children:
   - {fileID: 2048530898}
   m_Father: {fileID: 832321102}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -673,7 +666,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1960756184}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0.4, y: 1}
@@ -883,6 +875,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 268018651}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.20929843, y: -0.3571078, z: 0.08244483, w: 0.9065711}
   m_LocalPosition: {x: 3, y: 17, z: -47}
   m_LocalScale: {x: 1, y: 1, z: 1}
@@ -890,11 +883,10 @@ Transform:
   m_Children:
   - {fileID: 1009557743}
   m_Father: {fileID: 1604357700}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 26, y: -43, z: 0}
 --- !u!95 &268018653
 Animator:
-  serializedVersion: 5
+  serializedVersion: 7
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -908,6 +900,7 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
@@ -944,7 +937,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1094988521}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.4, y: 0.5}
   m_AnchorMax: {x: 1, y: 1}
@@ -1025,7 +1017,6 @@ RectTransform:
   - {fileID: 1392340833}
   - {fileID: 369580847}
   m_Father: {fileID: 1849321101}
-  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -1368,7 +1359,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 696770047}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.4, y: 0.5}
   m_AnchorMax: {x: 1, y: 1}
@@ -1448,7 +1438,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 832321102}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -1530,7 +1519,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1284332557}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -1612,7 +1600,6 @@ RectTransform:
   m_Children:
   - {fileID: 1758790514}
   m_Father: {fileID: 832321102}
-  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -2258,7 +2245,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 801791914}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -2344,7 +2330,6 @@ RectTransform:
   - {fileID: 1677167423}
   - {fileID: 96537301}
   m_Father: {fileID: 1849321101}
-  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2614,7 +2599,6 @@ RectTransform:
   m_Children:
   - {fileID: 1375437234}
   m_Father: {fileID: 565186568}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -2780,7 +2764,6 @@ RectTransform:
   - {fileID: 382693555}
   - {fileID: 111448041}
   m_Father: {fileID: 1142353829}
-  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3463,7 +3446,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1094988521}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0.4, y: 1}
@@ -3549,13 +3531,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 751511800}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &760498921
 GameObject:
@@ -3588,7 +3570,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2100979341}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.4, y: 0.5}
   m_AnchorMax: {x: 1, y: 1}
@@ -3670,7 +3651,6 @@ RectTransform:
   m_Children:
   - {fileID: 525377644}
   m_Father: {fileID: 832321102}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -3893,7 +3873,6 @@ RectTransform:
   - {fileID: 736075749}
   - {fileID: 565186568}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -3947,7 +3926,6 @@ RectTransform:
   - {fileID: 1068037758}
   - {fileID: 427024750}
   m_Father: {fileID: 1214876926}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.61}
   m_AnchorMax: {x: 0, y: 0.61}
@@ -4040,13 +4018,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 835318821}
+  serializedVersion: 2
   m_LocalRotation: {x: 0.26313123, y: 0.35527387, z: 0.18289918, w: 0.8781175}
   m_LocalPosition: {x: -4, y: 22, z: 4}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1604357700}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 19.400002, y: 49.778004, z: 32.600002}
 --- !u!1001 &881089744
 PrefabInstance:
@@ -4162,7 +4140,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1404649293}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.4, y: 0.5}
   m_AnchorMax: {x: 1, y: 1}
@@ -4242,7 +4219,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1960756184}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.4, y: 0.5}
   m_AnchorMax: {x: 1, y: 1}
@@ -4361,12 +4337,12 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 23220362021310944, guid: e4cc86a2911f81c4cafc54b909e0f521,
         type: 3}
-      propertyPath: m_Materials.Array.data[0]
+      propertyPath: 'm_Materials.Array.data[0]'
       value: 
       objectReference: {fileID: 2100000, guid: 08350e917e451ee4285766790451fd70, type: 2}
     - target: {fileID: 23817121319955596, guid: e4cc86a2911f81c4cafc54b909e0f521,
         type: 3}
-      propertyPath: m_Materials.Array.data[0]
+      propertyPath: 'm_Materials.Array.data[0]'
       value: 
       objectReference: {fileID: 2100000, guid: 9db5a3cfc49790c42bbd390321a2e25b, type: 2}
     - target: {fileID: 95556654896397108, guid: e4cc86a2911f81c4cafc54b909e0f521,
@@ -4410,7 +4386,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1404649293}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0.4, y: 1}
@@ -4540,13 +4515,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1009557740}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: -26}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 268018652}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1009557744
 MonoBehaviour:
@@ -4639,7 +4614,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 486268529}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -4719,7 +4693,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 832321102}
-  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -4799,7 +4772,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 696770047}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0.4, y: 1}
@@ -4879,7 +4851,6 @@ RectTransform:
   - {fileID: 322356567}
   - {fileID: 1138224882}
   m_Father: {fileID: 1142353829}
-  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -5000,7 +4971,6 @@ RectTransform:
   - {fileID: 1327907879}
   - {fileID: 722216232}
   m_Father: {fileID: 1142353829}
-  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -5038,7 +5008,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1094988521}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.4, y: 0}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -5125,7 +5094,6 @@ RectTransform:
   - {fileID: 1122547271}
   - {fileID: 717353447}
   m_Father: {fileID: 486268529}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -5375,7 +5343,6 @@ RectTransform:
   - {fileID: 832321102}
   - {fileID: 1812249646}
   m_Father: {fileID: 0}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -5415,7 +5382,6 @@ RectTransform:
   m_Children:
   - {fileID: 404644153}
   m_Father: {fileID: 832321102}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -5577,7 +5543,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2100979341}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0.4, y: 1}
@@ -5653,7 +5618,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 582359426}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -5735,7 +5699,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 565186568}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -6110,7 +6073,6 @@ RectTransform:
   - {fileID: 897281677}
   - {fileID: 51447869}
   m_Father: {fileID: 1849321101}
-  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -6231,7 +6193,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1649672913}
-  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -6538,7 +6499,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1960756184}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.4, y: 0}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -6610,6 +6570,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1604357699}
+  serializedVersion: 2
   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}
@@ -6620,7 +6581,6 @@ Transform:
   - {fileID: 1520065189}
   - {fileID: 675581559}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1649672912
 PrefabInstance:
@@ -6862,7 +6822,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 552841626}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.4, y: 0.5}
   m_AnchorMax: {x: 1, y: 1}
@@ -6911,103 +6870,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1677167422}
   m_CullTransparentMesh: 0
---- !u!1 &1689241557
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1689241560}
-  - component: {fileID: 1689241559}
-  - component: {fileID: 1689241558}
-  m_Layer: 0
-  m_Name: NetworkManager
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1689241558
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1689241557}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6960e84d07fb87f47956e7a81d71c4e6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_ProtocolType: 0
-  m_MaxPacketQueueSize: 128
-  m_MaxPayloadSize: 6144
-  m_HeartbeatTimeoutMS: 500
-  m_ConnectTimeoutMS: 1000
-  m_MaxConnectAttempts: 60
-  m_DisconnectTimeoutMS: 30000
-  ConnectionData:
-    Address: 127.0.0.1
-    Port: 7777
-    ServerListenAddress: 127.0.0.1
-  DebugSimulator:
-    PacketDelayMS: 0
-    PacketJitterMS: 0
-    PacketDropRate: 0
---- !u!114 &1689241559
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1689241557}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 593a2fe42fa9d37498c96f9a383b6521, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  NetworkConfig:
-    ProtocolVersion: 0
-    NetworkTransport: {fileID: 1689241558}
-    PlayerPrefab: {fileID: 0}
-    Prefabs:
-      NetworkPrefabsLists:
-      - {fileID: 11400000, guid: df94fd23d3398e54c9bd38ec5e26a04e, type: 2}
-    TickRate: 30
-    ClientConnectionBufferTimeout: 10
-    ConnectionApproval: 0
-    ConnectionData: 
-    EnableTimeResync: 0
-    TimeResyncInterval: 30
-    EnsureNetworkVariableLengthSafety: 0
-    EnableSceneManagement: 1
-    ForceSamePrefabs: 1
-    RecycleNetworkIds: 1
-    NetworkIdRecycleDelay: 120
-    RpcHashSize: 0
-    LoadSceneTimeOut: 120
-    SpawnTimeout: 1
-    EnableNetworkLogs: 1
-    OldPrefabList: []
-  RunInBackground: 1
-  LogLevel: 1
---- !u!4 &1689241560
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1689241557}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 1276.0392, y: 517.60614, z: 659.94507}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 7
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1758790513
 GameObject:
   m_ObjectHideFlags: 0
@@ -7039,7 +6901,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 427024750}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -7122,7 +6983,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 441014867}
-  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -7229,7 +7089,6 @@ RectTransform:
   m_Children:
   - {fileID: 486268529}
   m_Father: {fileID: 1214876926}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -7417,7 +7276,6 @@ RectTransform:
   - {fileID: 340678958}
   - {fileID: 1428777289}
   m_Father: {fileID: 486268529}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0.5, y: 1}
@@ -7835,13 +7693,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1921767103}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1927369520
 GameObject:
@@ -7874,7 +7732,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 552841626}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0.4, y: 1}
@@ -8083,7 +7940,6 @@ RectTransform:
   - {fileID: 899437687}
   - {fileID: 1533432983}
   m_Father: {fileID: 1142353829}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -8203,7 +8059,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 163596414}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -8285,7 +8140,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2100979341}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.4, y: 0}
   m_AnchorMax: {x: 1, y: 0.5}
@@ -8498,7 +8352,6 @@ RectTransform:
   - {fileID: 760498922}
   - {fileID: 2090963385}
   m_Father: {fileID: 1849321101}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -8708,13 +8561,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2140002581}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 321.50412, y: 650.54755, z: 820.7323}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &2140814058
 PrefabInstance:
@@ -8793,6 +8646,74 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9a1096a62ee865344a0549a465aa2f3e, type: 3}
+--- !u!1001 &2777280482330928112
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1964873977919645827, guid: 71c5b672ac1c6ef4dae59a8e08c7876f,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 1276.0392
+      objectReference: {fileID: 0}
+    - target: {fileID: 1964873977919645827, guid: 71c5b672ac1c6ef4dae59a8e08c7876f,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 517.60614
+      objectReference: {fileID: 0}
+    - target: {fileID: 1964873977919645827, guid: 71c5b672ac1c6ef4dae59a8e08c7876f,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 659.94507
+      objectReference: {fileID: 0}
+    - target: {fileID: 1964873977919645827, guid: 71c5b672ac1c6ef4dae59a8e08c7876f,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1964873977919645827, guid: 71c5b672ac1c6ef4dae59a8e08c7876f,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1964873977919645827, guid: 71c5b672ac1c6ef4dae59a8e08c7876f,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1964873977919645827, guid: 71c5b672ac1c6ef4dae59a8e08c7876f,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1964873977919645827, guid: 71c5b672ac1c6ef4dae59a8e08c7876f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1964873977919645827, guid: 71c5b672ac1c6ef4dae59a8e08c7876f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1964873977919645827, guid: 71c5b672ac1c6ef4dae59a8e08c7876f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2895585711290895149, guid: 71c5b672ac1c6ef4dae59a8e08c7876f,
+        type: 3}
+      propertyPath: m_Name
+      value: NetworkManager
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 71c5b672ac1c6ef4dae59a8e08c7876f, type: 3}
 --- !u!1001 &8879251650744149931
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -8953,3 +8874,15 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 90bfe4a417176ed4a9cafec61263a6fb, type: 3}
+--- !u!1660057539 &9223372036854775807
+SceneRoots:
+  m_ObjectHideFlags: 0
+  m_Roots:
+  - {fileID: 804547814}
+  - {fileID: 1214876926}
+  - {fileID: 1921767106}
+  - {fileID: 751511802}
+  - {fileID: 1604357700}
+  - {fileID: 2140814058}
+  - {fileID: 2140002583}
+  - {fileID: 2777280482330928112}

Assets/GWConquest/Scripts/Battle.cs

@@ -160,7 +160,7 @@ namespace GWConquest
             base.OnNetworkSpawn();
         }
 
-        private BattleFlank InstantiateNewFlank(int maxUnitCount)
+        private BattleFlank InstantiateNewFlank(int maxUnitCount, int rowCount)
         {
             GameObject go = Instantiate(BattleFlankPrefab);
             go.GetComponent<NetworkObject>().Spawn();
@@ -168,6 +168,7 @@ namespace GWConquest
             var flank = go.GetComponent<BattleFlank>();
             flank.Battle = this;
             flank.MaxUnitCount = maxUnitCount;
+            flank.RowCount = rowCount;
             return flank;
         }
 
@@ -175,8 +176,9 @@ namespace GWConquest
         {
             PreparingCooldown = GameManager.Instance.BattlePreparingCooldown;
 
-            flankCount.Value = Zone.zoneType == ZoneType.Ground ? 6 : 2;
-            int maxUnitPerFlank = Zone.zoneType == ZoneType.Ground ? 9 : 20;
+            flankCount.Value = Zone.zoneType == ZoneType.Ground ? 3 : 1;
+            int maxUnitPerFlank = Zone.zoneType == ZoneType.Ground ? 29 : 86;
+            int rowCount = Zone.zoneType == ZoneType.Ground ? 3 : 9;
 
             for (int i = 0; i < FlankCount; i++)
             {
@@ -186,19 +188,10 @@ namespace GWConquest
             var allPlayers = AllPlayers.ToList();
             if (allPlayers.Count() >= 2)
             {
-                for (int i = 0; i < flankCount.Value; i += 2)
+                for (int i = 0; i < flankCount.Value; i += 1)
                 {
-                    var flank1 = InstantiateNewFlank(maxUnitPerFlank);
-                    var flank2 = InstantiateNewFlank(maxUnitPerFlank);
-
-                    flank1.OpposingFlank = flank2;
-                    flank2.OpposingFlank = flank1;
-
-                    flank1.Player = allPlayers[0];
-                    flank2.Player = allPlayers[1];
-
-                    SetFlank((ushort)i, flank1);
-                    SetFlank((ushort)(i + 1), flank2);
+                    var flank = InstantiateNewFlank(maxUnitPerFlank, rowCount);
+                    SetFlank((ushort)i, flank);
                 }
             }
             else
@@ -449,8 +442,8 @@ namespace GWConquest
         private void PerformReveal(UnitAction action, Unit target)
         {
             var flank = action.Unit.CurrentFlank;
-            bool areOnOpposingFlanks = flank != null && flank.OpposingFlank == target.CurrentFlank;
-            float chance = areOnOpposingFlanks ? GameManager.Instance.RevealChanceFlank : GameManager.Instance.RevealChanceOther;
+            bool areOnSameFlank = flank != null && flank == target.CurrentFlank;
+            float chance = areOnSameFlank ? GameManager.Instance.RevealChanceFlank : GameManager.Instance.RevealChanceOther;
             if (!Check(chance))
                 return;
 
@@ -545,7 +538,7 @@ namespace GWConquest
 
             if (action.ActionType == UnitActionType.Combat && flank != null)
             {
-                targets = flank.OpposingFlank.Units;
+                targets = flank.Units.Where(u => u.Player != action.Unit.Player);
 
                 if (IsSpaceBattle)
                 {
@@ -581,7 +574,7 @@ namespace GWConquest
             }
             else if (action.ActionType == UnitActionType.Reveal)
             {
-                targets = flank.OpposingFlank.Units;
+                targets = flank.Units.Where(u => u.Player != action.Unit.Player);
 
                 targets = targets.Where(u => !u.Class.IsHero && !u.IsDead && u.RevealState != RevealState.Visible);
 
@@ -672,11 +665,7 @@ namespace GWConquest
 
         public void MoveUnitToFlank(Unit unit, BattleFlank flank, int flankIndex)
         {
-            if (flank.Player != unit.Player)
-            {
-                Debug.LogErrorFormat("Tried to move unit {0} of player {1} to flank {2} of player {3}", unit, unit.Player, flank, flank.Player);
-            }
-            else if (flank.MaxUnitCount <= flankIndex)
+            if (flank.MaxUnitCount <= flankIndex)
             {
                 Debug.LogErrorFormat("Tried to move unit {0} to flank index {1} on flank {2} with size {3}", unit, flankIndex, flank, flank.MaxUnitCount);
             }

Assets/GWConquest/Scripts/BattleFlank.cs

@@ -11,12 +11,13 @@ namespace GWConquest
         private NetworkVariable<NetworkBehaviourReference> battle = new NetworkVariable<NetworkBehaviourReference>();
         private NetworkVariable<ushort> flankID = new NetworkVariable<ushort>();
         private NetworkVariable<int> maxUnitCount = new NetworkVariable<int>();
-        private NetworkVariable<ushort> playerID = new NetworkVariable<ushort>();
+        private NetworkVariable<int> rowCount = new NetworkVariable<int>();
         private GWNetworkList<NullableNetworkBehaviourReference> units = new GWNetworkList<NullableNetworkBehaviourReference>();
-        private NetworkVariable<NetworkBehaviourReference> opposingFlank = new NetworkVariable<NetworkBehaviourReference>();
         private GWNetworkList<float> deathCooldowns = new GWNetworkList<float>();
 
 
+        public HexGrid hexGrid;
+
         public const int SlotsPerRowGround = 3;
         public const int SlotsPerRowSpace = 2;
 
@@ -43,16 +44,10 @@ namespace GWConquest
             set => maxUnitCount.Value = value;
         }
 
-        public BattleFlank OpposingFlank
+        public int RowCount
         {
-            get => opposingFlank.Value.GetBehaviour<BattleFlank>();
-            set => opposingFlank.Value = value;
-        }
-
-        public Player Player
-        {
-            get => Player.GetPlayerById(playerID.Value);
-            set => playerID.Value = value.PlayerId;
+            get => rowCount.Value;
+            set => rowCount.Value = value;
         }
 
         public Unit GetUnit(int index)
@@ -156,20 +151,84 @@ namespace GWConquest
 
         public override void OnNetworkSpawn()
         {
-            maxUnitCount.OnValueChanged += (oldVal, newVal) =>
+            maxUnitCount.OnValueChanged += (oldVal, newVal) => ResetGrid(newVal, rowCount.Value);
+            rowCount.OnValueChanged += (oldVal, newVal) => ResetGrid(maxUnitCount.Value, newVal);
+
+            base.OnNetworkSpawn();
+        }
+
+        private void ResetGrid(int _maxUnitCount, int _rowCount)
+        {
+            units.Clear();
+            deathCooldowns.Clear();
+
+            hexGrid = new HexGrid(_maxUnitCount, _rowCount);
+
+            for (int i = 0; i < _maxUnitCount; i++)
             {
-                units.Clear();
-                deathCooldowns.Clear();
+                units.Add(null);
+                deathCooldowns.Add(0f);
+            }
+        }
+    }
+
+    public class HexGrid
+    {
+        private int fieldCount;
+        private int rowCount;
+
+        private float columnCount;
+
+        private Vector2[] positions;
+
+        public HexGrid(int _fieldCount, int _rowCount)
+        {
+            fieldCount = _fieldCount;
+            rowCount = _rowCount;
 
-                for (int i = 0; i < newVal; i++)
+            int currentColumn = 0;
+            int currentField = 0;
+
+            float triHeight = Mathf.Sqrt(3f) / 2f;
+
+            positions = new Vector2[_fieldCount];
+
+            if(_fieldCount != 0 && _rowCount != 0)
+            {
+                while(currentField < _fieldCount)
                 {
-                    units.Add(null);
-                    deathCooldowns.Add(0f);
+                    for(int i = 0; i < _rowCount; i++)
+                    {
+                        if(i % 2 == currentColumn % 2)
+                        {
+                            positions[currentField] = new Vector2(currentColumn*0.5f, i*triHeight);
+                            Debug.Log($"Placing field {currentField} at position {positions[currentField]}");
+                            currentField++;
+                        }
+                        if(currentField >= _fieldCount)
+                        {
+                            break;
+                        }
+                    }
+                    if(currentField < _fieldCount)
+                    {
+                        currentColumn++;
+                    }
                 }
-            };
+            }
 
-            base.OnNetworkSpawn();
+            columnCount = currentColumn / 2f;
+        }
+
+        public Vector2 GetPosition(int index)
+        {
+            return positions[index];
         }
+
+        public int RowCount => rowCount;
+        public float ColumnCount => columnCount;
+
+
     }
 
 }

Assets/GWConquest/Scripts/DistrictRegistry.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using UnityEngine;
+using Unity.Netcode;
 
 namespace GWConquest
 {
@@ -43,9 +44,12 @@ namespace GWConquest
 
         void Awake()
         {
-            foreach (var entry in Entries)
+            if(NetworkManager.Singleton != null)
             {
-                EntryMap.Add(entry.type, entry);
+                foreach (var entry in Entries)
+                {
+                    EntryMap.Add(entry.type, entry);
+                }
             }
         }
 

Assets/GWConquest/Scripts/Editor/LoadEditorHooks.cs

@@ -1,5 +1,7 @@
 using UnityEditor;
 using UnityEngine;
+using UnityEngine.SceneManagement;
+using Unity.Netcode;
 
 namespace GWConquest
 {
@@ -13,6 +15,8 @@ namespace GWConquest
             districtGuiStyle.normal.textColor = Color.white;
             districtGuiStyle.fontSize = 16;
             SceneView.duringSceneGui += SceneView_duringSceneGui;
+
+            EditorApplication.playModeStateChanged += PlayModeStateChanged;
         }
 
         private static GUIStyle planetGuiStyle = new GUIStyle();
@@ -33,5 +37,34 @@ namespace GWConquest
                 }
             }
         }
+
+        private static void PlayModeStateChanged(PlayModeStateChange change)
+        {
+            if(change == PlayModeStateChange.EnteredPlayMode)
+            {
+                if(SceneManager.GetActiveScene().name == "GalaxyMap")
+                {
+                    Debug.Log("Injecting network manager");
+                    GameObject networkPrefab = AssetDatabase.LoadAssetAtPath<GameObject>("Assets/GWConquest/Prefabs/NetworkManager.prefab");
+
+                    GameOptions.OnAppLoad();
+                    GameOptions.ApplyOptions();
+
+                    Object.Instantiate(networkPrefab);
+
+                    Object.DontDestroyOnLoad(NetworkManager.Singleton.gameObject);
+                    NetworkManager.Singleton.OnServerStarted += ServerStartDone;
+
+                    NetworkManager.Singleton.StartHost();
+                }
+            }
+        }
+
+        private static void ServerStartDone()
+        {
+            Debug.Log("Server start done in injection");
+
+            NetworkManager.Singleton.SceneManager.LoadScene("GalaxyMap", UnityEngine.SceneManagement.LoadSceneMode.Single);
+        }
     }
 }

Assets/GWConquest/Scripts/FormationCategories.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
+using Unity.Netcode;
 
 namespace GWConquest
 {
@@ -51,9 +52,12 @@ namespace GWConquest
 
         void Awake()
         {
-            foreach (var entry in Entries)
+            if(NetworkManager.Singleton != null)
             {
-                CategoryMap.Add(entry.Category, entry);
+                foreach (var entry in Entries)
+                {
+                    CategoryMap.Add(entry.Category, entry);
+                }
             }
         }
 

Assets/GWConquest/Scripts/GameManager.cs

@@ -108,15 +108,18 @@ namespace GWConquest
 
         private void Awake()
         {
-            if (_instance == null)
+            if(NetworkManager.Singleton != null)
             {
-                _instance = this;
-            }
+                if (_instance == null)
+                {
+                    _instance = this;
+                }
 
-            UnitClass.LoadClassMap();
-            PlanetRegistry.Load();
+                UnitClass.LoadClassMap();
+                PlanetRegistry.Load();
 
-            BattleLog.Instance = new BattleLog();
+                BattleLog.Instance = new BattleLog();
+            }
         }
 
         public void ServerSceneLoadLocalDone()

Assets/GWConquest/Scripts/ItemRegistry.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using UnityEngine;
+using Unity.Netcode;
 
 namespace GWConquest
 {
@@ -43,15 +44,18 @@ namespace GWConquest
 
         private void Awake()
         {
-            foreach (ItemEntry e in Entries)
+            if(NetworkManager.Singleton != null)
             {
-                itemMap.Add(e.Name, e);
-            }
+                foreach (ItemEntry e in Entries)
+                {
+                    itemMap.Add(e.Name, e);
+                }
 
-            kFuel = IDFromName("Fuel");
-            kSupplies = IDFromName("Supplies");
-            kFood = IDFromName("Food");
-            kRecruits = IDFromName("Recruits");
+                kFuel = IDFromName("Fuel");
+                kSupplies = IDFromName("Supplies");
+                kFood = IDFromName("Food");
+                kRecruits = IDFromName("Recruits");
+            }
         }
 
         public ItemEntry GetEntry(string itemName)

Assets/GWConquest/Scripts/SpawnAIUnits.cs

@@ -23,7 +23,9 @@ namespace GWConquest
             {
                 for (int i = 0; i < unitCount; i++)
                 {
-                    var unit = GWNetworkManager.Instance.SpawnUnit(zone, UnitClass.FromName(unitName), player);
+                    UnitClass uc = UnitClass.FromName(unitName);
+                    Debug.Log($"Spawning a unit of {unitName} with id {uc.ID}");
+                    var unit = GWNetworkManager.Instance.SpawnUnit(zone, uc, player);
                     if (assignAsLeader)
                     {
                         unit.Formation.HeroUnit = unit;

Assets/GWConquest/Scripts/UI/BattleFlankUI.cs

@@ -12,21 +12,16 @@ namespace GWConquest
         public BattleFlank BattleFlank;
 
         public GameObject IconPrefab;
-        public int Cols = 3;
         public float IconSize;
 
         public BattleUnitIcon[] Icons;
 
-        public GameObject LeftFrontline;
-        public GameObject RightFrontline;
         public CanvasGroup CanvasGroup;
         public float DisabledAlpha;
 
         public GameObject BombardedImageLeft;
         public GameObject BombardedImageRight;
 
-        public Text TitleText;
-
         private BattleUI battleUI;
 
         public RectTransform RectTransform
@@ -43,17 +38,18 @@ namespace GWConquest
 
             var rt = RectTransform;
 
-            int rowCount = Mathf.CeilToInt((float)flank.MaxUnitCount / Cols);
-
             Icons = new BattleUnitIcon[flank.MaxUnitCount];
 
+            float triHeight = Mathf.Sqrt(3f) / 2f;
+            float iconHexSize = IconSize * triHeight;
+            float xOffset = (IconSize - iconHexSize) / 2f;
+
             for (int i = 0; i < flank.MaxUnitCount; i++)
             {
-                int ix = i % Cols;
-                int iy = (i - ix) / Cols;
+                Vector2 gridPos = flank.hexGrid.GetPosition(i);
 
-                float posx = IconSize * ix;
-                float posy = IconSize * iy;
+                float posx = iconHexSize * gridPos.x - xOffset;
+                float posy = iconHexSize * gridPos.y;
 
                 var pos = new Vector2(posx, -posy);
 
@@ -68,15 +64,15 @@ namespace GWConquest
                 icon.Flank = flank;
                 icon.FlankIndex = i;
 
-                if (flank.Player == Player.CurrentPlayer)
-                {
-                    icon.FlipIcon();
-                }
+                //if (flank.Player == Player.CurrentPlayer)
+                //{
+                //    icon.FlipIcon();
+                //}
 
                 Icons[i] = icon;
             }
 
-            rt.sizeDelta = new Vector2(Cols * IconSize, rowCount * IconSize);
+            rt.sizeDelta = new Vector2(flank.hexGrid.ColumnCount * iconHexSize, flank.hexGrid.RowCount * IconSize);
         }
 
         public void UpdateIcons()
@@ -92,18 +88,21 @@ namespace GWConquest
                 icon.UpdateIcon();
             }
 
-            bool hasUnits = BattleFlank.Units.Where(u => !u.IsDead).FirstOrDefault() != null;
-            var frontline = BattleFlank.Player == Player.CurrentPlayer ? RightFrontline : LeftFrontline;
-            frontline.SetActive(hasUnits);
+            var livingUnits = BattleFlank.Units.Where(u => !u.IsDead);
+            bool hasPlayerUnits = livingUnits.Where(u => u.Player == Player.CurrentPlayer).FirstOrDefault() != null;
+            bool hasEnemyUnits = livingUnits.Where(u => u.Player != Player.CurrentPlayer).FirstOrDefault() != null;
+            bool hasUnits = hasPlayerUnits || hasEnemyUnits;
             CanvasGroup.alpha = hasUnits ? 1.0f : DisabledAlpha;
 
-            bool shouldWarn = !hasUnits && BattleFlank.Player == Player.CurrentPlayer && BattleFlank.OpposingFlank.Units.Where(u => !u.IsDead).FirstOrDefault() != null;
+           // bool shouldWarn = !hasUnits && BattleFlank.Player == Player.CurrentPlayer && BattleFlank.OpposingFlank.Units.Where(u => !u.IsDead).FirstOrDefault() != null;
+            bool shouldWarn = !hasPlayerUnits && hasEnemyUnits;
             GetComponent<Animator>().SetBool("Warn", shouldWarn);
 
-            var otherPanel = BattleFlank.Player == Player.CurrentPlayer ? battleUI.EnemyPanel : battleUI.PlayerPanel;
-            var selectedUnit = otherPanel.SelectedUnit;
-            bool showAttack = !shouldWarn && selectedUnit != null && selectedUnit.IsShelling && selectedUnit.FlankTarget == BattleFlank;
-            GetComponent<Animator>().SetBool("Attack", showAttack);
+            
+            //var otherPanel = BattleFlank.Player == Player.CurrentPlayer ? battleUI.EnemyPanel : battleUI.PlayerPanel;
+            //var selectedUnit = otherPanel.SelectedUnit;
+            //bool showAttack = !shouldWarn && selectedUnit != null && selectedUnit.IsShelling && selectedUnit.FlankTarget == BattleFlank;
+            //GetComponent<Animator>().SetBool("Attack", showAttack);
         }
 
         public void OnIconDraggedToPanel(BattleUnitIcon icon, BattleArmyPanel panel)
@@ -117,7 +116,7 @@ namespace GWConquest
         // TODO increase performance
         private void FixedUpdate()
         {
-            if (BattleFlank != null)
+            /*if (BattleFlank != null)
             {
                 var BombardedImage = BattleFlank.Player == Player.CurrentPlayer ? BombardedImageLeft : BombardedImageRight;
 
@@ -129,7 +128,7 @@ namespace GWConquest
                 {
                     BombardedImage.SetActive(false);
                 }
-            }
+            }*/
         }
 
     }

Assets/GWConquest/Scripts/UI/BattleUI.cs

@@ -119,8 +119,10 @@ namespace GWConquest
 
             //float uiHeight = 1f;
 
-            FlankUIs = new BattleFlankUI[Battle.FlankCount];
-            for (int i = 0; i < Battle.FlankCount; i++)
+            int flankCount = Battle.FlankCount;
+
+            FlankUIs = new BattleFlankUI[flankCount];
+            for (int i = 0; i < flankCount; i++)
             {
                 var go = Instantiate(Battle.IsSpaceBattle ? FlankUIPrefabSpace : FlankUIPrefab);
 
@@ -138,53 +140,15 @@ namespace GWConquest
             }
 
             //float uiOffset = uiHeight / 2;
-
-
-            var PlayerUIs = FlankUIs.Where(ui => ui.BattleFlank.Player == Player.CurrentPlayer).ToList();
-            if (PlayerUIs.Count > 0)
-            {
-                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);
-                    ui.RectTransform.anchoredPosition = pos;
-
-                    if (i == 0)
-                    {
-                        ui.TitleText.text = "Allied Frontline";
-                        ui.TitleText.enabled = true;
-                    }
-                    else
-                    {
-                        ui.TitleText.enabled = false;
-                    }
-                }
-            }
-
-
-            var EnemyUIs = FlankUIs.Where(ui => ui.BattleFlank.Player != Player.CurrentPlayer).ToList();
-
-            if (EnemyUIs.Count > 0)
+            float startY = (flankCount - 1) / 2f * FlankUIOffset;
+            for (int i = 0; i < flankCount; i++)
             {
-                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);
-                    ui.RectTransform.anchoredPosition = pos;
-
-                    if (i == 0)
-                    {
-                        ui.TitleText.text = "Enemy Frontline";
-                        ui.TitleText.enabled = true;
-                    }
-                    else
-                    {
-                        ui.TitleText.enabled = false;
-                    }
-                }
+                var ui = FlankUIs[i];
+                var pos = new Vector2(0f, startY - i * FlankUIOffset);
+                ui.RectTransform.anchoredPosition = pos;
+                
             }
+            
 
             if (Battle.IsSpaceBattle)
             {
@@ -326,15 +290,13 @@ namespace GWConquest
                 var mousePos = Input.mousePosition;
                 foreach (var flankUI in FlankUIs)
                 {
-                    if (flankUI.BattleFlank.Player != Player.CurrentPlayer)
+                    var flankRT = flankUI.GetComponent<RectTransform>();
+                    var isSelected = RectTransformUtility.RectangleContainsScreenPoint(flankRT, mousePos);
+                    foreach (var icon in flankUI.Icons)
                     {
-                        var flankRT = flankUI.GetComponent<RectTransform>();
-                        var isSelected = RectTransformUtility.RectangleContainsScreenPoint(flankRT, mousePos);
-                        foreach (var icon in flankUI.Icons)
-                        {
-                            icon.GetComponent<Animator>().SetBool("Highlight", isSelected);
-                        }
+                        icon.GetComponent<Animator>().SetBool("Highlight", isSelected);
                     }
+                    
                 }
 
 
@@ -468,15 +430,13 @@ namespace GWConquest
                     {
                         foreach (var flankUI in FlankUIs)
                         {
-                            if (flankUI.BattleFlank.Player != Player.CurrentPlayer)
+                            if (RectTransformUtility.RectangleContainsScreenPoint(flankUI.GetComponent<RectTransform>(), mousePos))
                             {
-                                if (RectTransformUtility.RectangleContainsScreenPoint(flankUI.GetComponent<RectTransform>(), mousePos))
-                                {
-                                    hasTarget = true;
-                                    flank = flankUI.BattleFlank;
-                                    break;
-                                }
+                                hasTarget = true;
+                                flank = flankUI.BattleFlank;
+                                break;
                             }
+                            
                         }
                     }
 
@@ -495,16 +455,14 @@ namespace GWConquest
             if (Battle.IsSpaceBattle)
             {
                 var ownFlank = icon.Flank;
-                var opposingFlank = ownFlank.OpposingFlank;
-
                 int ownRow = icon.Unit.CurrentFlank.GetRowForUnit(icon.Unit);
                 int attackRange = icon.Unit.Class.AttackRange;
 
                 Debug.Log("Selecting icon on flank");
 
-                foreach (var flankIcon in opposingFlank.CurrentUI.Icons)
+                foreach (var flankIcon in ownFlank.CurrentUI.Icons)
                 {
-                    int row = opposingFlank.GetRowFromIndex(flankIcon.FlankIndex);
+                    int row = ownFlank.GetRowFromIndex(flankIcon.FlankIndex);
                     if (Mathf.Abs(row - ownRow) <= attackRange)
                     {
                         flankIcon.GetComponent<Animator>().SetBool("InRange", true);
@@ -521,9 +479,7 @@ namespace GWConquest
         {
             if (Battle.IsSpaceBattle)
             {
-                var opposingFlank = flank.OpposingFlank;
-
-                foreach (var flankIcon in opposingFlank.CurrentUI.Icons)
+                foreach (var flankIcon in flank.CurrentUI.Icons)
                 {
                     flankIcon.GetComponent<Animator>().SetBool("InRange", false);
                 }

Assets/GWConquest/Scripts/UI/IngameUI.cs

@@ -15,7 +15,18 @@ namespace GWConquest
             get => Instance != null && Instance.isInPauseMenu;
         }
 
-        public static IngameUI Instance { get; private set; }
+        private static IngameUI _instance;
+        public static IngameUI Instance
+        {
+            get
+            {
+                if (_instance == null)
+                {
+                    _instance = FindAnyObjectByType<IngameUI>();
+                }
+                return _instance;
+            }
+        } 
 
         public GalaxyMapUI PlanetHud;
         public PlanetViewUI PlanetView;
@@ -36,11 +47,6 @@ namespace GWConquest
 
         private bool isInPauseMenu = false;
 
-        private void Awake()
-        {
-            Instance = this;
-        }
-
         private void Start()
         {
             PlanetView.gameObject.SetActive(false);

Assets/GWConquest/Scripts/Zone.cs

@@ -96,9 +96,12 @@ namespace GWConquest
 
         private void Awake()
         {
-            if (zoneId != -1)
+            if(NetworkManager.Singleton != null)
             {
-                zoneDict[zoneId] = this;
+                if (zoneId != -1)
+                {
+                    zoneDict[zoneId] = this;
+                }
             }
         }
 

Assets/GWConquest/Textures/UI/hex.png.meta

@@ -0,0 +1,136 @@
+fileFormatVersion: 2
+guid: 9f2edd4e433e6984f812b1df92d53164
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 2
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 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: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/GWConquest/Textures/UI/hexfilled.png.meta

@@ -0,0 +1,136 @@
+fileFormatVersion: 2
+guid: 5e6069bf34313bc44aeccf43d98fb633
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    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
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 2
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  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
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 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: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Packages/manifest.json

@@ -5,7 +5,7 @@
     "com.unity.ai.navigation": "1.1.4",
     "com.unity.collab-proxy": "2.0.5",
     "com.unity.ide.rider": "3.0.24",
-    "com.unity.ide.visualstudio": "2.0.18",
+    "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.multiplayer.playmode": "0.1.1",
     "com.unity.multiplayer.tools": "1.1.0",
     "com.unity.netcode.gameobjects": "1.5.2",

Packages/packages-lock.json

@@ -71,7 +71,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.18",
+      "version": "2.0.22",
       "depth": 0,
       "source": "registry",
       "dependencies": {

ProjectSettings/ProjectSettings.asset

@@ -641,7 +641,7 @@ PlayerSettings:
     PS5: UNITY_POST_PROCESSING_STACK_V2
     QNX: UNITY_POST_PROCESSING_STACK_V2
     Stadia: UNITY_POST_PROCESSING_STACK_V2
-    Standalone: UNITY_POST_PROCESSING_STACK_V2;BOLT_CLOUD;BOLT_1_3_OR_NEWER;LETAI_TRUESHADOW
+    Standalone: UNITY_POST_PROCESSING_STACK_V2;LETAI_TRUESHADOW
     WebGL: UNITY_POST_PROCESSING_STACK_V2
     Windows Store Apps: UNITY_POST_PROCESSING_STACK_V2
     XboxOne: UNITY_POST_PROCESSING_STACK_V2