(WIP) Prefabs + Scene fixes

Assets/GWConquest/Prefabs/Battle.prefab

@@ -9,8 +9,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2057280478138210155}
-  - component: {fileID: 2057280478138210152}
   - component: {fileID: 2057280478138210153}
+  - component: {fileID: 1774817591229980703}
   m_Layer: 0
   m_Name: Battle
   m_TagString: Untagged
@@ -33,7 +33,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2057280478138210152
+--- !u!114 &2057280478138210153
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -42,27 +42,12 @@ MonoBehaviour:
   m_GameObject: {fileID: 2057280478138210166}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 155943207, guid: 5b00bf8b25851d440940a40ec23344f4, type: 3}
+  m_Script: {fileID: 11500000, guid: 702759caf9c0c0142bf15cb9cb079f0b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _sceneGuid: 
-  _serializerGuid: 4b486c12-bb55-4fb6-88f3-1a16218c67cf
-  _prefabId: 1
-  _updateRate: 1
-  _autoFreezeProxyFrames: 0
-  _clientPredicted: 1
-  _allowInstantiateOnClient: 1
-  _persistThroughSceneLoads: 0
-  _sceneObjectDestroyOnDetach: 1
-  _sceneObjectAutoAttach: 1
-  _alwaysProxy: 0
-  _detachOnDisable: 0
-  _allowFirstReplicationWhenFrozen: 0
-  _autoRemoveChildEntities: 0
-  _entityBehaviourQueryOption: 0
-  _entityPriorityCalculatorQueryOption: 1
-  _entityReplicationFilterQueryOption: 1
---- !u!114 &2057280478138210153
+  BattleFlankPrefab: {fileID: 4026633161700752889, guid: 4f91d7eec3642cc4982e522a499f293f,
+    type: 3}
+--- !u!114 &1774817591229980703
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -71,6 +56,14 @@ MonoBehaviour:
   m_GameObject: {fileID: 2057280478138210166}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 702759caf9c0c0142bf15cb9cb079f0b, type: 3}
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 951099334
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1

Assets/GWConquest/Prefabs/BattleFlank.prefab

@@ -9,8 +9,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4026633161700752890}
-  - component: {fileID: 4026633161700752891}
   - component: {fileID: 4026633161700752888}
+  - component: {fileID: 2096098314145586359}
   m_Layer: 0
   m_Name: BattleFlank
   m_TagString: Untagged
@@ -33,7 +33,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &4026633161700752891
+--- !u!114 &4026633161700752888
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -42,27 +42,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 4026633161700752889}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 155943207, guid: 5b00bf8b25851d440940a40ec23344f4, type: 3}
+  m_Script: {fileID: 11500000, guid: f093b72b12558464da001cae0eb2ae7c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _sceneGuid: 
-  _serializerGuid: b15bfd78-d5db-4d5f-b238-6a1404090291
-  _prefabId: 2
-  _updateRate: 1
-  _autoFreezeProxyFrames: 0
-  _clientPredicted: 1
-  _allowInstantiateOnClient: 1
-  _persistThroughSceneLoads: 0
-  _sceneObjectDestroyOnDetach: 1
-  _sceneObjectAutoAttach: 1
-  _alwaysProxy: 0
-  _detachOnDisable: 0
-  _allowFirstReplicationWhenFrozen: 0
-  _autoRemoveChildEntities: 0
-  _entityBehaviourQueryOption: 0
-  _entityPriorityCalculatorQueryOption: 1
-  _entityReplicationFilterQueryOption: 1
---- !u!114 &4026633161700752888
+--- !u!114 &2096098314145586359
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -71,6 +54,14 @@ MonoBehaviour:
   m_GameObject: {fileID: 4026633161700752889}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f093b72b12558464da001cae0eb2ae7c, type: 3}
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 951099334
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1

Assets/GWConquest/Prefabs/District.prefab

@@ -9,10 +9,10 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3449669334620252872}
-  - component: {fileID: 3697761119748834742}
   - component: {fileID: 4941434942006963670}
   - component: {fileID: 2620233160227347941}
   - component: {fileID: -3152259667834603798}
+  - component: {fileID: 1137558173936528475}
   m_Layer: 0
   m_Name: District
   m_TagString: Untagged
@@ -35,35 +35,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3697761119748834742
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1519560224452675769}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 155943207, guid: 5b00bf8b25851d440940a40ec23344f4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _sceneGuid: 
-  _serializerGuid: 593f7749-42a7-44fa-b61f-4bec598bae21
-  _prefabId: 3
-  _updateRate: 1
-  _autoFreezeProxyFrames: 0
-  _clientPredicted: 1
-  _allowInstantiateOnClient: 1
-  _persistThroughSceneLoads: 0
-  _sceneObjectDestroyOnDetach: 1
-  _sceneObjectAutoAttach: 1
-  _alwaysProxy: 0
-  _detachOnDisable: 0
-  _allowFirstReplicationWhenFrozen: 0
-  _autoRemoveChildEntities: 0
-  _entityBehaviourQueryOption: 0
-  _entityPriorityCalculatorQueryOption: 1
-  _entityReplicationFilterQueryOption: 1
 --- !u!114 &4941434942006963670
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -113,3 +84,23 @@ MonoBehaviour:
   MaxRadius: 15
   MinDelay: 0
   MaxDelay: 3
+--- !u!114 &1137558173936528475
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1519560224452675769}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 951099334
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1

Assets/GWConquest/Prefabs/Factory.prefab

