From ba567517690f35e263671cde6d6b1495c62835bf Mon Sep 17 00:00:00 2001 From: laurids Date: Thu, 16 Jul 2020 22:13:23 +0200 Subject: [PATCH] Production Queue cont. --- .../Animations/ProductionIcon.controller | 97 +- Assets/GWConquest/Prefabs/Factory.prefab | 111 + Assets/GWConquest/Prefabs/Factory.prefab.meta | 7 + Assets/GWConquest/Prefabs/Formation.prefab | 4 +- Assets/GWConquest/Prefabs/Planet.prefab | 171 +- Assets/GWConquest/Prefabs/Player.prefab | 2 +- .../Prefabs/ProductionMenuIcon.prefab | 45 + Assets/GWConquest/Prefabs/QueueIcon.prefab | 515 +++ .../GWConquest/Prefabs/QueueIcon.prefab.meta | 7 + Assets/GWConquest/Prefabs/Unit.prefab | 2 +- Assets/GWConquest/Scenes/GalaxyMap.unity | 3254 ++++++++--------- Assets/GWConquest/Scripts/DistrictFactory.cs | 109 +- Assets/GWConquest/Scripts/ServerCallbacks.cs | 6 + Assets/GWConquest/Scripts/UI/DistrictUI.cs | 8 +- Assets/GWConquest/Scripts/UI/IngameUI.cs | 10 +- Assets/GWConquest/Scripts/UI/PlanetViewUI.cs | 4 + .../GWConquest/Scripts/UI/ProductionMenu.cs | 24 +- .../Scripts/UI/ProductionMenuIcon.cs | 11 +- Assets/GWConquest/Scripts/UI/QueueMenu.cs | 75 + .../GWConquest/Scripts/UI/QueueMenu.cs.meta | 11 + Assets/GWConquest/Scripts/UI/QueueMenuIcon.cs | 52 + .../Scripts/UI/QueueMenuIcon.cs.meta | 11 + Assets/GWConquest/Scripts/Unit.cs | 26 +- Assets/GWConquest/Scripts/UnitClass.cs | 5 +- .../PhotonBolt/assemblies/bolt.user.dll | Bin 26112 -> 32768 bytes .../PhotonBolt/assemblies/bolt.user.dll.mdb | Bin 9308 -> 12718 bytes Assets/Photon/PhotonBolt/project.json | 184 + .../resources/BoltPrefabDatabase.asset | 1 + 28 files changed, 3004 insertions(+), 1748 deletions(-) create mode 100644 Assets/GWConquest/Prefabs/Factory.prefab create mode 100644 Assets/GWConquest/Prefabs/Factory.prefab.meta create mode 100644 Assets/GWConquest/Prefabs/QueueIcon.prefab create mode 100644 Assets/GWConquest/Prefabs/QueueIcon.prefab.meta create mode 100644 Assets/GWConquest/Scripts/UI/QueueMenu.cs create mode 100644 Assets/GWConquest/Scripts/UI/QueueMenu.cs.meta create mode 100644 Assets/GWConquest/Scripts/UI/QueueMenuIcon.cs create mode 100644 Assets/GWConquest/Scripts/UI/QueueMenuIcon.cs.meta diff --git a/Assets/GWConquest/Animations/ProductionIcon.controller b/Assets/GWConquest/Animations/ProductionIcon.controller index 80ee2b0..99e5c75 100644 --- a/Assets/GWConquest/Animations/ProductionIcon.controller +++ b/Assets/GWConquest/Animations/ProductionIcon.controller @@ -11,7 +11,10 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -2870376458642484759} - m_Position: {x: 280, y: 80, z: 0} + m_Position: {x: 430, y: 60, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3038382536800868440} + m_Position: {x: 270, y: -30, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -21,7 +24,34 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -2870376458642484759} + m_DefaultState: {fileID: -3038382536800868440} +--- !u!1102 &-3038382536800868440 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Paused + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -803498051757648462} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 0 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-2870376458642484759 AnimatorState: serializedVersion: 5 @@ -32,11 +62,12 @@ AnimatorState: m_Name: CogwheelTurn m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 3109142647042112950} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 - m_WriteDefaultValues: 1 + m_WriteDefaultValues: 0 m_Mirror: 0 m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 @@ -48,6 +79,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-803498051757648462 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Running + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2870376458642484759} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -56,7 +112,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: ProductionIcon serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Running + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -70,3 +132,28 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &3109142647042112950 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Running + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3038382536800868440} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.975 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/GWConquest/Prefabs/Factory.prefab b/Assets/GWConquest/Prefabs/Factory.prefab new file mode 100644 index 0000000..e12596b --- /dev/null +++ b/Assets/GWConquest/Prefabs/Factory.prefab @@ -0,0 +1,111 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1355812926097278600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6365986322515139274} + - component: {fileID: 7080609719325669056} + - component: {fileID: 8496026405921973180} + - component: {fileID: 7954319019618919355} + - component: {fileID: 3732992427129260454} + m_Layer: 0 + m_Name: Factory + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6365986322515139274 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1355812926097278600} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7080609719325669056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1355812926097278600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59300c3dd14d29d4895f5f18e85d7eb3, type: 3} + m_Name: + m_EditorClassIdentifier: + zoneId: 0 + attackZone: 0 + mainZone: 1 +--- !u!114 &8496026405921973180 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1355812926097278600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3097d18430809bc4db1e8e075e8199a2, type: 3} + m_Name: + m_EditorClassIdentifier: + Tier: 1 + FactoryType: 0 + SpecialUnits: [] +--- !u!114 &7954319019618919355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1355812926097278600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} + m_Name: + m_EditorClassIdentifier: + DefaultSprite: {fileID: 21300000, guid: 3b81d9ff9816c8240b02293797c69234, type: 3} + DistrictName: Primus + Description: + IsCityDistrict: 1 +--- !u!114 &3732992427129260454 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1355812926097278600} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -36112512, guid: 5b00bf8b25851d440940a40ec23344f4, type: 3} + m_Name: + m_EditorClassIdentifier: + _sceneGuid: + _serializerGuid: 5b40b0d7-d27b-4407-968a-c0f4c722eb67 + _prefabId: 1 + _updateRate: 1 + _autoFreezeProxyFrames: 0 + _clientPredicted: 1 + _allowInstantiateOnClient: 1 + _persistThroughSceneLoads: 0 + _sceneObjectDestroyOnDetach: 1 + _sceneObjectAutoAttach: 1 + _alwaysProxy: 0 + _detachOnDisable: 1 + _allowFirstReplicationWhenFrozen: 0 + _autoRemoveChildEntities: 0 + _entityBehaviourQueryOption: 0 + _entityPriorityCalculatorQueryOption: 0 + _entityReplicationFilterQueryOption: 0 diff --git a/Assets/GWConquest/Prefabs/Factory.prefab.meta b/Assets/GWConquest/Prefabs/Factory.prefab.meta new file mode 100644 index 0000000..082d0c2 --- /dev/null +++ b/Assets/GWConquest/Prefabs/Factory.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fc3eae9e9964d5446a5c38fbf9a203bb +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Prefabs/Formation.prefab b/Assets/GWConquest/Prefabs/Formation.prefab index 07b794a..8670764 100644 --- a/Assets/GWConquest/Prefabs/Formation.prefab +++ b/Assets/GWConquest/Prefabs/Formation.prefab @@ -91,7 +91,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -174,7 +174,7 @@ MonoBehaviour: m_EditorClassIdentifier: _sceneGuid: _serializerGuid: d7ecbbfb-2aa4-41e6-b745-72f55b565b31 - _prefabId: 1 + _prefabId: 2 _updateRate: 1 _autoFreezeProxyFrames: 0 _clientPredicted: 1 diff --git a/Assets/GWConquest/Prefabs/Planet.prefab b/Assets/GWConquest/Prefabs/Planet.prefab index b526ff6..e882600 100644 --- a/Assets/GWConquest/Prefabs/Planet.prefab +++ b/Assets/GWConquest/Prefabs/Planet.prefab @@ -61,7 +61,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4678135251998877763} - - {fileID: 4678135252407299477} + - {fileID: 5705803185017867045} - {fileID: 4678135252239284613} - {fileID: 4678135251355824056} - {fileID: 7191419555384860655} @@ -100,7 +100,7 @@ MonoBehaviour: - {fileID: 4678135251998877762} - {fileID: 4678135252239284612} groundZones: - - {fileID: 4678135252407299476} + - {fileID: 8445641380723648303} - {fileID: 4678135251355824059} showPlanetName: 1 planetName: @@ -244,71 +244,6 @@ MonoBehaviour: zoneId: 0 attackZone: 1 mainZone: 0 ---- !u!1 &4678135252407299479 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4678135252407299477} - - component: {fileID: 4678135252407299476} - - component: {fileID: 4437340467061616990} - m_Layer: 0 - m_Name: GroundMain - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4678135252407299477 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4678135252407299479} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4678135251219451999} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4678135252407299476 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4678135252407299479} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59300c3dd14d29d4895f5f18e85d7eb3, type: 3} - m_Name: - m_EditorClassIdentifier: - zoneId: 0 - attackZone: 0 - mainZone: 1 ---- !u!114 &4437340467061616990 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4678135252407299479} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3097d18430809bc4db1e8e075e8199a2, type: 3} - m_Name: - m_EditorClassIdentifier: - DefaultSprite: {fileID: 21300000, guid: 3b81d9ff9816c8240b02293797c69234, type: 3} - DistrictName: Primus - Description: - IsCityDistrict: 1 - Tier: 1 - SpecialUnits: [] --- !u!1 &6190436286784700940 GameObject: m_ObjectHideFlags: 0 @@ -339,3 +274,105 @@ Transform: m_Father: {fileID: 7191419555384860655} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 42.538002, y: 28.511002, z: 0} +--- !u!1001 &1690981885650063855 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4678135251219451999} + m_Modifications: + - target: {fileID: 1355812926097278600, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_Name + value: GroundMain + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} +--- !u!4 &5705803185017867045 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + m_PrefabInstance: {fileID: 1690981885650063855} + m_PrefabAsset: {fileID: 0} +--- !u!114 &8445641380723648303 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7080609719325669056, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + m_PrefabInstance: {fileID: 1690981885650063855} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59300c3dd14d29d4895f5f18e85d7eb3, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/GWConquest/Prefabs/Player.prefab b/Assets/GWConquest/Prefabs/Player.prefab index d34797d..1ade3e4 100644 --- a/Assets/GWConquest/Prefabs/Player.prefab +++ b/Assets/GWConquest/Prefabs/Player.prefab @@ -46,7 +46,7 @@ MonoBehaviour: m_EditorClassIdentifier: _sceneGuid: _serializerGuid: 59871d26-b925-463a-99f3-d6305974e7c3 - _prefabId: 2 + _prefabId: 3 _updateRate: 1 _autoFreezeProxyFrames: 0 _clientPredicted: 1 diff --git a/Assets/GWConquest/Prefabs/ProductionMenuIcon.prefab b/Assets/GWConquest/Prefabs/ProductionMenuIcon.prefab index da43d90..776425e 100644 --- a/Assets/GWConquest/Prefabs/ProductionMenuIcon.prefab +++ b/Assets/GWConquest/Prefabs/ProductionMenuIcon.prefab @@ -318,6 +318,21 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - eventID: 7 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6924224164136034615} + m_MethodName: Scroll + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1001 &6924224162369387222 PrefabInstance: m_ObjectHideFlags: 0 @@ -325,6 +340,36 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6924224164136034614} m_Modifications: + - target: {fileID: 1738231878797738961, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738961, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738961, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738961, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 6924224164136034615} + - target: {fileID: 1738231878797738961, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Click + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738961, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 1738231878797738974, guid: 48644caf44a9db343acb000000c25522, type: 3} propertyPath: m_Name diff --git a/Assets/GWConquest/Prefabs/QueueIcon.prefab b/Assets/GWConquest/Prefabs/QueueIcon.prefab new file mode 100644 index 0000000..1f9697a --- /dev/null +++ b/Assets/GWConquest/Prefabs/QueueIcon.prefab @@ -0,0 +1,515 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3850329291015646697 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3850329291015646698} + - component: {fileID: 3850329291015646700} + - component: {fileID: 3850329291015646699} + m_Layer: 5 + m_Name: UnitIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3850329291015646698 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850329291015646697} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3850329291590619306} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 26.948929, y: -12.075} + m_SizeDelta: {x: 58, y: 58} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3850329291015646700 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850329291015646697} + m_CullTransparentMesh: 0 +--- !u!114 &3850329291015646699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850329291015646697} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ae548785829024145b06993a6c449a28, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3850329291441623360 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3850329291441623361} + - component: {fileID: 3850329291441623363} + - component: {fileID: 3850329291441623362} + m_Layer: 5 + m_Name: percentage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3850329291441623361 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850329291441623360} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3850329291590619306} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -37.9, y: -12.3} + m_SizeDelta: {x: 21.413017, y: 21.413017} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3850329291441623363 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850329291441623360} + m_CullTransparentMesh: 0 +--- !u!114 &3850329291441623362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850329291441623360} + 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.70980394, g: 0.28578943, b: 0.065301925, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c5c5d1f6b8fa0404ca44f3ea7c937909, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3850329291590619305 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3850329291590619306} + - component: {fileID: 3850329291590619308} + - component: {fileID: 3850329291590619309} + - component: {fileID: 3850329291590619307} + m_Layer: 5 + m_Name: QueueIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3850329291590619306 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850329291590619305} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3850329291531620687} + - {fileID: 3850329291723751673} + - {fileID: 3850329291015646698} + - {fileID: 3850329291441623361} + - {fileID: 3850329292131814946} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 5, y: 0} + m_SizeDelta: {x: 130, y: 88} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &3850329291590619308 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850329291590619305} + m_CullTransparentMesh: 0 +--- !u!95 &3850329291590619309 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850329291590619305} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: da78192b6e6c9c3499677ae0722e7670, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &3850329291590619307 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850329291590619305} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 170404c2782c8a84fa8c0212562e1afa, type: 3} + m_Name: + m_EditorClassIdentifier: + UnitIcon: {fileID: 3850329291015646699} + ProgressIcon: {fileID: 3850329291441623362} + UnitName: {fileID: 3850329291723751674} + Animator: {fileID: 3850329291590619309} +--- !u!1 &3850329291723751672 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3850329291723751673} + - component: {fileID: 3850329291723751675} + - component: {fileID: 3850329291723751674} + m_Layer: 5 + m_Name: UnitText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3850329291723751673 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850329291723751672} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3850329291590619306} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -0.9000015} + m_SizeDelta: {x: 0, y: 23.250267} + m_Pivot: {x: 0, y: 1} +--- !u!222 &3850329291723751675 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850329291723751672} + m_CullTransparentMesh: 0 +--- !u!114 &3850329291723751674 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850329291723751672} + 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: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} + m_FontSize: 18 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Tank 1 + +' +--- !u!1 &3850329292131814945 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3850329292131814946} + - component: {fileID: 3850329292131814948} + - component: {fileID: 3850329292131814947} + m_Layer: 5 + m_Name: cogwheel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3850329292131814946 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850329292131814945} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3850329291590619306} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -37.9, y: -12.3} + m_SizeDelta: {x: 39.947266, y: 39.947266} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3850329292131814948 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850329292131814945} + m_CullTransparentMesh: 0 +--- !u!114 &3850329292131814947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3850329292131814945} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3738cf91cf0b6a94cb7fb6d9e0d73c19, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 0.791 + m_FillClockwise: 0 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &3274238665969750672 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3850329291590619306} + m_Modifications: + - target: {fileID: 1738231878797738974, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_Name + value: Corners + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 48644caf44a9db343acb000000c25522, type: 3} +--- !u!224 &3850329291531620687 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + m_PrefabInstance: {fileID: 3274238665969750672} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/GWConquest/Prefabs/QueueIcon.prefab.meta b/Assets/GWConquest/Prefabs/QueueIcon.prefab.meta new file mode 100644 index 0000000..a367c4c --- /dev/null +++ b/Assets/GWConquest/Prefabs/QueueIcon.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4fde1247cce07dc4198dfea58a4824aa +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Prefabs/Unit.prefab b/Assets/GWConquest/Prefabs/Unit.prefab index 776e5a4..9de399d 100644 --- a/Assets/GWConquest/Prefabs/Unit.prefab +++ b/Assets/GWConquest/Prefabs/Unit.prefab @@ -58,7 +58,7 @@ MonoBehaviour: m_EditorClassIdentifier: _sceneGuid: _serializerGuid: a3b5f966-83ae-4493-ac8f-90de2095ea63 - _prefabId: 3 + _prefabId: 4 _updateRate: 1 _autoFreezeProxyFrames: 0 _clientPredicted: 1 diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index cce8e21..3abc12d 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -457,6 +457,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 5a79a754-6faa-4bad-ae5b-ca24cc2be75b + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -556,17 +561,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 354 + value: 352 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 353 + value: 351 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 352 + value: 350 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -598,6 +603,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -306.549 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 30 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &7904167 stripped @@ -1357,6 +1367,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 91641a80-be96-47c1-8196-116cb0c606fa + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -1405,7 +1420,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 43 + value: 42 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -1456,17 +1471,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 350 + value: 349 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 349 + value: 348 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 348 + value: 347 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -1498,6 +1513,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -315 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 71 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &27516566 stripped @@ -1525,6 +1545,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 7faf91c6-8482-41a3-8a18-af1b7c1a839a + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -1635,7 +1660,7 @@ PrefabInstance: type: 3} propertyPath: groundZones.Array.data[3] value: - objectReference: {fileID: 1810911858} + objectReference: {fileID: 270081894} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: groundZones.Array.data[4] @@ -1676,11 +1701,31 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -10.34 objectReference: {fileID: 0} + - target: {fileID: 5705803185017867045, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: m_LocalPosition.x + value: -2.1 + objectReference: {fileID: 0} + - target: {fileID: 5705803185017867045, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: m_LocalPosition.y + value: 21.7 + objectReference: {fileID: 0} + - target: {fileID: 5705803185017867045, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: m_LocalPosition.z + value: -13.4 + objectReference: {fileID: 0} - target: {fileID: 7191419555384860655, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder value: 6 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 53 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &30126766 stripped @@ -1696,6 +1741,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 427fde1e-c051-4ed2-bb2d-afefd9de2e17 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -1795,17 +1845,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 342 + value: 343 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 341 + value: 342 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 340 + value: 341 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -1832,6 +1882,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -335 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &36004159 stripped @@ -1893,7 +1948,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2346,6 +2401,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 475de509-e942-4d41-88e2-38cd856b1f07 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -2394,7 +2454,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 48 + value: 47 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -2445,17 +2505,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 338 + value: 340 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 337 + value: 339 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 336 + value: 338 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -2502,6 +2562,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -75.6 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 25 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &55176463 stripped @@ -2529,6 +2594,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: fd6ec45d-9aaf-4732-b423-ee7848b52505 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -2577,7 +2647,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 69 + value: 68 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -2628,17 +2698,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 334 + value: 337 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 333 + value: 336 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 332 + value: 335 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -2650,6 +2720,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &56279864 stripped @@ -3790,6 +3865,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: e05399c7-8ae9-4d4f-9c09-0757369faf5c + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -3838,7 +3918,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 60 + value: 59 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -3889,17 +3969,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 330 + value: 334 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 329 + value: 333 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 328 + value: 332 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -3941,6 +4021,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -278.32 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 69 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &92487209 stripped @@ -4135,6 +4220,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 2bff030c-05da-4c22-b2ab-156a01db0613 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -4183,7 +4273,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 53 + value: 52 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -4239,17 +4329,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 326 + value: 331 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 325 + value: 330 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 324 + value: 329 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -4261,6 +4351,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 38 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &94489301 stripped @@ -4611,86 +4706,6 @@ MonoBehaviour: sign: -1 drawCircle: 0 circle: {fileID: 2800000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3} ---- !u!1 &120356116 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 120356117} - - component: {fileID: 120356119} - - component: {fileID: 120356118} - m_Layer: 5 - m_Name: Text (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &120356117 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 120356116} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1656208438} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.9000015} - m_SizeDelta: {x: 0, y: 23.250267} - m_Pivot: {x: 0, y: 1} ---- !u!114 &120356118 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 120356116} - 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: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} - m_FontSize: 18 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'Tank 2 - -' ---- !u!222 &120356119 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 120356116} - m_CullTransparentMesh: 0 --- !u!1 &124521069 GameObject: m_ObjectHideFlags: 0 @@ -5320,7 +5335,7 @@ MonoBehaviour: m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 + m_ScrollSensitivity: 15 m_Viewport: {fileID: 1454156011} m_HorizontalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 613235022} @@ -5842,80 +5857,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 184606337} m_CullTransparentMesh: 0 ---- !u!1 &185721951 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 185721952} - - component: {fileID: 185721954} - - component: {fileID: 185721953} - m_Layer: 5 - m_Name: Image (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &185721952 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 185721951} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1656208438} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -37.9, y: -12.3} - m_SizeDelta: {x: 21.413017, y: 21.413017} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &185721953 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 185721951} - 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.70980394, g: 0.28578943, b: 0.065301925, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c5c5d1f6b8fa0404ca44f3ea7c937909, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 0.791 - m_FillClockwise: 0 - m_FillOrigin: 2 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &185721954 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 185721951} - m_CullTransparentMesh: 0 --- !u!1 &186199348 GameObject: m_ObjectHideFlags: 0 @@ -6309,15 +6250,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1048383554} - - {fileID: 1656208438} - - {fileID: 470573198} m_Father: {fileID: 726713978} 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: 777.4845, y: -4.5096436} + m_SizeDelta: {x: 777.4845, y: 0} m_Pivot: {x: 0, y: 1} --- !u!1001 &193885454 PrefabInstance: @@ -6326,6 +6265,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 78d384f0-c84c-41a8-98da-7aa9cea5b20a + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -6374,7 +6318,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 49 + value: 48 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -6425,17 +6369,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 322 + value: 328 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 321 + value: 327 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 320 + value: 326 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -6482,6 +6426,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 10 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &193885455 stripped @@ -6973,6 +6922,7 @@ MonoBehaviour: Content: {fileID: 755462605} IconPrefab: {fileID: 6924224164136034613, guid: 2f11b55f5ed06ea47ad34fa5be334264, type: 3} + ScrollRect: {fileID: 159740798} IconHeight: 68 IconOffset: 5 InfoGroup: {fileID: 1511094410} @@ -7140,6 +7090,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 90364ae8-49dc-4213-b35a-e45c34bbfae7 + objectReference: {fileID: 0} - target: {fileID: 3266501631720423375, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.x @@ -7203,7 +7158,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 54 + value: 53 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -7254,17 +7209,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 318 + value: 325 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 317 + value: 324 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 316 + value: 323 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -7296,6 +7251,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -309.375 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 82 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &236028523 stripped @@ -7699,6 +7659,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 6a5393ef-945a-491a-b272-3e153613fe5f + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -7798,17 +7763,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 314 + value: 322 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 313 + value: 321 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 312 + value: 320 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -7820,6 +7785,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 66 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &257282735 stripped @@ -8011,6 +7981,129 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 266360259} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &270081892 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 30126766} + m_Modifications: + - target: {fileID: 1355812926097278600, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_Name + value: Ground2 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.44 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalPosition.y + value: 14.61 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalPosition.z + value: -21.02 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7080609719325669056, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: zoneId + value: 354 + objectReference: {fileID: 0} + - target: {fileID: 7080609719325669056, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: mainZone + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: IsCityDistrict + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: DistrictName + value: Factory + objectReference: {fileID: 0} + - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: Tier + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8496026405921973180, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: FactoryType + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} +--- !u!114 &270081893 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7954319019618919355, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + m_PrefabInstance: {fileID: 270081892} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &270081894 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7080609719325669056, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + m_PrefabInstance: {fileID: 270081892} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59300c3dd14d29d4895f5f18e85d7eb3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &274843941 PrefabInstance: m_ObjectHideFlags: 0 @@ -8347,6 +8440,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 660360e1-9ba5-45f1-a0fb-3e6e7ce55c17 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -8446,17 +8544,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 310 + value: 319 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 309 + value: 318 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 308 + value: 317 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -8503,6 +8601,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 45 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &282969351 stripped @@ -9166,6 +9269,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 125b771d-ef9c-4e97-975a-570d4b8c9658 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -9265,17 +9373,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 306 + value: 316 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 305 + value: 315 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 304 + value: 314 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -9307,6 +9415,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -286.51 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 57 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &303737093 stripped @@ -9414,7 +9527,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 75509415} m_HandleRect: {fileID: 75509414} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -9717,6 +9830,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: c080bfe5-1fac-4920-94ce-9b808c9d2f1d + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -9765,7 +9883,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 78 + value: 77 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -9821,17 +9939,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 302 + value: 313 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 301 + value: 312 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 300 + value: 311 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -9843,6 +9961,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 74 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &329952743 stripped @@ -10433,6 +10556,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 51831a47-7a5d-4920-b7bf-77dca533719a + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -10532,17 +10660,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 298 + value: 310 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 297 + value: 309 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 296 + value: 308 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -10589,6 +10717,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 77 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &343902120 stripped @@ -11317,6 +11450,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 32c35562-75f9-4758-bd3d-935b7105b090 + objectReference: {fileID: 0} - target: {fileID: 3266501631720423375, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.x @@ -11431,17 +11569,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 294 + value: 307 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 293 + value: 306 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 292 + value: 305 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -11473,6 +11611,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -283.536 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 17 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &357040275 stripped @@ -11844,6 +11987,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: ffcddc59-1b53-4a93-b999-532d8f61289e + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -11943,17 +12091,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 290 + value: 304 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 289 + value: 303 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 288 + value: 302 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -12000,6 +12148,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 13.98 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 24 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &373849152 stripped @@ -12261,6 +12414,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 7c729d08-3f8d-4539-a5e5-f4125bd8f14e + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -12309,7 +12467,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 63 + value: 62 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -12360,17 +12518,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 286 + value: 301 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 285 + value: 300 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 284 + value: 299 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -12382,6 +12540,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 61 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &390578861 stripped @@ -12821,6 +12984,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 28c60f6f-a4a0-427d-a3f3-6c67beaf0c52 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -12869,7 +13037,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 71 + value: 70 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -12920,17 +13088,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 282 + value: 298 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 281 + value: 297 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 280 + value: 296 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -12942,6 +13110,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 43 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &402740182 stripped @@ -13179,6 +13352,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 2a5164ce-aa3f-4254-a13b-c27f5e6fe896 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -13278,17 +13456,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 278 + value: 295 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 277 + value: 294 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 276 + value: 293 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -13300,6 +13478,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 46 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &409532592 stripped @@ -13449,80 +13632,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 411538223} m_CullTransparentMesh: 0 ---- !u!1 &414428417 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 414428418} - - component: {fileID: 414428420} - - component: {fileID: 414428419} - m_Layer: 5 - m_Name: UnitIcon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &414428418 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 414428417} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1048383554} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 26.948929, y: -12.075} - m_SizeDelta: {x: 58, y: 58} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &414428419 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 414428417} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ae548785829024145b06993a6c449a28, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &414428420 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 414428417} - m_CullTransparentMesh: 0 --- !u!1 &415812805 GameObject: m_ObjectHideFlags: 0 @@ -14572,87 +14681,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 444450835} m_PrefabAsset: {fileID: 0} ---- !u!1 &444958097 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 444958098} - - component: {fileID: 444958100} - - component: {fileID: 444958099} - m_Layer: 5 - m_Name: Text (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &444958098 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 444958097} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 470573198} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.9000015} - m_SizeDelta: {x: 0, y: 23.250267} - m_Pivot: {x: 0, y: 1} ---- !u!114 &444958099 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 444958097} - 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: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} - m_FontSize: 18 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'Tank 3 - - -' ---- !u!222 &444958100 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 444958097} - m_CullTransparentMesh: 0 --- !u!1 &450765736 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4678135251219452000, guid: 9ae35d7f911b63f4f95f432141dd5746, @@ -14981,84 +15009,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 464768632} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &470573197 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 470573198} - - component: {fileID: 470573200} - - component: {fileID: 470573199} - m_Layer: 5 - m_Name: ProductionIcon (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &470573198 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 470573197} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 444958098} - - {fileID: 1412828444} - - {fileID: 2005292002} - - {fileID: 970584632} - m_Father: {fileID: 190081060} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 285, y: 0} - m_SizeDelta: {x: 130, y: 0} - m_Pivot: {x: 0, y: 0.5} ---- !u!114 &470573199 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 470573197} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.6745098} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b8b23159b4ac83f4884b29ab0d39f75e, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 0 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2 ---- !u!222 &470573200 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 470573197} - m_CullTransparentMesh: 0 --- !u!1001 &474573957 PrefabInstance: m_ObjectHideFlags: 0 @@ -15197,6 +15147,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 631da04b-0097-4ef4-8955-4b80692ab618 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -15245,7 +15200,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 76 + value: 75 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -15301,17 +15256,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 274 + value: 292 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 273 + value: 291 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 272 + value: 290 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -15323,6 +15278,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 21 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &492395479 stripped @@ -15375,6 +15335,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 5146799a-68c4-42c4-ada4-a57034fa9d1a + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -15423,7 +15388,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 85 + value: 84 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -15479,17 +15444,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 270 + value: 289 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 269 + value: 288 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 268 + value: 287 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -15501,6 +15466,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 81 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &493384697 stripped @@ -16057,6 +16027,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: d2b5fd79-d63f-45c9-82a8-13e0d83863e3 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -16105,7 +16080,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 65 + value: 64 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -16156,17 +16131,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 266 + value: 286 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 265 + value: 285 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 264 + value: 284 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -16178,6 +16153,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 68 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &500077394 stripped @@ -16265,6 +16245,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 85ee55aa-f38e-44e1-b771-6738d0bb7edb + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -16364,17 +16349,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 262 + value: 283 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 261 + value: 282 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 260 + value: 281 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -16386,6 +16371,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 32 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &509110626 stripped @@ -16401,6 +16391,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: b18d3549-75bf-45d8-8b16-d2d89ec799b5 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -16500,17 +16495,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 258 + value: 280 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 257 + value: 279 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 256 + value: 278 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -16557,6 +16552,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 414.6 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &511551466 stripped @@ -17133,6 +17133,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 935670f3-cdee-453e-bd5d-2cd45205be3e + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -17232,17 +17237,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 254 + value: 277 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 253 + value: 276 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 252 + value: 275 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -17254,6 +17259,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 6 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 54 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &539048598 stripped @@ -19503,6 +19513,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 6b75055d-42ed-43b9-af7f-48b4051e1a89 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -19551,7 +19566,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 86 + value: 85 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -19602,17 +19617,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 250 + value: 274 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 249 + value: 273 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 248 + value: 272 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -19624,6 +19639,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 59 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &632201648 stripped @@ -20701,6 +20721,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 4a57f3cd-5a41-47d2-aff8-cb2ee9d13910 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -20800,17 +20825,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 246 + value: 271 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 245 + value: 270 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 244 + value: 269 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -20842,6 +20867,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 58 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &667422008 stripped @@ -21038,6 +21068,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 9d011e7c-d0f9-42cc-805f-4045612ab326 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -21086,7 +21121,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 62 + value: 61 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -21137,17 +21172,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 242 + value: 268 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 241 + value: 267 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 240 + value: 266 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -21159,6 +21194,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 20 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!114 &684650337 stripped @@ -21724,6 +21764,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: d13197a2-ba54-4d0a-b4f1-1ea79bd87439 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -21772,7 +21817,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 52 + value: 51 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -21828,17 +21873,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 238 + value: 265 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 237 + value: 264 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 236 + value: 263 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -21850,6 +21895,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 80 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &699812053 stripped @@ -23050,6 +23100,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: b62d7c1d-cd1b-45e0-b4fb-56b57ef434cd + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -23149,17 +23204,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 234 + value: 262 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 233 + value: 261 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 232 + value: 260 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -23206,6 +23261,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 24.9 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 47 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &732317439 stripped @@ -23233,6 +23293,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 157d0da7-da09-42b5-9bf9-6cd2344c4010 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -23281,7 +23346,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 68 + value: 67 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -23332,17 +23397,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 230 + value: 259 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 229 + value: 258 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 228 + value: 257 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -23354,6 +23419,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 26 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &732477665 stripped @@ -24068,6 +24138,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: b1ddcba5-a746-4148-9852-274a28511f07 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -24116,7 +24191,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 56 + value: 55 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -24167,17 +24242,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 226 + value: 256 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 225 + value: 255 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 224 + value: 254 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -24189,6 +24264,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 29 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &752920677 stripped @@ -24567,6 +24647,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: c4a93511-df8a-44a3-966c-a899a7a17fcc + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -24615,7 +24700,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 51 + value: 50 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -24671,17 +24756,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 222 + value: 253 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 221 + value: 252 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 220 + value: 251 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -24693,6 +24778,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 6 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 44 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &766573528 stripped @@ -25445,11 +25535,11 @@ MonoBehaviour: m_Content: {fileID: 190081060} m_Horizontal: 0 m_Vertical: 0 - m_MovementType: 1 + m_MovementType: 2 m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 + m_ScrollSensitivity: 15 m_Viewport: {fileID: 726713978} m_HorizontalScrollbar: {fileID: 1981973611} m_VerticalScrollbar: {fileID: 0} @@ -25568,6 +25658,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 56ba2122-5a1d-4705-b5df-3a54a011ffc5 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -25667,17 +25762,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 218 + value: 250 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 217 + value: 249 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 216 + value: 248 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -25689,6 +25784,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 64 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &815902621 stripped @@ -25893,6 +25993,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 9306cfa0-7bd2-4a09-af9f-d4aa2b566017 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -25941,7 +26046,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 55 + value: 54 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -25992,17 +26097,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 214 + value: 247 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 213 + value: 246 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 212 + value: 245 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -26014,6 +26119,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 39 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &838583693 stripped @@ -26332,6 +26442,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 53d61f7d-4940-4344-9354-9e8568a64a33 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -26431,17 +26546,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 210 + value: 244 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 209 + value: 243 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 208 + value: 242 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -26488,6 +26603,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -4.6 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &871949502 stripped @@ -26954,6 +27074,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 08d093ff-7bda-46b0-b3a5-7448678fa72a + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -27002,7 +27127,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 83 + value: 82 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -27058,17 +27183,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 206 + value: 241 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 205 + value: 240 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 204 + value: 239 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -27080,6 +27205,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 70 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &887107172 stripped @@ -27355,6 +27485,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 9e72a4ed-a120-4f44-b63f-03346b5d6634 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -27454,17 +27589,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 202 + value: 238 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 201 + value: 237 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 200 + value: 236 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -27496,6 +27631,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -315 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 60 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &904552829 stripped @@ -27523,6 +27663,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 12e27f37-8ce7-431d-aa77-316a4a27fb6f + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -27622,17 +27767,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 198 + value: 235 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 197 + value: 234 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 196 + value: 233 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -27664,6 +27809,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -293 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 36 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &905375158 stripped @@ -28178,80 +28328,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 917462570} m_CullTransparentMesh: 0 ---- !u!1 &929010088 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 929010089} - - component: {fileID: 929010091} - - component: {fileID: 929010090} - m_Layer: 5 - m_Name: percentage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &929010089 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 929010088} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1048383554} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -37.9, y: -12.3} - m_SizeDelta: {x: 21.413017, y: 21.413017} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &929010090 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 929010088} - 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.70980394, g: 0.28578943, b: 0.065301925, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c5c5d1f6b8fa0404ca44f3ea7c937909, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 0.385 - m_FillClockwise: 1 - m_FillOrigin: 2 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &929010091 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 929010088} - m_CullTransparentMesh: 0 --- !u!1 &930627359 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4678135251219452000, guid: 9ae35d7f911b63f4f95f432141dd5746, @@ -28830,6 +28906,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 81bdef89-9f7c-4d90-ba2f-822e3e92f3ab + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -28929,17 +29010,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 194 + value: 232 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 193 + value: 231 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 192 + value: 230 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -28951,6 +29032,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 84 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &967152678 stripped @@ -29076,80 +29162,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 967322778} m_PrefabAsset: {fileID: 0} ---- !u!1 &970584631 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 970584632} - - component: {fileID: 970584634} - - component: {fileID: 970584633} - m_Layer: 5 - m_Name: Image (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &970584632 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 970584631} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 470573198} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -37.9, y: -12.3} - m_SizeDelta: {x: 39.947266, y: 39.947266} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &970584633 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 970584631} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3738cf91cf0b6a94cb7fb6d9e0d73c19, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 0.791 - m_FillClockwise: 0 - m_FillOrigin: 2 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &970584634 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 970584631} - m_CullTransparentMesh: 0 --- !u!1 &971085363 GameObject: m_ObjectHideFlags: 0 @@ -29243,12 +29255,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 971085363} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!224 &972116391 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - m_PrefabInstance: {fileID: 1738231878396056184} - m_PrefabAsset: {fileID: 0} --- !u!1 &976158696 GameObject: m_ObjectHideFlags: 0 @@ -29869,80 +29875,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &993895864 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 993895865} - - component: {fileID: 993895867} - - component: {fileID: 993895866} - m_Layer: 5 - m_Name: Image (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &993895865 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 993895864} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1656208438} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -37.9, y: -12.3} - m_SizeDelta: {x: 39.947266, y: 39.947266} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &993895866 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 993895864} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3738cf91cf0b6a94cb7fb6d9e0d73c19, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 0.791 - m_FillClockwise: 0 - m_FillOrigin: 2 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &993895867 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 993895864} - m_CullTransparentMesh: 0 --- !u!1001 &996610187 PrefabInstance: m_ObjectHideFlags: 0 @@ -29950,6 +29882,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: a5c4c801-0e34-4172-a4c2-e672a1c06ed0 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -30049,17 +29986,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 190 + value: 229 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 189 + value: 228 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 188 + value: 227 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -30106,6 +30043,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -184.6 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 86 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &996610188 stripped @@ -30226,6 +30168,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: bfe8d84b-ea20-443e-811f-779ebcb5bee2 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -30274,7 +30221,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 79 + value: 78 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -30330,17 +30277,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 186 + value: 226 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 185 + value: 225 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 184 + value: 224 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -30377,6 +30324,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.x value: -29.18 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 56 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1000076787 stripped @@ -30639,6 +30591,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 18469632-3d8f-4c31-a8b2-e4ff4807d3bf + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -30687,7 +30644,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 80 + value: 79 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -30743,17 +30700,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 182 + value: 223 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 181 + value: 222 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 180 + value: 221 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -30765,6 +30722,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 27 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1003745662 stripped @@ -30922,6 +30884,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: d3e9144f-f2bb-48fc-9ae8-058f3d58f52e + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -30970,7 +30937,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 58 + value: 57 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -31021,17 +30988,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 178 + value: 220 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 177 + value: 219 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 176 + value: 218 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -31043,6 +31010,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 79 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1011885988 stripped @@ -31344,7 +31316,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.000011808997} + m_AnchoredPosition: {x: 0, y: -0.000061035156} m_SizeDelta: {x: 0, y: 141.20746} m_Pivot: {x: 0, y: 1} --- !u!1001 &1024967746 @@ -31354,6 +31326,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 3b34ea0b-2f21-4392-bbe0-9b362434eb3d + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -31453,17 +31430,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 174 + value: 217 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 173 + value: 216 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 172 + value: 215 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -31475,6 +31452,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 63 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1024967747 stripped @@ -31827,7 +31809,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4036631883583960, guid: e4cc86a2911f81c4cafc54b909e0f521, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -31949,75 +31931,12 @@ PrefabInstance: m_RemovedComponents: - {fileID: 95707827697214026, guid: cd44b5bd43d0e5247ab1373391e2bd17, type: 3} m_SourcePrefab: {fileID: 100100000, guid: cd44b5bd43d0e5247ab1373391e2bd17, type: 3} ---- !u!1 &1048383553 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1048383554} - - component: {fileID: 1048383556} - - component: {fileID: 1048383557} - m_Layer: 5 - m_Name: ProductionIcon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1048383554 +--- !u!224 &1048383554 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1048383553} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 972116391} - - {fileID: 1183744017} - - {fileID: 414428418} - - {fileID: 929010089} - - {fileID: 1580928714} - m_Father: {fileID: 190081060} - 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: 5, y: 0} - m_SizeDelta: {x: 130, y: 0} - m_Pivot: {x: 0, y: 0.5} ---- !u!222 &1048383556 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1048383553} - m_CullTransparentMesh: 0 ---- !u!95 &1048383557 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + m_PrefabInstance: {fileID: 3850329290624680168} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1048383553} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: da78192b6e6c9c3499677ae0722e7670, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &1050884034 GameObject: m_ObjectHideFlags: 0 @@ -32717,6 +32636,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 36128ba2-0625-443f-8f12-fde4cfc2a517 + objectReference: {fileID: 0} - target: {fileID: 3266501631720423375, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.x @@ -32780,7 +32704,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 59 + value: 58 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -32831,17 +32755,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 170 + value: 214 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 169 + value: 213 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 168 + value: 212 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -32853,6 +32777,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 6 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 50 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1063969671 stripped @@ -32905,6 +32834,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 20fb6eab-5df7-41e9-9e8d-5d75f0748f93 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -32953,7 +32887,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 42 + value: 41 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -33004,17 +32938,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 166 + value: 211 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 165 + value: 210 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 164 + value: 209 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -33026,6 +32960,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 22 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1066016891 stripped @@ -33080,7 +33019,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.000019451692} + m_AnchoredPosition: {x: 0, y: -0.000015258789} m_SizeDelta: {x: 0, y: 369.19482} m_Pivot: {x: 0, y: 1} --- !u!1001 &1070270449 @@ -33484,6 +33423,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: cc89d2e0-7483-42dc-8663-7db65e95851c + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -33583,17 +33527,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 162 + value: 208 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 161 + value: 207 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 160 + value: 206 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -33630,6 +33574,11 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 67 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1082704439 stripped @@ -33650,80 +33599,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1089221813 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1089221814} - - component: {fileID: 1089221816} - - component: {fileID: 1089221815} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1089221814 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1089221813} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1656208438} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 26.948929, y: -12.075} - m_SizeDelta: {x: 58, y: 58} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1089221815 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1089221813} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ae548785829024145b06993a6c449a28, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1089221816 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1089221813} - m_CullTransparentMesh: 0 --- !u!1 &1090130973 GameObject: m_ObjectHideFlags: 0 @@ -33955,6 +33830,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 8e2b02df-9b03-467d-a479-56b91fa51b16 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -34003,7 +33883,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 47 + value: 46 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -34054,17 +33934,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 158 + value: 205 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 157 + value: 204 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 156 + value: 203 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -34096,6 +33976,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -301 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 88 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1100422407 stripped @@ -34309,6 +34194,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 8a876246-5a76-4e5c-9bae-eafdd0107bdf + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -34408,17 +34298,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 154 + value: 202 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 153 + value: 201 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 152 + value: 200 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -34430,6 +34320,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1107108979 stripped @@ -34536,6 +34431,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 45013984-02fc-4843-805a-ba56ae0e106e + objectReference: {fileID: 0} - target: {fileID: 3266501631720423375, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalRotation.x @@ -34685,17 +34585,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 150 + value: 199 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 149 + value: 198 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 148 + value: 197 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -34732,6 +34632,11 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 28 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1109498683 stripped @@ -35505,6 +35410,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 0273e6d1-aa46-4bb6-895c-e6962ad21482 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -35553,7 +35463,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 67 + value: 66 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -35604,17 +35514,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 146 + value: 196 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 145 + value: 195 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 144 + value: 194 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -35626,6 +35536,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 16 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1135185247 stripped @@ -36301,6 +36216,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 6900e192-1e2f-42f4-9217-83e89e51c974 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -36400,17 +36320,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 142 + value: 193 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 141 + value: 192 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 140 + value: 191 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -36422,6 +36342,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 41 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1172288250 stripped @@ -36723,86 +36648,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1176489799} m_PrefabAsset: {fileID: 0} ---- !u!1 &1183744016 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1183744017} - - component: {fileID: 1183744019} - - component: {fileID: 1183744018} - m_Layer: 5 - m_Name: UnitText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1183744017 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1183744016} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1048383554} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.9000015} - m_SizeDelta: {x: 0, y: 23.250267} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1183744018 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1183744016} - 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: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} - m_FontSize: 18 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 1 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'Tank 1 - -' ---- !u!222 &1183744019 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1183744016} - m_CullTransparentMesh: 0 --- !u!1001 &1190252335 PrefabInstance: m_ObjectHideFlags: 0 @@ -36810,6 +36655,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: b8d531df-ff21-4611-b651-2608d0f50199 + objectReference: {fileID: 0} - target: {fileID: 3266501631720423375, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.x @@ -36924,17 +36774,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 138 + value: 190 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 137 + value: 189 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 136 + value: 188 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -36946,6 +36796,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 6 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 19 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1190252336 stripped @@ -38253,6 +38108,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 229ca70e-ed01-4131-9c77-1bcadfb36496 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -38301,7 +38161,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 44 + value: 43 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -38352,17 +38212,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 134 + value: 187 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 133 + value: 186 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 132 + value: 185 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -38409,6 +38269,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 44.3 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 78 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1248703575 stripped @@ -38770,6 +38635,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 58642aa9-6784-4fc2-a668-27cfd4920156 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -38818,7 +38688,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 88 + value: 87 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -38869,17 +38739,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 130 + value: 184 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 129 + value: 183 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 128 + value: 182 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -38891,6 +38761,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 76 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1271054492 stripped @@ -38936,18 +38811,6 @@ MonoBehaviour: sign: -1 drawCircle: 0 circle: {fileID: 2800000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3} ---- !u!114 &1272010366 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4437340467061616990, guid: 9ae35d7f911b63f4f95f432141dd5746, - type: 3} - m_PrefabInstance: {fileID: 30126765} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3097d18430809bc4db1e8e075e8199a2, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1272903228 GameObject: m_ObjectHideFlags: 0 @@ -39655,6 +39518,80 @@ MonoBehaviour: sign: -1 drawCircle: 0 circle: {fileID: 2800000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3} +--- !u!1001 &1297272416 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1355812926097278600, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_Name + value: Factory + objectReference: {fileID: 0} + - target: {fileID: 3732992427129260454, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: _sceneGuid + value: 326d88c7-85cd-4fdd-b167-0544835aaeb1 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6365986322515139274, guid: fc3eae9e9964d5446a5c38fbf9a203bb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} --- !u!1001 &1298744015 PrefabInstance: m_ObjectHideFlags: 0 @@ -39846,6 +39783,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: ae81c5f2-42bf-49bb-b0c8-450d2d91d678 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -39945,17 +39887,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 126 + value: 181 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 125 + value: 180 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 124 + value: 179 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -39967,6 +39909,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 7 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!114 &1317094001 stripped @@ -41098,80 +41045,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1404360277} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1412828443 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1412828444} - - component: {fileID: 1412828446} - - component: {fileID: 1412828445} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1412828444 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412828443} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 470573198} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 26.948929, y: -12.075} - m_SizeDelta: {x: 58, y: 58} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1412828445 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412828443} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ae548785829024145b06993a6c449a28, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1412828446 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1412828443} - m_CullTransparentMesh: 0 --- !u!1 &1414113705 GameObject: m_ObjectHideFlags: 0 @@ -41232,9 +41105,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 59300c3dd14d29d4895f5f18e85d7eb3, type: 3} m_Name: m_EditorClassIdentifier: - zoneId: 2 + zoneId: 353 attackZone: 0 - mainZone: 1 + mainZone: 0 --- !u!1 &1418029811 GameObject: m_ObjectHideFlags: 0 @@ -42001,6 +41874,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: fed65d0b-2fbf-4245-af86-233cf1b2c01e + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -42049,7 +41927,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 74 + value: 73 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -42100,17 +41978,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 122 + value: 178 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 121 + value: 177 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 120 + value: 176 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -42122,6 +42000,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 4 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1457637694 stripped @@ -42336,7 +42219,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: district1: {fileID: 1414113707} - district2: {fileID: 1810911857} + district2: {fileID: 270081893} --- !u!1001 &1477877796 PrefabInstance: m_ObjectHideFlags: 0 @@ -42542,6 +42425,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 9f4aadc8-bc14-4ea5-9547-0f4a2584aa98 + objectReference: {fileID: 0} - target: {fileID: 3266501631720423375, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.x @@ -42656,17 +42544,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 118 + value: 175 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 117 + value: 174 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 116 + value: 173 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -42698,6 +42586,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -327.899 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 11 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1487285352 stripped @@ -43734,6 +43627,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: e48e49a0-99d6-4f44-96cb-7b441831252f + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -43782,7 +43680,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 57 + value: 56 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -43833,17 +43731,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 114 + value: 172 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 113 + value: 171 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 112 + value: 170 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -43875,6 +43773,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -270 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 51 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1526261021 stripped @@ -43975,6 +43878,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: b0bf5a51-908c-40d2-aed8-8e5a2e24332b + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -44023,7 +43931,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 77 + value: 76 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -44079,17 +43987,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 110 + value: 169 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 109 + value: 168 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 108 + value: 167 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -44101,6 +44009,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 18 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1532968048 stripped @@ -44153,6 +44066,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 015abd35-fa71-4193-9cea-6225c30871b8 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -44252,17 +44170,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 106 + value: 166 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 105 + value: 165 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 104 + value: 164 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -44309,6 +44227,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -9.167001 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 62 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1543046282 stripped @@ -45027,80 +44950,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1580433176} m_PrefabAsset: {fileID: 0} ---- !u!1 &1580928713 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1580928714} - - component: {fileID: 1580928716} - - component: {fileID: 1580928715} - m_Layer: 5 - m_Name: cogwheel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1580928714 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1580928713} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1048383554} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -37.9, y: -12.3} - m_SizeDelta: {x: 39.947266, y: 39.947266} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1580928715 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1580928713} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3738cf91cf0b6a94cb7fb6d9e0d73c19, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 0.791 - m_FillClockwise: 0 - m_FillOrigin: 2 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1580928716 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1580928713} - m_CullTransparentMesh: 0 --- !u!1001 &1588874376 PrefabInstance: m_ObjectHideFlags: 0 @@ -45820,6 +45669,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 34aecfed-a793-417c-a172-5625389e0c6a + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -45868,7 +45722,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 84 + value: 83 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -45924,17 +45778,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 102 + value: 163 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 101 + value: 162 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 100 + value: 161 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -45971,6 +45825,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.x value: 0.58 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 31 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1617289543 stripped @@ -46686,6 +46545,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: f26f81fa-7719-4bb7-b1cc-453f4a2334c6 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -46734,7 +46598,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 46 + value: 45 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -46785,17 +46649,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 98 + value: 160 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 97 + value: 159 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 96 + value: 158 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -46827,6 +46691,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -293.396 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 34 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1654493875 stripped @@ -46847,84 +46716,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1656208437 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1656208438} - - component: {fileID: 1656208440} - - component: {fileID: 1656208439} - m_Layer: 5 - m_Name: ProductionIcon (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1656208438 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1656208437} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 120356117} - - {fileID: 1089221814} - - {fileID: 185721952} - - {fileID: 993895865} - m_Father: {fileID: 190081060} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 145, y: 0} - m_SizeDelta: {x: 130, y: 0} - m_Pivot: {x: 0, y: 0.5} ---- !u!114 &1656208439 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1656208437} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.6745098} - m_RaycastTarget: 0 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b8b23159b4ac83f4884b29ab0d39f75e, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 0 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 2 ---- !u!222 &1656208440 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1656208437} - m_CullTransparentMesh: 0 --- !u!1 &1659683065 GameObject: m_ObjectHideFlags: 0 @@ -47055,6 +46846,7 @@ MonoBehaviour: NameText: {fileID: 609493133} DescriptionText: {fileID: 2089647853} ProductionMenu: {fileID: 216757984} + QueueMenu: {fileID: 1806309899} --- !u!1001 &1661107075 PrefabInstance: m_ObjectHideFlags: 0 @@ -47957,6 +47749,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 6a667fe3-f98c-4188-af03-2a3b96944730 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -48005,7 +47802,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 82 + value: 81 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -48061,17 +47858,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 94 + value: 157 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 93 + value: 156 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 92 + value: 155 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -48083,6 +47880,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 49 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1695684484 stripped @@ -48542,6 +48344,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: e29808e3-4fc5-4412-a6cd-e7464381b5a5 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -48641,17 +48448,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 90 + value: 154 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 89 + value: 153 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 88 + value: 152 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -48698,6 +48505,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -7.1380005 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 23 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1714588350 stripped @@ -49316,6 +49128,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 645ee8cd-7364-4307-a6c6-fa69a8207109 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -49415,17 +49232,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 86 + value: 151 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 85 + value: 150 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 84 + value: 149 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -49472,6 +49289,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -9.167001 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 33 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1754140167 stripped @@ -50140,6 +49962,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 2dc8737b-0a25-4cc5-9abf-86af3e0fabfc + objectReference: {fileID: 0} - target: {fileID: 3266501631720423375, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.x @@ -50254,17 +50081,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 82 + value: 148 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 81 + value: 147 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 80 + value: 146 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -50276,6 +50103,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 6 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 87 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1766312939 stripped @@ -50303,6 +50135,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 7e80b125-7101-4da7-b9b4-8d6c8ac79f26 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -50351,7 +50188,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 50 + value: 49 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -50402,17 +50239,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 78 + value: 145 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 77 + value: 144 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 76 + value: 143 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -50459,6 +50296,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -25.2 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 55 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1768648042 stripped @@ -51056,7 +50898,7 @@ PrefabInstance: - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_Name - value: GuiPanel + value: QueuePanel objectReference: {fileID: 0} - target: {fileID: 7870129596896663125, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -51171,6 +51013,29 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1806309896} m_PrefabAsset: {fileID: 0} +--- !u!1 &1806309898 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, + type: 3} + m_PrefabInstance: {fileID: 1806309896} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1806309899 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1806309898} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c157c6089abffa14b87e315453550c1d, type: 3} + m_Name: + m_EditorClassIdentifier: + Content: {fileID: 190081060} + IconPrefab: {fileID: 3850329291590619305, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + IconWidth: 130 + IconOffset: 5 --- !u!1001 &1809759629 PrefabInstance: m_ObjectHideFlags: 0 @@ -51178,6 +51043,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: fb9fe5fc-d784-463c-b893-6935e3b71c04 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -51226,7 +51096,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 70 + value: 69 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -51277,17 +51147,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 74 + value: 142 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 73 + value: 141 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 72 + value: 140 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -51299,6 +51169,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 48 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1809759630 stripped @@ -51351,6 +51226,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: c9d96e1c-5498-4743-b5e3-895e9616f800 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -51399,7 +51279,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 45 + value: 44 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -51450,17 +51330,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 70 + value: 139 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 69 + value: 138 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 68 + value: 137 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -51492,6 +51372,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.y value: -289.136 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 13 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1810618283 stripped @@ -51512,72 +51397,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1810911855 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1810911856} - - component: {fileID: 1810911858} - - component: {fileID: 1810911857} - m_Layer: 0 - m_Name: Ground2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1810911856 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1810911855} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.5, y: 14.8, z: -21} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 30126766} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1810911857 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1810911855} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3097d18430809bc4db1e8e075e8199a2, type: 3} - m_Name: - m_EditorClassIdentifier: - DefaultSprite: {fileID: 21300000, guid: b026bda5a9252fd429b78fba5936dfb0, type: 3} - DistrictName: Factory - Description: - IsCityDistrict: 0 - Tier: 3 - FactoryType: 1 - SpecialUnits: [] ---- !u!114 &1810911858 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1810911855} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59300c3dd14d29d4895f5f18e85d7eb3, type: 3} - m_Name: - m_EditorClassIdentifier: - zoneId: 0 - attackZone: 0 - mainZone: 1 --- !u!1001 &1821819292 PrefabInstance: m_ObjectHideFlags: 0 @@ -51585,6 +51404,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 7487539e-1dbb-4c0f-a413-ab03d8512b7c + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -51684,17 +51508,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 66 + value: 136 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 65 + value: 135 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 64 + value: 134 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -51741,6 +51565,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -375.6 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1821819293 stripped @@ -51873,6 +51702,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 760bedc4-ff7b-4af4-ab7f-4e62590a18c5 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -51921,7 +51755,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 73 + value: 72 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -51972,17 +51806,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 62 + value: 133 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 61 + value: 132 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 60 + value: 131 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -52019,6 +51853,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.x value: -28.75 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 14 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1826121839 stripped @@ -52176,6 +52015,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 0026e65f-021f-4ef5-b8ba-d33600e5b9ff + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -52275,17 +52119,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 58 + value: 130 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 57 + value: 129 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 56 + value: 128 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -52332,6 +52176,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 24.72 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 75 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1834518975 stripped @@ -52729,6 +52578,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 656c67f9-8f67-4f67-91cd-afe3ed986e07 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -52828,17 +52682,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 54 + value: 127 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 53 + value: 126 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 52 + value: 125 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -52850,6 +52704,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 72 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1858919927 stripped @@ -53667,6 +53526,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 561dea35-7100-46f3-9575-9668fdf5fac3 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -53715,7 +53579,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 81 + value: 80 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -53771,17 +53635,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 50 + value: 124 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 49 + value: 123 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 48 + value: 122 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -53793,6 +53657,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 65 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1911008115 stripped @@ -54179,6 +54048,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 90.00001, y: 0, z: 0} +--- !u!114 &1935309245 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8724871134271386196, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + m_PrefabInstance: {fileID: 30126765} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1935837316 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4678135251219452000, guid: 9ae35d7f911b63f4f95f432141dd5746, @@ -54391,6 +54272,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 13721da4-884a-4a64-b5cf-f05082b4736c + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -54490,17 +54376,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 46 + value: 121 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 45 + value: 120 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 44 + value: 119 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -54512,6 +54398,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 42 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1946153124 stripped @@ -54958,6 +54849,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: bfd046fc-66b1-4e04-bb47-995ce5d5ec7f + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -55057,17 +54953,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 42 + value: 118 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 41 + value: 117 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 40 + value: 116 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -55114,6 +55010,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 17.1 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 8 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1966380085 stripped @@ -55335,9 +55236,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 59300c3dd14d29d4895f5f18e85d7eb3, type: 3} m_Name: m_EditorClassIdentifier: - zoneId: 1 + zoneId: 355 attackZone: 0 - mainZone: 1 + mainZone: 0 --- !u!1001 &1968865933 PrefabInstance: m_ObjectHideFlags: 0 @@ -55345,6 +55246,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: d111d476-daed-45c1-b03e-4efe40291427 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -55444,17 +55350,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 38 + value: 115 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 37 + value: 114 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 36 + value: 113 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -55501,6 +55407,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -3.9 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 85 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1968865934 stripped @@ -55633,6 +55544,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: aba78e81-8bc9-41cd-9015-9dff4d3d1348 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -55681,7 +55597,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 72 + value: 71 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -55732,17 +55648,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 34 + value: 112 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 33 + value: 111 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 32 + value: 110 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -55789,6 +55705,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -55.5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 15 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &1969868143 stripped @@ -56322,7 +56243,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 86cc84fa3c4888445a10b07e33132af1, type: 3} m_Name: m_EditorClassIdentifier: - district1: {fileID: 1272010366} + district1: {fileID: 1935309245} district2: {fileID: 1968289577} --- !u!1 &1983076280 stripped GameObject: @@ -57057,80 +56978,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2002183001} m_CullTransparentMesh: 0 ---- !u!1 &2005292001 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2005292002} - - component: {fileID: 2005292004} - - component: {fileID: 2005292003} - m_Layer: 5 - m_Name: Image (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2005292002 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2005292001} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 470573198} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -37.9, y: -12.3} - m_SizeDelta: {x: 21.413017, y: 21.413017} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2005292003 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2005292001} - 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.70980394, g: 0.28578943, b: 0.065301925, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c5c5d1f6b8fa0404ca44f3ea7c937909, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 0.791 - m_FillClockwise: 0 - m_FillOrigin: 2 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2005292004 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2005292001} - m_CullTransparentMesh: 0 --- !u!1001 &2007032521 PrefabInstance: m_ObjectHideFlags: 0 @@ -57138,6 +56985,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: f1f461b9-ac4b-4187-b4db-6e848c3617ae + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -57186,7 +57038,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 87 + value: 86 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -57237,17 +57089,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 30 + value: 109 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 29 + value: 108 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 28 + value: 107 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -57259,6 +57111,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 40 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &2007032522 stripped @@ -57598,7 +57455,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &2017850870 PrefabInstance: @@ -57973,6 +57830,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 31aa7071-c153-4192-99a6-8b6a1faaeb82 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -58021,7 +57883,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 66 + value: 65 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -58072,17 +57934,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 26 + value: 106 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 25 + value: 105 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 24 + value: 104 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -58094,6 +57956,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 12 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &2036870726 stripped @@ -58713,6 +58580,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 4cd2fcdc-2372-47cf-842e-0c40ae7c1a7b + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -58761,7 +58633,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 61 + value: 60 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -58812,17 +58684,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 22 + value: 103 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 21 + value: 102 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 20 + value: 101 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -58834,6 +58706,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 37 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &2078070486 stripped @@ -59410,6 +59287,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: 25c9668f-4634-4aad-a708-9510157f29c2 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -59458,7 +59340,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 75 + value: 74 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -59509,17 +59391,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 18 + value: 100 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 17 + value: 99 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 16 + value: 98 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -59531,6 +59413,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 83 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &2090400056 stripped @@ -59946,6 +59833,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: c4c7cdcc-1454-45bb-b71e-0dc9c87eeb86 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -59994,7 +59886,7 @@ PrefabInstance: - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_RootOrder - value: 64 + value: 63 objectReference: {fileID: 0} - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -60045,17 +59937,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 14 + value: 97 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 13 + value: 96 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 12 + value: 95 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -60067,6 +59959,11 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 73 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &2097301893 stripped @@ -60212,6 +60109,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: c86dbccd-0f1c-44c4-bed5-0a05218cba30 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -60311,17 +60213,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 10 + value: 94 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 9 + value: 93 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 8 + value: 92 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -60368,6 +60270,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 23.497002 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 35 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &2108387406 stripped @@ -60743,6 +60650,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 993795935} m_Modifications: + - target: {fileID: 2646379100319094857, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: _sceneGuid + value: d8b43c4a-9286-47cc-a5b8-2f166d924233 + objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Enabled @@ -60842,17 +60754,17 @@ PrefabInstance: - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 6 + value: 91 objectReference: {fileID: 0} - target: {fileID: 4678135251998877762, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 5 + value: 90 objectReference: {fileID: 0} - target: {fileID: 4678135252239284612, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: zoneId - value: 4 + value: 89 objectReference: {fileID: 0} - target: {fileID: 4678135252407299476, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -60899,6 +60811,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 22.139002 objectReference: {fileID: 0} + - target: {fileID: 8445641380723648303, guid: 9ae35d7f911b63f4f95f432141dd5746, + type: 3} + propertyPath: zoneId + value: 52 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} --- !u!4 &2118327521 stripped @@ -61460,125 +61377,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1546794982489047013} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1738231878396056184 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1048383554} - m_Modifications: - - target: {fileID: 1738231878797738974, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_Name - value: Corners - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 48644caf44a9db343acb000000c25522, type: 3} --- !u!1001 &2621911209398627607 PrefabInstance: m_ObjectHideFlags: 0 @@ -61905,6 +61703,130 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1001 &3850329290624680168 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 190081060} + m_Modifications: + - target: {fileID: 3850329291590619305, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_Name + value: QueueIcon + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619305, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_SizeDelta.x + value: 130 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_SizeDelta.y + value: 88 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3850329291590619306, guid: 4fde1247cce07dc4198dfea58a4824aa, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4fde1247cce07dc4198dfea58a4824aa, type: 3} --- !u!33 &6575311300241926498 MeshFilter: m_ObjectHideFlags: 0 @@ -62091,6 +62013,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 755462605} m_Modifications: + - target: {fileID: 930275647085867419, guid: 2f11b55f5ed06ea47ad34fa5be334264, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 930275647085867419, guid: 2f11b55f5ed06ea47ad34fa5be334264, + type: 3} + propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6924224164136034613, guid: 2f11b55f5ed06ea47ad34fa5be334264, type: 3} propertyPath: m_Name diff --git a/Assets/GWConquest/Scripts/DistrictFactory.cs b/Assets/GWConquest/Scripts/DistrictFactory.cs index d087e8f..463a184 100644 --- a/Assets/GWConquest/Scripts/DistrictFactory.cs +++ b/Assets/GWConquest/Scripts/DistrictFactory.cs @@ -4,7 +4,7 @@ using System.Linq; namespace GWConquest { - public class DistrictFactory : District + public class DistrictFactory : Bolt.EntityBehaviour { public int Tier = 1; public FactoryType FactoryType; @@ -17,6 +17,113 @@ namespace GWConquest return classes.Union(special); } + public int MaxQueueLength + { + get + { + return state.ProductionQueue.Length; + } + } + + public int ProductionQueueLength + { + get + { + for(int i = 0; i < MaxQueueLength; i++) + { + if(state.ProductionQueue[i].UnitClass == null) + { + return i; + } + } + return MaxQueueLength; + } + } + + public bool IsProducing + { + get + { + return state.ProductionQueue[0].UnitClass != null; + } + } + + public UnitClass GetProductionQueueEntry(int i) + { + return UnitClass.FromName(state.ProductionQueue[i].UnitClass); + } + + public float GetProductionTime(int i) + { + return state.ProductionQueue[i].TimeProduced; + } + + public float GetProductionPercentage(int i) + { + return GetProductionTime(i) / GetProductionQueueEntry(i).BuildTime; + } + + public void RemoveProductionQueueEntry(int index) + { + if(index == MaxQueueLength - 1) + { + state.ProductionQueue[index].UnitClass = null; + state.ProductionQueue[index].TimeProduced = 0f; + } + else + { + for (int i = index; i < MaxQueueLength - 1; i++) + { + var nextEntry = state.ProductionQueue[i + 1]; + state.ProductionQueue[i].UnitClass = nextEntry.UnitClass; + state.ProductionQueue[i].TimeProduced = nextEntry.TimeProduced; + if (nextEntry.UnitClass == null) + { + return; + } + } + state.ProductionQueue[MaxQueueLength - 1].UnitClass = null; + state.ProductionQueue[MaxQueueLength - 1].TimeProduced = 0f; + } + + } + + public void AddProductionQueueEntry(string uc) + { + int length = ProductionQueueLength; + if(length < MaxQueueLength) + { + BoltLog.Info("Adding unit {0} to production queue on district {1}", uc, gameObject.name); + state.ProductionQueue[length].UnitClass = uc; + state.ProductionQueue[length].TimeProduced = 0f; + } + } + + + + public override void SimulateOwner() + { + if(IsProducing) + { + state.ProductionQueue[0].TimeProduced += BoltNetwork.FrameDeltaTime; + UnitClass uc = GetProductionQueueEntry(0); + if (GetProductionTime(0) >= uc.BuildTime) + { + Zone zone = GetComponent(); + if(zone != null) + { + // TODO correct player when zones are under control + Unit.SpawnUnit(zone, uc, Player.CurrentPlayer); + } + else + { + BoltLog.Error("No corresponding zone for factory {0}", gameObject.name); + } + RemoveProductionQueueEntry(0); + } + } + } + } public enum FactoryType diff --git a/Assets/GWConquest/Scripts/ServerCallbacks.cs b/Assets/GWConquest/Scripts/ServerCallbacks.cs index bda1b07..5406eff 100644 --- a/Assets/GWConquest/Scripts/ServerCallbacks.cs +++ b/Assets/GWConquest/Scripts/ServerCallbacks.cs @@ -51,5 +51,11 @@ namespace GWConquest Formation formation = evnt.Formation.GetComponent(); formation.MoveToZone(Zone.GetFromId(evnt.TargetZone)); } + + public override void OnEvent(AddProductionEvent evnt) + { + DistrictFactory factory = evnt.Factory.GetComponent(); + factory.AddProductionQueueEntry(evnt.UnitClass); + } } } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/UI/DistrictUI.cs b/Assets/GWConquest/Scripts/UI/DistrictUI.cs index 04cdcb0..6cf9007 100644 --- a/Assets/GWConquest/Scripts/UI/DistrictUI.cs +++ b/Assets/GWConquest/Scripts/UI/DistrictUI.cs @@ -10,6 +10,7 @@ namespace GWConquest public Text DescriptionText; public ProductionMenu ProductionMenu; + public QueueMenu QueueMenu; private District district; @@ -19,10 +20,11 @@ namespace GWConquest NameText.text = district.GetDistrictName(); DescriptionText.text = district.GetDescription(); - if(district is DistrictFactory) + if(district.GetComponent() != null) { - DistrictFactory factory = district as DistrictFactory; - ProductionMenu.Init(factory.GetAvailableUnitClasses().ToArray()); + DistrictFactory factory = district.GetComponent(); + ProductionMenu.Init(factory); + QueueMenu.Init(factory); } } diff --git a/Assets/GWConquest/Scripts/UI/IngameUI.cs b/Assets/GWConquest/Scripts/UI/IngameUI.cs index 8243393..2db5782 100644 --- a/Assets/GWConquest/Scripts/UI/IngameUI.cs +++ b/Assets/GWConquest/Scripts/UI/IngameUI.cs @@ -207,7 +207,10 @@ namespace GWConquest { if(p != planet) { - p.gameObject.SetActive(false); + foreach(Renderer r in p.GetComponentsInChildren()) + { + r.enabled = false; + } } } @@ -224,7 +227,10 @@ namespace GWConquest foreach(Planet p in Planet.AllPlanets) { - p.gameObject.SetActive(true); + foreach (Renderer r in p.GetComponentsInChildren()) + { + r.enabled = true; + } } GWCamera camera = FindObjectOfType(); diff --git a/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs b/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs index 4aa7220..e8be520 100644 --- a/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs +++ b/Assets/GWConquest/Scripts/UI/PlanetViewUI.cs @@ -168,6 +168,8 @@ namespace GWConquest selectedDistrict = district; ShowGroundPanel(); + + UpdateGroundIndicator(); } public void ShowGroundPanel() @@ -204,6 +206,8 @@ namespace GWConquest SpaceIndicatorPanel.SetActive(true); FleetIcons.gameObject.SetActive(true); GroundPanel.gameObject.SetActive(false); + + UpdateGroundIndicator(); } public void Deselect() diff --git a/Assets/GWConquest/Scripts/UI/ProductionMenu.cs b/Assets/GWConquest/Scripts/UI/ProductionMenu.cs index d4e7ebb..0d8e95a 100644 --- a/Assets/GWConquest/Scripts/UI/ProductionMenu.cs +++ b/Assets/GWConquest/Scripts/UI/ProductionMenu.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Linq; using UnityEngine; using UnityEngine.UI; @@ -10,6 +11,7 @@ namespace GWConquest public Text UnitDescription; public RectTransform Content; public GameObject IconPrefab; + public ScrollRect ScrollRect; public float IconHeight; public float IconOffset; @@ -27,14 +29,16 @@ namespace GWConquest private float AlphaLerpTarget = 0; + private DistrictFactory factory; private UnitClass[] unitClasses; private List iconList = new List(); private UnitClass selectedUnitClass; - public void Init(UnitClass[] _unitClasses) + public void Init(DistrictFactory _factory) { - unitClasses = _unitClasses; + factory = _factory; + unitClasses = factory.GetAvailableUnitClasses().ToArray(); for(int i = 0; i < unitClasses.Length; i++) { @@ -66,6 +70,8 @@ namespace GWConquest } iconList.Clear(); SelectUnitClass(null); + unitClasses = null; + factory = null; InfoGroup.alpha = 0f; } @@ -125,6 +131,20 @@ namespace GWConquest } + public void AddUnitToQueue(UnitClass uc) + { + if(factory != null) + { + if(factory.ProductionQueueLength < factory.MaxQueueLength) + { + AddProductionEvent ev = AddProductionEvent.Create(Bolt.GlobalTargets.OnlyServer); + ev.Factory = factory.entity; + ev.UnitClass = uc.ShortName; + ev.Send(); + } + } + } + } } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/UI/ProductionMenuIcon.cs b/Assets/GWConquest/Scripts/UI/ProductionMenuIcon.cs index 89bd471..3efd4ad 100644 --- a/Assets/GWConquest/Scripts/UI/ProductionMenuIcon.cs +++ b/Assets/GWConquest/Scripts/UI/ProductionMenuIcon.cs @@ -1,5 +1,6 @@ using UnityEngine; using UnityEngine.UI; +using UnityEngine.EventSystems; namespace GWConquest { @@ -19,13 +20,21 @@ namespace GWConquest public void Click() { - + Menu.AddUnitToQueue(UnitClass); } public void Highlight() { Menu.SelectUnitClass(UnitClass); } + + public void Scroll(BaseEventData ev) + { + if(ev is PointerEventData) + { + Menu.ScrollRect.OnScroll(ev as PointerEventData); + } + } } } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/UI/QueueMenu.cs b/Assets/GWConquest/Scripts/UI/QueueMenu.cs new file mode 100644 index 0000000..5729ea4 --- /dev/null +++ b/Assets/GWConquest/Scripts/UI/QueueMenu.cs @@ -0,0 +1,75 @@ +using System.Collections.Generic; +using UnityEngine; + +namespace GWConquest +{ + public class QueueMenu : MonoBehaviour + { + public RectTransform Content; + public GameObject IconPrefab; + public float IconWidth; + public float IconOffset; + + private DistrictFactory factory; + + private List iconList = new List(); + + public void Init(DistrictFactory _factory) + { + factory = _factory; + UpdateQueue(); + } + + public void UpdateQueue() + { + int queueLength = factory.ProductionQueueLength; + int listLength = iconList.Count; + if(listLength != queueLength) + { + if(queueLength > listLength) + { + for (int i = listLength; i < queueLength; i++) + { + GameObject iconGO = Instantiate(IconPrefab); + + float iconPos = IconOffset * (i + 1) + IconWidth * i; + + RectTransform iconRT = iconGO.GetComponent(); + iconRT.SetParent(Content); + iconRT.anchoredPosition = new Vector3(iconPos, 0f); + iconRT.localRotation = Quaternion.identity; + iconRT.localScale = Vector3.one; + + QueueMenuIcon iconComp = iconGO.GetComponent(); + iconComp.Init(this); + + iconList.Add(iconComp); + } + } + else if(queueLength < listLength) + { + for(int i = listLength - 1; i >= queueLength; i--) + { + Destroy(iconList[i].gameObject); + iconList.RemoveAt(i); + } + } + + float totalSize = IconOffset * (queueLength + 2) + IconWidth * queueLength; + Content.sizeDelta = new Vector2(totalSize, 0f); + } + + for(int i = 0; i < queueLength; i++) + { + QueueMenuIcon icon = iconList[i]; + icon.UpdateIcon(i, factory.GetProductionQueueEntry(i), factory.GetProductionPercentage(i)); + + } + } + + private void Update() + { + UpdateQueue(); + } + } +} \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/UI/QueueMenu.cs.meta b/Assets/GWConquest/Scripts/UI/QueueMenu.cs.meta new file mode 100644 index 0000000..8f1aaea --- /dev/null +++ b/Assets/GWConquest/Scripts/UI/QueueMenu.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c157c6089abffa14b87e315453550c1d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/UI/QueueMenuIcon.cs b/Assets/GWConquest/Scripts/UI/QueueMenuIcon.cs new file mode 100644 index 0000000..65aaf6d --- /dev/null +++ b/Assets/GWConquest/Scripts/UI/QueueMenuIcon.cs @@ -0,0 +1,52 @@ +using UnityEngine; +using UnityEngine.UI; + +namespace GWConquest +{ + public class QueueMenuIcon : MonoBehaviour + { + public Image UnitIcon; + public Image ProgressIcon; + public Text UnitName; + public Animator Animator; + + private QueueMenu menu; + private int queueIndex = -1; + private UnitClass unitClass = null; + private float percentage = -1; + + public void Init(QueueMenu _menu) + { + menu = _menu; + } + + public void UpdateIcon(int i, UnitClass uc, float p) + { + if(i != queueIndex) + { + queueIndex = i; + if(i == 0) + { + Animator.SetBool("Running", true); + } + else + { + Animator.SetBool("Running", false); + } + } + if(uc != unitClass) + { + unitClass = uc; + UnitIcon.sprite = unitClass.Sprite; + UnitName.text = unitClass.FullName; + } + if(percentage != p) + { + percentage = p; + ProgressIcon.fillAmount = percentage; + } + } + + + } +} \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/UI/QueueMenuIcon.cs.meta b/Assets/GWConquest/Scripts/UI/QueueMenuIcon.cs.meta new file mode 100644 index 0000000..11b0048 --- /dev/null +++ b/Assets/GWConquest/Scripts/UI/QueueMenuIcon.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 170404c2782c8a84fa8c0212562e1afa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/Unit.cs b/Assets/GWConquest/Scripts/Unit.cs index 4d73ebc..9738500 100644 --- a/Assets/GWConquest/Scripts/Unit.cs +++ b/Assets/GWConquest/Scripts/Unit.cs @@ -1,4 +1,6 @@ -namespace GWConquest +using System.Linq; + +namespace GWConquest { public class Unit : Bolt.EntityBehaviour { @@ -34,6 +36,28 @@ }); } + public static Unit SpawnUnit(Zone zone, UnitClass uc, Player player) + { + Formation playerFormation = zone.Formations.FirstOrDefault(f => f.Player == player); + if (playerFormation == null) + { + BoltEntity formationEntity = BoltNetwork.Instantiate(BoltPrefabs.Formation); + player.AssignControl(formationEntity); + playerFormation = formationEntity.GetComponent(); + playerFormation.currentZone = zone; + playerFormation.Player = player; + } + + BoltEntity unitEntity = BoltNetwork.Instantiate(BoltPrefabs.Unit); + player.AssignControl(unitEntity); + Unit unit = unitEntity.GetComponent(); + unit.Class = uc; + unit.Formation = playerFormation; + playerFormation.UnitEntities.Add(unitEntity); + + return unit; + } + } } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/UnitClass.cs b/Assets/GWConquest/Scripts/UnitClass.cs index b2ce1c2..9c46bc9 100644 --- a/Assets/GWConquest/Scripts/UnitClass.cs +++ b/Assets/GWConquest/Scripts/UnitClass.cs @@ -82,6 +82,8 @@ namespace GWConquest FuelCost = data.GetInt("Fuel Cost") }; + unitClass.BuildTime = data.GetFloat("Build Time"); + unitClass.CreditUpkeep = data.GetFloat("Credit Upkeep"); unitClass.FoodUpkeep = data.GetFloat("Food Upkeep"); @@ -108,7 +110,7 @@ namespace GWConquest unitClass.Description = data.GetString("Description"); unitClass.ZoneType = zoneType; - unitClass.UnitStrength = unitClass.BuildCost.CreditCost; + unitClass.UnitStrength = unitClass.BuildCost.CreditCost / 100f; unitClass.LoadTexture(); @@ -169,6 +171,7 @@ namespace GWConquest public WeaponStats[] WeaponStatsArray; public BuildCost BuildCost; + public float BuildTime; public float CreditUpkeep; public float FoodUpkeep; diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll index 36ce790a8319e30ecd415418fe316ac7b95f4234..37315fb8174c77ef35c3a179cfa5a3676068b2a4 100644 GIT binary patch literal 32768 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
ko*pj+FNqQ2+@u+^wFUE&PIc>; zi+7C8XgLi#I8*8`(aYl5w_e7d+xEt2SGlueyUOalesXadM_YF^?Srfmn)X5FIp;{l z*%gg1>=o?E9Aq$$#;7%b?^DRSrdlt}<-DdT(uwisIns#{>Bron>XqV=IQ|EJLnw{o zEg^qCdDrT>_bgns?D5b2b?YPj8^(~~uNqtCA7ACusw#ljS@<~MQ!P9Oyv4$20bgw4 z3xTh)@HXIUExZHx#TLF1_zny2G5nFBA8l1?VW1J+A7;*YJseQ?Kp3ypwW>y63~-tm zqpDL(e`92}?hi1r0J`Sre%*u+By~N2VoeL^{tBilDvTIu5R9A!?PoC(td5PEHWtQU3uF!~6z)OAJ*djs6m@qQnc;9lL&IEr)jp2kmY}_ zbJ5t5%cQD!m7ufLsBhr?G1?CpWm>>jrdQ1gfT{ph!Tzm~q6)K2!$boJ0#vmIxHCNF zfik126aO|rz5!QQ#KV5*iC1l61>CPlpUkH|2;dL@(S**b`dDgCq%U0NgNArj{@SYi z^;MnRTjk|onPy=XWrl?Xs>b8a}B z#(S*Bxz!#tBvOS2Q9(MycdNl3OVn;qx|5OydjiD1_!$C*xB>`PbvPWBNgNJi>M*ML z{b42fD_atXNm_tGIDo&3?$1&g-L?>X(Xx!o=J z^S%mvm#GE6(Sd*XwFb=2$kpQm`1XXxJH|=;lL=jV&4roxzNx(4SS zTW~)Q-(izKnxV(c-@M1)5E}WBKP^NdVvgs#LM+#YOM_N^8d!mBD}`K(pJ2BmYvs>W zsa44C_({!v9%uelbe~xPTlt%DoZqROzF5<1FiVqM`E=-R!MDG*0rKzF=qR@{WzO?* z$lytq)>Id70PXf8>vPUDESbglZmQ;3-UjROR!!^}@YuP{%JrL(NAeRBo>0(!z*TpH zl=4#v=j;4wk?fu`e7^AimzK78bllGe1&d0xfuM&r_?)p9J;3W`Xdgg7)LH2cXi|Nh zH9}5}cn|9F2}lOt-Q!VFvTgVtrsg?sWzF`O^HYmFM`483^G%`8&3I}_;UD{z?eado m7J8!EnJ?qxl^HooBgaUL{Bs32so#cbIqlDN0RFuD{r>^>@JfmR literal 26112 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 z utp(lysN-~SGVrN@Iy_hpyb(~xIpGxGO@KPQIt};?KpiLb(}B+f z=}ho7yrazkeiryT{ND^X7iBu4{~U1V1L~LyX9HgdsN*be9`MD0IxV4dfG-8qX*pWx zv;uW?dLPbcb)48P2DbxHr%u$;XbqrFYjJAKzYko2k}g1<&c~aLhBL+UfN!97;2QyT z>V^!BHUa9`MLGdDqqRmofI4kKYmK%7>Nsn@0B{Fd>vS>N>9hweG>QZ2)Qc7x^#SUL z1zUk90Cl>YE&@D=b~=q9SJ$!YTmtR~0d@KdoFr>>HK2|>H4b&mm z_Q4IJ-yY0}W8jAAi{OUoesIG$#q9?CU*Jxle+PF0y$0?C`W3hn=s&@oK))64n>Z1! zp}E>jz!q&buWRjWz;m^3z$ID_;4%%T)Y_pA?b>21s;9rt^1H{p)r=4&q9pb4^kgVjHr zO1zI&S*cuCI+w_#<0&CFCUTcsnf*@L?ycEGhPGtl>1;BWw9+ng_l86+PF^f_#%wU{5QWeJ~Rg+c2$y7fJ>^zW2=ctslrIr@1PiAw8 zG|bvy9Y_>0yr;;B? zWVVb9CA#{v;+OVpHZjdJPd?P=tcyJi(v&(dluomO2G1Z|8Da@%zl^iiUr2Y%(Ca8%=# zt5b3Onn1eQ63+}IRFB=6H)X7$L?*`*%SK05?~A7g68*F$WyR4|7lv5YI(MVy zB-szAQW=Rcu?$FvqjyY>G*5JB$x<8em&BIt5g9$FRODqhQC3f;e0NXKF z2qo0!xKy@nbu{lv@3kB=*rG9PSq%dijWOj;lMykqCy~qX*Zkd%R4SAxM-)d2u2^ji z4rLPAEXORnA+63NI2<~3q1*QU{({UgD(sfQE+`^YCD8?$sy;>*^Dj4?NfQQei)G`s zaG3(`8OOg;psY+jL054oP%DZT(nx0-O9pXV&54n&{#Cp#H^uw*CvqF&2TLitmdqTd zMzKuQwFPa%vbHjn>``GUmz1Et$x^$Ft71Wy3x_eJnKXvk%`IuZ*}^U~roz}^-jKlm zIVd?;^o>(sKd~_;$i_R885NGk&KIm*89w+^VUAZwk)7#2t6zQ)GPZje@Uex;0lb#% z^~{UaM%h_5%8OQd?#q=ag6 zv7<#+q5-DN&`8nMW!jWBS39dfdoxYv7R8=_>qH<`jrMW2@|!7AiuNj-~uh=e>Bx!Kj&g|ow9mB@19cSkZi6wmeTqr?GQ z4PZzvDs1wr;#nsQiwI})AFmvns&Wel#?JKcU?LOeUBZQS6>-$YJR@vziCmj{%vX;E zgvhfud61I*vZIM_5sI?}fJtTV*Dy}?(VI#@nCx-r>p(JNr3VuTw1^)=?t;w;bS1)E zdniu}7s>O2Cj3*aORZmW`Iy zvqN)fp&d23+v0>la={vx6mSiddPrizd>6@FJ6B#T=#`^rpQG1UG^5v z)6vSt;XV`aMdCa{`TMEmxJFP+ii)>G&T)8s#ieBE) zI8t+NEVCL_>_mAjvMMg_;=GSnqfp}8(ivjsJLQGtGtrd;mFiOLwwGu7Fuz$j3HO#{ zF6D}ScFw&yvDaC{YloBl#n|ZZRTkAENxn6Nxp5%bhiK+VU6V{Dwk0y0n-tr2BzlJj z26#3V%WQca$@oATsdln2OR5?+F%=-~gpK!J?6E2am$kPm;ay>H2wi6i3bDa7nC-JN zsbnt|%x~#WrR06IyPMMZW#tIoRC9!|i>HN?gEX)V@IIUjr12a?X+KT__M+x8(6jL- zo&i08JB>35OIqM3C#NlM3wp{x9=0F1yq%}3-xf$?-LudzhnqEA59w+2!InbT$(3xN z$(1yr8K;s*J*TVbYSE2Hysw~X7e@QtjOHfzG!9>}7dHYM1O|C)Pgln-jN>}!nT3Xs zbK&XAaqGo)r*LOj;st*UiT0>XdAkv%$?pE0aiOr=I;wZqDe6cOcRBY&8%|f}t(b*8 zD_4t`5Sn=ePFva<8N)$%*_r2%R$JZ&)t1*heNV2&?;|t#$1AF2#h&)uU@vq*TIouI zEvG$e-5!IS&UfoC@zcyw%S*LYafa$k>p1a|>MPqwVYjAK<@hd3l-P;CV;;tANy*u+ znm3(vz#jJ~&X0>LeFYuD*NsucXQxLlX_FF1W^v9jZ$5aJ;D5pA)Th3kIAyj(e)(*1 z_gl^__FgH1I+~!jd5$h4IQ8au%zH=z-)6P|a)j9oi_=n;!KavF?G{+8V$cv~o`rbH z^*O?`loq=kuL6#DG`-lev>!fIcXPRC)h1=@f%*Pjo z7W8aE58i{*6|5}xL=SY~Xn-*&iDs_yLVR$QO&@QjQS%=%FL?JX-*;((nwKs1Y^3^9 zn#*}6Qe*@4W^ZnQ?rF>dnzmNPE{-n=BPfky?44OcwdFj{X-*9O)90@Jc+-YYZ`}3p zho5*5KLhvHO!Rpt*Lbv=5b#DDZvY;%@matZ+ITDQ>(;n$$@m&zx?2Q^)wcqcF>KdeCAh)s- zk*)ryiGrF7rR)+ZyTloZC^bS>EwK`f%&H}ZHF4-s&4r?5VYI75eoWVx={r&*kS~DY(zcmo`uyxJVekG_?RldtdW_5LAV8;6s+4M&8 z4=T}1d>C4A8u52LEL)X!_$JrnALoISSrLF8k^B!pd*xY;S~5M*ww7u&A^p`=Y;OJ; zor@-po$*u4C$%%-Ysy(LxE7-MH(T(U-|%UEk58{@^MeY33b7wUQWP?M8m1LM0HCJb z&j#@*`h7;t2K?KB`i*F(a~lAPBxJ%QP+lz}s)6Z(=`1JV<*p)$YM%$qM{DvQs>xql zv%v%D`6E8&*-x-;;AzV$)Ib~XZ?gF}g?%O(bJH7Y@}I0Cqh^T*L(c;b2}^30ut%0e z^1tA=OM-+l5MWC=YD$r6fr($J|6l-SK_(RAmMdjyFJbu|F8Lib9W1BAmfyj`n6Tw{ z*z);_B9`yee~=Ae`7C|CNbkVU#NgPcu@ZfnLa=tKtE*+sR9C}GjA~wQwW|5gPE8;t zX?_OPej^4)#wcXQ5DFLs0BYJ%RE=Bbl7t5(`6FB&67(j&-|1Qq2*lr=1q$zb_#wYW zvwHjIFWtL$LI1q@t$X|CEnFJ!o3~^^>wPVC=%aiJX)mP*u#Z-IR43Wq*DAXNWH%%5`~x6-#1fqrMuam@o`6h|0;~|9iQ^0 z)!3JWtfRb~>#f7RJx_Fx&Xl_D(fL<1+mH$E2JA$})q|X-8}FFA@!W{tKy*vRhs;<1 zi@&Ciz2xV@D8x#_m-f=D1EdD2oMEj&7LY;?!0!Wlk@xU5OIj843(k9;Hy-9+MaRq# zgz_&aa*|nbR#-0S=TJ+NY-=%Ox8j!{y*vi^cCVw{$+gsb4Ki?~$^?}%dHhcy$01NQ-3DSpPhdRgE2T3Hh&K*-vjd(xW@jGUQ_CssF zqPRQo%O0)dEQlpLW59W@Wa1cMl_3{xZb9Cg!aw#a>$M4z`HX2;PC<&6sD2j8_>|Te cJ4$262%`UVuOapK$m%Z@{&a`oPu24O3jwx#ng9R* diff --git a/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb b/Assets/Photon/PhotonBolt/assemblies/bolt.user.dll.mdb index e5922f22858c80482caeb19dc1f289b68a4efd90..0bf5500610d36704c24f2c3e5e2f284a30eed134 100644 GIT binary patch literal 12718 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 literal 9308 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 diff --git a/Assets/Photon/PhotonBolt/project.json b/Assets/Photon/PhotonBolt/project.json index dc5512e..d8d8d0e 100644 --- a/Assets/Photon/PhotonBolt/project.json +++ b/Assets/Photon/PhotonBolt/project.json @@ -592,6 +592,190 @@ "Name": "UnitState", "Guid": "a3b5f966-83ae-4493-ac8f-90de2095ea63", "Groups": [] + }, + { + "$type": "Bolt.Compiler.StateDefinition, bolt.compiler", + "Properties": [ + { + "Name": "ProductionQueue", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Bolt.Compiler.PropertyTypeArray, bolt.compiler", + "ElementCount": 10, + "ElementType": { + "$type": "Bolt.Compiler.PropertyTypeObject, bolt.compiler", + "StructGuid": "1cc5b915-f4e9-46d4-bae3-de6b38d6dd82" + } + }, + "AssetSettings": { + "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler", + "ExtrapolationErrorTolerance": 0.25, + "_ExtrapolationCorrectionFrames": 6, + "ExtrapolationMaxFrames": 9, + "SnapMagnitude": 10.0 + } + } + ], + "PacketMaxBits": 512, + "PacketMaxProperties": 16, + "InitialPositionCompression": { + "Compression": [ + { + "MinValue": -1024, + "MaxValue": 1024, + "Accuracy": 0.01, + "Pack": 100.0, + "Read": 0.01, + "Shift": 1024.0, + "BitsRequired": 18 + }, + { + "MinValue": -1024, + "MaxValue": 1024, + "Accuracy": 0.01, + "Pack": 100.0, + "Read": 0.01, + "Shift": 1024.0, + "BitsRequired": 18 + }, + { + "MinValue": -1024, + "MaxValue": 1024, + "Accuracy": 0.01, + "Pack": 100.0, + "Read": 0.01, + "Shift": 1024.0, + "BitsRequired": 18 + } + ] + }, + "InitialRotationCompression": { + "EulerCompression": [ + { + "MaxValue": 360, + "Accuracy": 1.0, + "Pack": 1.0, + "Read": 1.0, + "BitsRequired": 9 + }, + { + "MaxValue": 360, + "Accuracy": 1.0, + "Pack": 1.0, + "Read": 1.0, + "BitsRequired": 9 + }, + { + "MaxValue": 360, + "Accuracy": 1.0, + "Pack": 1.0, + "Read": 1.0, + "BitsRequired": 9 + } + ], + "QuaternionCompression": { + "MinValue": -1, + "MaxValue": 1, + "Accuracy": 0.01, + "Pack": 100.0, + "Read": 0.01, + "Shift": 1.0, + "BitsRequired": 8 + } + }, + "Name": "FactoryState", + "Guid": "5b40b0d7-d27b-4407-968a-c0f4c722eb67", + "Groups": [] + }, + { + "$type": "Bolt.Compiler.EventDefinition, bolt.compiler", + "Properties": [ + { + "Name": "Factory", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Bolt.Compiler.PropertyTypeEntity, bolt.compiler" + }, + "AssetSettings": { + "$type": "Bolt.Compiler.PropertyEventSettings, bolt.compiler" + } + }, + { + "Name": "UnitClass", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Bolt.Compiler.PropertyTypeString, bolt.compiler", + "MaxLength": 1 + }, + "AssetSettings": { + "$type": "Bolt.Compiler.PropertyEventSettings, bolt.compiler" + } + } + ], + "Name": "AddProductionEvent", + "Guid": "51b6b927-fab0-4fb2-81b2-67005bd9cb43", + "Groups": [] + }, + { + "$type": "Bolt.Compiler.ObjectDefinition, bolt.compiler", + "Properties": [ + { + "Name": "UnitClass", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Bolt.Compiler.PropertyTypeString, bolt.compiler", + "MaxLength": 1 + }, + "AssetSettings": { + "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler", + "ExtrapolationErrorTolerance": 0.25, + "_ExtrapolationCorrectionFrames": 6, + "ExtrapolationMaxFrames": 9, + "SnapMagnitude": 10.0 + } + }, + { + "Name": "TimeProduced", + "Enabled": true, + "Expanded": true, + "ReplicationMode": 1, + "Priority": 1, + "PropertyType": { + "$type": "Bolt.Compiler.PropertyTypeFloat, bolt.compiler", + "Compression": { + "MinValue": -2048, + "MaxValue": 2048, + "Accuracy": 0.01, + "Pack": 100.0, + "Read": 0.01, + "Shift": 2048.0, + "BitsRequired": 19 + } + }, + "AssetSettings": { + "$type": "Bolt.Compiler.PropertyStateSettings, bolt.compiler", + "ExtrapolationErrorTolerance": 0.25, + "_ExtrapolationCorrectionFrames": 6, + "ExtrapolationMaxFrames": 9, + "SnapMagnitude": 10.0 + } + } + ], + "Name": "QueueEntry", + "Guid": "1cc5b915-f4e9-46d4-bae3-de6b38d6dd82", + "Groups": [] } ], "ActiveGroup": "Everything" diff --git a/Assets/Photon/PhotonBolt/resources/BoltPrefabDatabase.asset b/Assets/Photon/PhotonBolt/resources/BoltPrefabDatabase.asset index 835ae12..765dcc3 100644 --- a/Assets/Photon/PhotonBolt/resources/BoltPrefabDatabase.asset +++ b/Assets/Photon/PhotonBolt/resources/BoltPrefabDatabase.asset @@ -15,6 +15,7 @@ MonoBehaviour: DatabaseMode: 0 Prefabs: - {fileID: 0} + - {fileID: 1355812926097278600, guid: fc3eae9e9964d5446a5c38fbf9a203bb, type: 3} - {fileID: 8292977142823461082, guid: 6af4ad43e05dcb344bfd726895735387, type: 3} - {fileID: 3262827332414082260, guid: f05198a1b03fe2b4e8042a9349c41aa3, type: 3} - {fileID: 8890686142670377634, guid: e369f02fbeb5a9046aaa40a9b89a8973, type: 3}