@@ -12,8 +12,8 @@ GameObject:
   - component: {fileID: 7080609719325669056}
   - component: {fileID: 8496026405921973180}
   - component: {fileID: 7954319019618919355}
-  - component: {fileID: 3732992427129260454}
   - component: {fileID: 3375267946260043055}
+  - component: {fileID: -8282867456596273977}
   m_Layer: 0
   m_Name: Factory
   m_TagString: Untagged
@@ -65,6 +65,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   StartsBroken: 0
   SpecialUnits: []
+  MaxQueueLength: 0
 --- !u!114 &7954319019618919355
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -83,7 +84,7 @@ MonoBehaviour:
   DistrictType: 0
   DistrictLevel: 0
   Planet: {fileID: 0}
---- !u!114 &3732992427129260454
+--- !u!114 &3375267946260043055
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -92,27 +93,14 @@ MonoBehaviour:
   m_GameObject: {fileID: 1355812926097278600}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 155943207, guid: 5b00bf8b25851d440940a40ec23344f4, type: 3}
+  m_Script: {fileID: 11500000, guid: b7e92c596a7a38047bd6992555774d64, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _sceneGuid: 
-  _serializerGuid: 5b40b0d7-d27b-4407-968a-c0f4c722eb67
-  _prefabId: 4
-  _updateRate: 1
-  _autoFreezeProxyFrames: 0
-  _clientPredicted: 1
-  _allowInstantiateOnClient: 1
-  _persistThroughSceneLoads: 0
-  _sceneObjectDestroyOnDetach: 1
-  _sceneObjectAutoAttach: 1
-  _alwaysProxy: 0
-  _detachOnDisable: 0
-  _allowFirstReplicationWhenFrozen: 0
-  _autoRemoveChildEntities: 0
-  _entityBehaviourQueryOption: 0
-  _entityPriorityCalculatorQueryOption: 1
-  _entityReplicationFilterQueryOption: 1
---- !u!114 &3375267946260043055
+  Prefab: {fileID: 697270919620692323, guid: ac556b9cdb5af11409741104d7aaf9b0, type: 3}
+  MaxRadius: 15
+  MinDelay: 0
+  MaxDelay: 3
+--- !u!114 &-8282867456596273977
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -121,10 +109,14 @@ MonoBehaviour:
   m_GameObject: {fileID: 1355812926097278600}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b7e92c596a7a38047bd6992555774d64, type: 3}
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Prefab: {fileID: 697270919620692323, guid: ac556b9cdb5af11409741104d7aaf9b0, type: 3}
-  MaxRadius: 15
-  MinDelay: 0
-  MaxDelay: 3
+  GlobalObjectIdHash: 951099334
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1

Assets/GWConquest/Prefabs/Formation.prefab

@@ -10,7 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8292977142823461081}
   - component: {fileID: 8292977142823461083}
-  - component: {fileID: -4037000077425190141}
+  - component: {fileID: 6620462663865698518}
   m_Layer: 0
   m_Name: Formation
   m_TagString: Untagged
@@ -49,7 +49,7 @@ MonoBehaviour:
     type: 3}
   movingArmyScale: 0.85
   keepFormationName: 0
---- !u!114 &-4037000077425190141
+--- !u!114 &6620462663865698518
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -58,23 +58,14 @@ MonoBehaviour:
   m_GameObject: {fileID: 8292977142823461082}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 155943207, guid: 5b00bf8b25851d440940a40ec23344f4, type: 3}
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _sceneGuid: 
-  _serializerGuid: d7ecbbfb-2aa4-41e6-b745-72f55b565b31
-  _prefabId: 5
-  _updateRate: 1
-  _autoFreezeProxyFrames: 0
-  _clientPredicted: 1
-  _allowInstantiateOnClient: 1
-  _persistThroughSceneLoads: 0
-  _sceneObjectDestroyOnDetach: 1
-  _sceneObjectAutoAttach: 1
-  _alwaysProxy: 0
-  _detachOnDisable: 0
-  _allowFirstReplicationWhenFrozen: 0
-  _autoRemoveChildEntities: 0
-  _entityBehaviourQueryOption: 0
-  _entityPriorityCalculatorQueryOption: 1
-  _entityReplicationFilterQueryOption: 1
+  GlobalObjectIdHash: 951099334
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1

Assets/GWConquest/Prefabs/NetworkPrefabsList.asset

@@ -0,0 +1,64 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e651dbb3fbac04af2b8f5abf007ddc23, type: 3}
+  m_Name: NetworkPrefabsList
+  m_EditorClassIdentifier: 
+  IsDefault: 0
+  List:
+  - Override: 0
+    Prefab: {fileID: 8890686142670377634, guid: e369f02fbeb5a9046aaa40a9b89a8973,
+      type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 8292977142823461082, guid: 6af4ad43e05dcb344bfd726895735387,
+      type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 3262827332414082260, guid: f05198a1b03fe2b4e8042a9349c41aa3,
+      type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 4678135251219452000, guid: 9ae35d7f911b63f4f95f432141dd5746,
+      type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 1519560224452675769, guid: ff49bfd3e408771468b4722c5fde646d,
+      type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 1355812926097278600, guid: fc3eae9e9964d5446a5c38fbf9a203bb,
+      type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 2057280478138210166, guid: 12e1714c02c111f4e9d6981ad8f8036b,
+      type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}
+  - Override: 0
+    Prefab: {fileID: 4026633161700752889, guid: 4f91d7eec3642cc4982e522a499f293f,
+      type: 3}
+    SourcePrefabToOverride: {fileID: 0}
+    SourceHashToOverride: 0
+    OverridingTargetPrefab: {fileID: 0}

Assets/GWConquest/Prefabs/NetworkPrefabsList.asset.meta

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

Assets/GWConquest/Prefabs/Planet.prefab

@@ -98,6 +98,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!120 &9063450203288621825
 LineRenderer:
+  serializedVersion: 2
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -223,16 +224,20 @@ LineRenderer:
       atime6: 0
       atime7: 0
       m_Mode: 0
+      m_ColorSpace: -1
       m_NumColorKeys: 2
       m_NumAlphaKeys: 2
     numCornerVertices: 0
     numCapVertices: 0
     alignment: 0
     textureMode: 0
+    textureScale: {x: 1, y: 1}
     shadowBias: 0.5
     generateLightingData: 0
+  m_MaskInteraction: 0
   m_UseWorldSpace: 0
   m_Loop: 1
+  m_ApplyActiveColorSpace: 0
 --- !u!1 &4678135251219452000
 GameObject:
   m_ObjectHideFlags: 0
@@ -244,7 +249,7 @@ GameObject:
   - component: {fileID: 4678135251219451999}
   - component: {fileID: 4678135251219451998}
   - component: {fileID: 4678135251219452001}
-  - component: {fileID: 8925700613145171218}
+  - component: {fileID: 4699652535292453309}
   m_Layer: 0
   m_Name: Planet
   m_TagString: Untagged
@@ -327,7 +332,7 @@ MonoBehaviour:
   InTransitFormations: []
   VisibilityStatus: 0
   connections: []
---- !u!114 &8925700613145171218
+--- !u!114 &4699652535292453309
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -336,26 +341,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 4678135251219452000}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 155943207, guid: 5b00bf8b25851d440940a40ec23344f4, type: 3}
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _sceneGuid: 
-  _serializerGuid: 24a9f35a-88f4-4200-8b54-5af945d76586
-  _prefabId: 6
-  _updateRate: 1
-  _autoFreezeProxyFrames: 0
-  _clientPredicted: 1
-  _allowInstantiateOnClient: 1
-  _persistThroughSceneLoads: 0
-  _sceneObjectDestroyOnDetach: 1
-  _sceneObjectAutoAttach: 1
-  _alwaysProxy: 0
-  _detachOnDisable: 0
-  _allowFirstReplicationWhenFrozen: 0
-  _autoRemoveChildEntities: 0
-  _entityBehaviourQueryOption: 0
-  _entityPriorityCalculatorQueryOption: 1
-  _entityReplicationFilterQueryOption: 1
+  GlobalObjectIdHash: 951099334
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
 --- !u!1 &4678135251355824058
 GameObject:
   m_ObjectHideFlags: 0
@@ -565,6 +561,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!120 &5980546624515681467
 LineRenderer:
+  serializedVersion: 2
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -730,16 +727,20 @@ LineRenderer:
       atime6: 0
       atime7: 0
       m_Mode: 0
+      m_ColorSpace: -1
       m_NumColorKeys: 2
       m_NumAlphaKeys: 2
     numCornerVertices: 0
     numCapVertices: 0
     alignment: 0
     textureMode: 0
+    textureScale: {x: 1, y: 1}
     shadowBias: 0.5
     generateLightingData: 0
+  m_MaskInteraction: 0
   m_UseWorldSpace: 0
   m_Loop: 1
+  m_ApplyActiveColorSpace: 0
 --- !u!1 &8529789795141961521
 GameObject:
   m_ObjectHideFlags: 0
@@ -832,9 +833,17 @@ MeshCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8529789795141961521}
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
   m_IsTrigger: 0
+  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 4
+  serializedVersion: 5
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}

Assets/GWConquest/Prefabs/Player.prefab

@@ -9,8 +9,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 3262827332414082258}
-  - component: {fileID: 3262827332414082259}
   - component: {fileID: -3762956886024860011}
+  - component: {fileID: -243355135019493022}
   m_Layer: 0
   m_Name: Player
   m_TagString: Untagged
@@ -33,7 +33,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3262827332414082259
+--- !u!114 &-3762956886024860011
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -42,27 +42,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 3262827332414082260}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 155943207, guid: 5b00bf8b25851d440940a40ec23344f4, type: 3}
+  m_Script: {fileID: 11500000, guid: 20d3cb8281e4f064fa4d895ea9ddea7d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _sceneGuid: 
-  _serializerGuid: 59871d26-b925-463a-99f3-d6305974e7c3
-  _prefabId: 7
-  _updateRate: 1
-  _autoFreezeProxyFrames: 0
-  _clientPredicted: 1
-  _allowInstantiateOnClient: 1
-  _persistThroughSceneLoads: 0
-  _sceneObjectDestroyOnDetach: 1
-  _sceneObjectAutoAttach: 1
-  _alwaysProxy: 0
-  _detachOnDisable: 0
-  _allowFirstReplicationWhenFrozen: 0
-  _autoRemoveChildEntities: 0
-  _entityBehaviourQueryOption: 0
-  _entityPriorityCalculatorQueryOption: 1
-  _entityReplicationFilterQueryOption: 1
---- !u!114 &-3762956886024860011
+--- !u!114 &-243355135019493022
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -71,6 +54,14 @@ MonoBehaviour:
   m_GameObject: {fileID: 3262827332414082260}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 20d3cb8281e4f064fa4d895ea9ddea7d, type: 3}
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  GlobalObjectIdHash: 951099334
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1

Assets/GWConquest/Prefabs/Unit.prefab

@@ -10,7 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8890686142670377632}
   - component: {fileID: 8890686142670377633}
-  - component: {fileID: -3863603441789603356}
+  - component: {fileID: -8886131445288521566}
   m_Layer: 0
   m_Name: Unit
   m_TagString: Untagged
@@ -45,7 +45,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 65b654ad4a8cabc4cba78b1374a0ca27, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &-3863603441789603356
+--- !u!114 &-8886131445288521566
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -54,23 +54,14 @@ MonoBehaviour:
   m_GameObject: {fileID: 8890686142670377634}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 155943207, guid: 5b00bf8b25851d440940a40ec23344f4, type: 3}
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _sceneGuid: 
-  _serializerGuid: a3b5f966-83ae-4493-ac8f-90de2095ea63
-  _prefabId: 8
-  _updateRate: 1
-  _autoFreezeProxyFrames: 0
-  _clientPredicted: 1
-  _allowInstantiateOnClient: 1
-  _persistThroughSceneLoads: 0
-  _sceneObjectDestroyOnDetach: 1
-  _sceneObjectAutoAttach: 1
-  _alwaysProxy: 0
-  _detachOnDisable: 0
-  _allowFirstReplicationWhenFrozen: 0
-  _autoRemoveChildEntities: 0
-  _entityBehaviourQueryOption: 0
-  _entityPriorityCalculatorQueryOption: 1
-  _entityReplicationFilterQueryOption: 1
+  GlobalObjectIdHash: 951099334
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  SpawnWithObservers: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1

Assets/GWConquest/Scenes/MainMenu.unity

@@ -104,7 +104,7 @@ NavMeshSettings:
   serializedVersion: 2
   m_ObjectHideFlags: 0
   m_BuildSettings:
-    serializedVersion: 2
+    serializedVersion: 3
     agentTypeID: 0
     agentRadius: 0.5
     agentHeight: 2
@@ -117,7 +117,7 @@ NavMeshSettings:
     cellSize: 0.16666667
     manualTileSize: 0
     tileSize: 256
-    accuratePlacement: 0
+    buildHeightMesh: 0
     maxJobWorkers: 0
     preserveTilesOutsideBounds: 0
     debug:
@@ -372,6 +372,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 1142353829}
     m_Modifications:
     - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
@@ -485,6 +486,9 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3}
 --- !u!224 &115741329 stripped
 RectTransform:
@@ -731,6 +735,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 1142353829}
     m_Modifications:
     - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
@@ -844,6 +849,9 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3}
 --- !u!224 &226618385 stripped
 RectTransform:
@@ -886,7 +894,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 26, y: -43, z: 0}
 --- !u!95 &268018653
 Animator:
-  serializedVersion: 4
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -903,7 +911,8 @@ Animator:
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &322356566
 GameObject:
   m_ObjectHideFlags: 0
@@ -1028,6 +1037,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 340678958}
     m_Modifications:
     - target: {fileID: 3716205313112525215, guid: dabe742b93a0bc04eb893ae186d021c7,
@@ -1311,6 +1321,9 @@ PrefabInstance:
       objectReference: {fileID: 21300000, guid: db080e8297c115546801697e279ca0d2,
         type: 3}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: dabe742b93a0bc04eb893ae186d021c7, type: 3}
 --- !u!224 &369580847 stripped
 RectTransform:
@@ -1705,6 +1718,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 1122547271}
     m_Modifications:
     - target: {fileID: 3716205313112525200, guid: dabe742b93a0bc04eb893ae186d021c7,
@@ -2024,6 +2038,17 @@ PrefabInstance:
       objectReference: {fileID: 21300000, guid: d03e6e007c6477640a67e65ac6ee5823,
         type: 3}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 3716205313618171889, guid: dabe742b93a0bc04eb893ae186d021c7,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1798018173}
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 3716205313618171890, guid: dabe742b93a0bc04eb893ae186d021c7,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 441014869}
   m_SourcePrefab: {fileID: 100100000, guid: dabe742b93a0bc04eb893ae186d021c7, type: 3}
 --- !u!224 &441014867 stripped
 RectTransform:
@@ -2056,6 +2081,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 1812249646}
     m_Modifications:
     - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
@@ -2179,6 +2205,21 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1017117800}
+    - targetCorrespondingSourceObject: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1849321101}
+    - targetCorrespondingSourceObject: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1142353829}
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3}
 --- !u!224 &486268529 stripped
 RectTransform:
@@ -2397,6 +2438,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 804547814}
     m_Modifications:
     - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
@@ -2515,6 +2557,17 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1381217585}
+    - targetCorrespondingSourceObject: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 582359426}
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3}
 --- !u!224 &565186568 stripped
 RectTransform:
@@ -2821,6 +2874,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 1142353829}
     m_Modifications:
     - target: {fileID: 116803036596692165, guid: 33c4cb604a7a3db48b51a358e1d9692a,
@@ -2994,6 +3048,9 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 33c4cb604a7a3db48b51a358e1d9692a, type: 3}
 --- !u!224 &717353447 stripped
 RectTransform:
@@ -3006,6 +3063,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 1122547271}
     m_Modifications:
     - target: {fileID: 3716205313112525200, guid: dabe742b93a0bc04eb893ae186d021c7,
@@ -3334,6 +3392,9 @@ PrefabInstance:
       objectReference: {fileID: 21300000, guid: d03e6e007c6477640a67e65ac6ee5823,
         type: 3}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: dabe742b93a0bc04eb893ae186d021c7, type: 3}
 --- !u!224 &722216232 stripped
 RectTransform:
@@ -3811,7 +3872,9 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
@@ -3990,6 +4053,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 1604357700}
     m_Modifications:
     - target: {fileID: 3616944061424679977, guid: 14229f06e6aafa148bfa5d9f50fcc726,
@@ -4063,6 +4127,9 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 14229f06e6aafa148bfa5d9f50fcc726, type: 3}
 --- !u!1 &897281676
 GameObject:
@@ -4229,6 +4296,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 1604357700}
     m_Modifications:
     - target: {fileID: 1997016638684582, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3}
@@ -4307,6 +4375,9 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3}
 --- !u!1 &953215318
 GameObject:
@@ -4425,9 +4496,17 @@ Camera:
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
   m_SensorSize: {x: 36, y: 24}
   m_LensShift: {x: 0, y: 0}
-  m_FocalLength: 50
   m_NormalizedViewPortRect:
     serializedVersion: 2
     x: 0
@@ -5075,6 +5154,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 1142353829}
     m_Modifications:
     - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
@@ -5188,6 +5268,9 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3}
 --- !u!224 &1193408426 stripped
 RectTransform:
@@ -5271,7 +5354,9 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
   m_TargetDisplay: 0
@@ -5704,6 +5789,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 340678958}
     m_Modifications:
     - target: {fileID: 3716205313112525215, guid: dabe742b93a0bc04eb893ae186d021c7,
@@ -5973,6 +6059,9 @@ PrefabInstance:
       objectReference: {fileID: 21300000, guid: 55567c94879cfb847b24036af33b60a3,
         type: 3}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: dabe742b93a0bc04eb893ae186d021c7, type: 3}
 --- !u!224 &1392340833 stripped
 RectTransform:
@@ -6168,6 +6257,7 @@ VideoPlayer:
   m_RenderMode: 2
   m_AspectRatio: 3
   m_DataSource: 0
+  m_TimeUpdateMode: 2
   m_PlaybackSpeed: 0.78
   m_AudioOutputMode: 0
   m_TargetAudioSources: []
@@ -6222,6 +6312,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 1849321101}
     m_Modifications:
     - target: {fileID: 116803036596692165, guid: 33c4cb604a7a3db48b51a358e1d9692a,
@@ -6400,6 +6491,9 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 33c4cb604a7a3db48b51a358e1d9692a, type: 3}
 --- !u!224 &1428777289 stripped
 RectTransform:
@@ -6533,6 +6627,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 340678958}
     m_Modifications:
     - target: {fileID: 3716205313441383054, guid: dabe742b93a0bc04eb893ae186d021c7,
@@ -6716,6 +6811,13 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 3716205313618171889, guid: dabe742b93a0bc04eb893ae186d021c7,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1427117528}
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: dabe742b93a0bc04eb893ae186d021c7, type: 3}
 --- !u!224 &1649672913 stripped
 RectTransform:
@@ -6809,6 +6911,103 @@ 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
@@ -6949,6 +7148,7 @@ VideoPlayer:
   m_RenderMode: 2
   m_AspectRatio: 3
   m_DataSource: 0
+  m_TimeUpdateMode: 2
   m_PlaybackSpeed: 0.78
   m_AudioOutputMode: 0
   m_TargetAudioSources: []
@@ -7055,6 +7255,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 1849321101}
     m_Modifications:
     - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
@@ -7168,6 +7369,9 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3}
 --- !u!224 &1835244094 stripped
 RectTransform:
@@ -7242,6 +7446,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 1122547271}
     m_Modifications:
     - target: {fileID: 3716205313112525200, guid: dabe742b93a0bc04eb893ae186d021c7,
@@ -7560,6 +7765,9 @@ PrefabInstance:
       objectReference: {fileID: 21300000, guid: d03e6e007c6477640a67e65ac6ee5823,
         type: 3}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: dabe742b93a0bc04eb893ae186d021c7, type: 3}
 --- !u!1 &1876093820 stripped
 GameObject:
@@ -7597,6 +7805,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_SendPointerHoverToParent: 1
   m_HorizontalAxis: Horizontal
   m_VerticalAxis: Vertical
   m_SubmitButton: Submit
@@ -7715,6 +7924,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 1849321101}
     m_Modifications:
     - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
@@ -7828,6 +8038,9 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3}
 --- !u!224 &1938498993 stripped
 RectTransform:
@@ -8126,6 +8339,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 1849321101}
     m_Modifications:
     - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47,
@@ -8239,6 +8453,9 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3}
 --- !u!224 &2093464100 stripped
 RectTransform:
@@ -8504,6 +8721,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: 112406, guid: 9a1096a62ee865344a0549a465aa2f3e, type: 3}
@@ -8571,12 +8789,16 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 9a1096a62ee865344a0549a465aa2f3e, type: 3}
 --- !u!1001 &8879251650744149931
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 804547814}
     m_Modifications:
     - target: {fileID: 1511538158, guid: 90bfe4a417176ed4a9cafec61263a6fb, type: 3}
@@ -8727,4 +8949,7 @@ PrefabInstance:
       value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 90bfe4a417176ed4a9cafec61263a6fb, type: 3}

Assets/GWConquest/Scripts/Battle.cs

@@ -10,14 +10,14 @@ namespace GWConquest
 {
     public class Battle : NetworkBehaviour
     {
-        private GWNetworkList<NetworkBehaviourReference> formations;
-        private NetworkVariable<int> zoneID;
-        private NetworkVariable<FixedString128Bytes> battleName;
-        private GWNetworkList<NetworkBehaviourReference> flanks;
-        private NetworkVariable<int> flankCount;
-        private NetworkVariable<bool> isOver;
-        private NetworkVariable<int> victorID;
-        private NetworkVariable<float> preparingCooldown;
+        private GWNetworkList<NetworkBehaviourReference> formations = new GWNetworkList<NetworkBehaviourReference>();
+        private NetworkVariable<int> zoneID = new NetworkVariable<int>();
+        private NetworkVariable<FixedString128Bytes> battleName = new NetworkVariable<FixedString128Bytes>();
+        private GWNetworkList<NetworkBehaviourReference> flanks = new GWNetworkList<NetworkBehaviourReference>();
+        private NetworkVariable<int> flankCount = new NetworkVariable<int>();
+        private NetworkVariable<bool> isOver = new NetworkVariable<bool>();
+        private NetworkVariable<int> victorID = new NetworkVariable<int>();
+        private NetworkVariable<float> preparingCooldown = new NetworkVariable<float>();
 
         public GameObject BattleFlankPrefab;
 

Assets/GWConquest/Scripts/BattleFlank.cs

@@ -8,13 +8,13 @@ namespace GWConquest {
 
     public class BattleFlank : NetworkBehaviour
     {
-        private NetworkVariable<NetworkBehaviourReference> battle;
-        private NetworkVariable<ushort> flankID;
-        private NetworkVariable<int> maxUnitCount;
-        private NetworkVariable<ushort> playerID;
-        private GWNetworkList<NullableNetworkBehaviourReference> units;
-        private NetworkVariable<NetworkBehaviourReference> opposingFlank;
-        private GWNetworkList<float> deathCooldowns;
+        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 GWNetworkList<NullableNetworkBehaviourReference> units = new GWNetworkList<NullableNetworkBehaviourReference>();
+        private NetworkVariable<NetworkBehaviourReference> opposingFlank = new NetworkVariable<NetworkBehaviourReference>();
+        private GWNetworkList<float> deathCooldowns = new GWNetworkList<float>();
 
 
         public const int SlotsPerRowGround = 3;

Assets/GWConquest/Scripts/District.cs

@@ -13,19 +13,19 @@ namespace GWConquest
         public static List<District> AllDistricts = new List<District>();
         public static List<DistrictConnection> AllConnections = new List<DistrictConnection>();
 
-        private NetworkVariable<int> storageCapacity;
-        private NetworkVariable<int> controllingPlayerID;
-        public Inventory Inventory;
-        private NetworkVariable<float> itemProductionCooldown;
-        private NetworkVariable<int> zoneID;
-        private NetworkVariable<NetworkBehaviourReference> planet;
-        private NetworkVariable<int> level;
-        private NetworkVariable<DistrictType> districtType;
-        private NetworkVariable<FixedString128Bytes> districtName;
-        private NetworkVariable<Vector3> relativePosition;
-        private GWNetworkList<NetworkBehaviourReference> connectedDistricts;
-        private GWNetworkList<ushort> upgrades;
-        private NetworkVariable<float> captureCooldown;
+        private NetworkVariable<int> storageCapacity = new NetworkVariable<int>();
+        private NetworkVariable<int> controllingPlayerID = new NetworkVariable<int>();
+        public Inventory Inventory = new Inventory();
+        private NetworkVariable<float> itemProductionCooldown = new NetworkVariable<float>();
+        private NetworkVariable<int> zoneID = new NetworkVariable<int>();
+        private NetworkVariable<NetworkBehaviourReference> planet = new NetworkVariable<NetworkBehaviourReference>();
+        private NetworkVariable<int> level = new NetworkVariable<int>();
+        private NetworkVariable<DistrictType> districtType = new NetworkVariable<DistrictType>();
+        private NetworkVariable<FixedString128Bytes> districtName = new NetworkVariable<FixedString128Bytes>();
+        private NetworkVariable<Vector3> relativePosition = new NetworkVariable<Vector3>();
+        private GWNetworkList<NetworkBehaviourReference> connectedDistricts = new GWNetworkList<NetworkBehaviourReference>();
+        private GWNetworkList<ushort> upgrades = new GWNetworkList<ushort>();
+        private NetworkVariable<float> captureCooldown = new NetworkVariable<float>();
 
         public bool DistrictStatic;
 

Assets/GWConquest/Scripts/DistrictFactory.cs

@@ -39,7 +39,7 @@ namespace GWConquest
     }
     public class DistrictFactory : NetworkBehaviour
     {
-        public GWNetworkList<ProductionQueueEntry> productionQueue;
+        public GWNetworkList<ProductionQueueEntry> productionQueue = new GWNetworkList<ProductionQueueEntry>();
 
         public bool StartsBroken = false;
         public string[] SpecialUnits;

Assets/GWConquest/Scripts/Formation.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using System;
 using System.Collections.Generic;
-using System.Collections;
+using Unity.Collections;
 
 
 using Unity.Netcode;
@@ -31,27 +31,27 @@ namespace GWConquest
     {
         public static List<Formation> AllFormations = new List<Formation>();
 
-        private NetworkVariable<int> currentZoneID;
-        private NetworkVariable<bool> isSpace;
-        private NetworkVariable<Transition> currentTransition;
-        private NetworkVariable<NetworkBehaviourReference> player;
-        private GWNetworkList<NetworkBehaviourReference> units;
-        private GWNetworkList<int> pathQueue;
-        private NetworkVariable<NullableNetworkBehaviourReference> currentBattle;
-        private NetworkVariable<NullableNetworkBehaviourReference> heroUnit;
-        private GWNetworkList<NetworkBehaviourReference> subFormations;
-        private NetworkVariable<string> formationName;
-        private NetworkVariable<int> formationNumber;
-        private NetworkVariable<NullableNetworkBehaviourReference> movementTargetFormation;
-        private NetworkVariable<NullableNetworkBehaviourReference> movementOriginFormation;
-        private NetworkVariable<bool> isEmbarked;
-        private NetworkVariable<NullableNetworkBehaviourReference> parentFormation;
-        private NetworkVariable<float> morale;
-        private NetworkVariable<float> startingMorale;
-        private NetworkVariable<FormationMovementState> movementState;
-        private NetworkVariable<float> actionCooldown;
-        private NetworkVariable<float> actionCooldownMax;
-        private NetworkVariable<Vector3> fleetRestingPoint;
+        private NetworkVariable<int> currentZoneID = new NetworkVariable<int>();
+        private NetworkVariable<bool> isSpace = new NetworkVariable<bool>();
+        private NetworkVariable<Transition> currentTransition = new NetworkVariable<Transition>();
+        private NetworkVariable<NetworkBehaviourReference> player = new NetworkVariable<NetworkBehaviourReference>();
+        private GWNetworkList<NetworkBehaviourReference> units = new GWNetworkList<NetworkBehaviourReference>();
+        private GWNetworkList<int> pathQueue = new GWNetworkList<int>();
+        private NetworkVariable<NullableNetworkBehaviourReference> currentBattle = new NetworkVariable<NullableNetworkBehaviourReference>();
+        private NetworkVariable<NullableNetworkBehaviourReference> heroUnit = new NetworkVariable<NullableNetworkBehaviourReference>();
+        private GWNetworkList<NetworkBehaviourReference> subFormations = new GWNetworkList<NetworkBehaviourReference>();
+        private NetworkVariable<FixedString128Bytes> formationName = new NetworkVariable<FixedString128Bytes>();
+        private NetworkVariable<int> formationNumber = new NetworkVariable<int>();
+        private NetworkVariable<NullableNetworkBehaviourReference> movementTargetFormation = new NetworkVariable<NullableNetworkBehaviourReference>();
+        private NetworkVariable<NullableNetworkBehaviourReference> movementOriginFormation = new NetworkVariable<NullableNetworkBehaviourReference>();
+        private NetworkVariable<bool> isEmbarked = new NetworkVariable<bool>();
+        private NetworkVariable<NullableNetworkBehaviourReference> parentFormation = new NetworkVariable<NullableNetworkBehaviourReference>();
+        private NetworkVariable<float> morale = new NetworkVariable<float>();
+        private NetworkVariable<float> startingMorale = new NetworkVariable<float>();
+        private NetworkVariable<FormationMovementState> movementState = new NetworkVariable<FormationMovementState>();
+        private NetworkVariable<float> actionCooldown = new NetworkVariable<float>();
+        private NetworkVariable<float> actionCooldownMax = new NetworkVariable<float>();
+        private NetworkVariable<Vector3> fleetRestingPoint = new NetworkVariable<Vector3>();
 
 
         public Zone currentZone
@@ -100,7 +100,7 @@ namespace GWConquest
 
         public string FormationName
         {
-            get => formationName.Value;
+            get => formationName.Value.ToString();
             set
             {
                 formationName.Value = value;

Assets/GWConquest/Scripts/GWNetworkManager.cs

@@ -24,11 +24,13 @@ namespace GWConquest {
         public override void OnNetworkSpawn()
         {
             NetworkManager.SceneManager.OnSceneEvent += OnSceneEvent;
+            Debug.LogFormat("GWNetworkManager: OnNetworkSpawn");
             base.OnNetworkSpawn();
         }
 
         private void OnSceneEvent(SceneEvent sceneEvent)
         {
+            Debug.LogFormat("GWNetworkManager: On Scene Event", sceneEvent);
             if(IsServer)
             {
                 if(sceneEvent.SceneEventType == SceneEventType.LoadComplete)

Assets/GWConquest/Scripts/Planet.cs

@@ -34,13 +34,13 @@ namespace GWConquest
             _allPlanets = null;
         }
 
-        private NetworkVariable<FixedString128Bytes> planetNameVar;
-        private NetworkVariable<int> spaceZoneID;
-        private NetworkVariable<int> attackZoneID;
-        private GWNetworkList<NetworkBehaviourReference> connectedPlanets;
-        private NetworkVariable<ushort> planetPrefab;
-        private NetworkVariable<Quaternion> prefabRotation;
-        private NetworkVariable<float> prefabScale;
+        private NetworkVariable<FixedString128Bytes> planetNameVar = new NetworkVariable<FixedString128Bytes>();
+        private NetworkVariable<int> spaceZoneID = new NetworkVariable<int>();
+        private NetworkVariable<int> attackZoneID = new NetworkVariable<int>();
+        private GWNetworkList<NetworkBehaviourReference> connectedPlanets = new GWNetworkList<NetworkBehaviourReference>();
+        private NetworkVariable<ushort> planetPrefab = new NetworkVariable<ushort>();
+        private NetworkVariable<Quaternion> prefabRotation = new NetworkVariable<Quaternion>();
+        private NetworkVariable<float> prefabScale = new NetworkVariable<float>();
 
         public GameObject textPrefab;
 

Assets/GWConquest/Scripts/Player.cs

@@ -10,13 +10,13 @@ namespace GWConquest
 {
     public class Player : NetworkBehaviour
     {
-        private NetworkVariable<ushort> playerID;
-        private NetworkVariable<FixedString512Bytes> playerName;
-        private NetworkVariable<ushort> factionIndex;
-        private NetworkVariable<bool> isAI;
-        private NetworkVariable<int> credits;
-        private GWNetworkList<NetworkBehaviourReference> knownPlanetsList;
-        private GWNetworkList<NetworkBehaviourReference> visiblePlanetsList;
+        private NetworkVariable<ushort> playerID = new NetworkVariable<ushort>();
+        private NetworkVariable<FixedString512Bytes> playerName = new NetworkVariable<FixedString512Bytes>();
+        private NetworkVariable<ushort> factionIndex = new NetworkVariable<ushort>();
+        private NetworkVariable<bool> isAI = new NetworkVariable<bool>();
+        private NetworkVariable<int> credits = new NetworkVariable<int>();
+        private GWNetworkList<NetworkBehaviourReference> knownPlanetsList = new GWNetworkList<NetworkBehaviourReference>();
+        private GWNetworkList<NetworkBehaviourReference> visiblePlanetsList = new GWNetworkList<NetworkBehaviourReference>();
 
         public static List<Player> PlayerList = new List<Player>();
 

Assets/GWConquest/Scripts/UI/MainMenu.cs

@@ -14,6 +14,7 @@ namespace GWConquest
             GameOptions.ApplyOptions();
 
             NetworkManager.Singleton.OnServerStarted += ServerStartDone;
+            DontDestroyOnLoad(NetworkManager.Singleton.gameObject);
         }
 
         public void StartServer(int hostFactionIndex)

Assets/GWConquest/Scripts/UID.cs

@@ -1,44 +0,0 @@
-using Unity.Netcode;
-using System;
-
-namespace GWConquest {
-    public struct UID : INetworkSerializeByMemcpy, IEquatable<UID> {
-        public ushort value;
-
-        public UID(ushort _value)
-        {
-            value = _value;
-        }
-
-        public bool Equals(UID other)
-        {
-            return value == other.value;
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (obj == null || GetType() != obj.GetType())
-            {
-                return false;
-            }
-            
-            return Equals((UID)obj);
-        }
-        
-        public override int GetHashCode()
-        {
-            return value;
-        }
-
-        public static bool operator ==(UID id1, UID id2)
-        {
-            return id1.value == id2.value;
-        }
-
-        public static bool operator !=(UID id1, UID id2)
-        {
-            return id1.value != id2.value;
-        }
-
-    }
-}

Assets/GWConquest/Scripts/UID.cs.meta

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

Assets/GWConquest/Scripts/Unit.cs

@@ -12,22 +12,22 @@ namespace GWConquest
 
     public class Unit : NetworkBehaviour, IIconObject
     {
-        private NetworkVariable<ushort> unitClass;
-        private NetworkVariable<NetworkBehaviourReference> formation;
-        private NetworkVariable<int> hitpoints;
-        private NetworkVariable<float> shields;
-        private NetworkVariable<float> shieldsCooldown;
-        private NetworkVariable<RevealState> revealState;
-        private NetworkVariable<BattleUnitState> battleState;
-        private NetworkVariable<float> actionCooldown;
-        private NetworkVariable<float> actionCooldownMax;
-        private Inventory inventory;
-        private Inventory equipment;
-        private NetworkVariable<int> flankTarget;
-        private NetworkVariable<float> morale;
-        private NetworkVariable<int> supplies;
-        private NetworkVariable<int> fuel;
-        private NetworkVariable<int> food;
+        private NetworkVariable<ushort> unitClass = new NetworkVariable<ushort>();
+        private NetworkVariable<NetworkBehaviourReference> formation = new NetworkVariable<NetworkBehaviourReference>();
+        private NetworkVariable<int> hitpoints = new NetworkVariable<int>();
+        private NetworkVariable<float> shields = new NetworkVariable<float>();
+        private NetworkVariable<float> shieldsCooldown = new NetworkVariable<float>();
+        private NetworkVariable<RevealState> revealState = new NetworkVariable<RevealState>();
+        private NetworkVariable<BattleUnitState> battleState = new NetworkVariable<BattleUnitState>();
+        private NetworkVariable<float> actionCooldown = new NetworkVariable<float>();
+        private NetworkVariable<float> actionCooldownMax = new NetworkVariable<float>();
+        private Inventory inventory = new Inventory();
+        private Inventory equipment = new Inventory();
+        private NetworkVariable<int> flankTarget = new NetworkVariable<int>();
+        private NetworkVariable<float> morale = new NetworkVariable<float>();
+        private NetworkVariable<int> supplies = new NetworkVariable<int>();
+        private NetworkVariable<int> fuel = new NetworkVariable<int>();
+        private NetworkVariable<int> food = new NetworkVariable<int>();
 
 
         public UnitClass Class