From 4f2421e9c39e91e53e2b6c0a24ab91b7f6c4cc58 Mon Sep 17 00:00:00 2001 From: laurids Date: Sat, 30 May 2020 23:48:24 +0200 Subject: [PATCH] CSV Files, UI --- .../GWConquest/Animations/Corners.controller | 1323 +++++++++ .../Corners.controller.meta} | 2 +- .../Animations/ProductionIcon.controller | 2 +- Assets/GWConquest/Prefabs/Corners.prefab | 140 + ...gistry.prefab.meta => Corners.prefab.meta} | 2 +- Assets/GWConquest/Prefabs/Planet.prefab | 19 + .../Prefabs/UnitClassRegistry.prefab | 49 - .../{Units.meta => Resources/Database.meta} | 2 +- .../GWConquest/Resources/Database/Planets.csv | 89 + .../Database/Planets.csv.meta} | 5 +- .../GWConquest/Resources/Database/Ships.csv | 11 + .../Database/Ships.csv.meta} | 5 +- Assets/GWConquest/Resources/UnitIcons.meta | 8 + .../UnitIcons}/Ship 1,5.png | Bin .../UnitIcons}/Ship 1,5.png.meta | 0 .../Icons => Resources/UnitIcons}/Ship 1.png | Bin .../UnitIcons}/Ship 1.png.meta | 0 .../Icons => Resources/UnitIcons}/Ship 2.png | Bin .../UnitIcons}/Ship 2.png.meta | 0 .../UnitIcons}/Ship 2123.png | Bin .../UnitIcons}/Ship 2123.png.meta | 0 .../Icons => Resources/UnitIcons}/Ship 22.png | Bin .../UnitIcons}/Ship 22.png.meta | 0 .../Icons => Resources/UnitIcons}/Ship 3.png | Bin .../UnitIcons}/Ship 3.png.meta | 0 .../UnitIcons}/Ship 321.png | Bin .../UnitIcons}/Ship 321.png.meta | 0 .../Icons => Resources/UnitIcons}/Ship 4.png | Bin .../UnitIcons}/Ship 4.png.meta | 0 .../Icons => Resources/UnitIcons}/Ship 5.png | Bin .../UnitIcons}/Ship 5.png.meta | 0 .../Icons => Resources/UnitIcons}/Ship 6.png | Bin .../UnitIcons}/Ship 6.png.meta | 0 .../UnitIcons}/Tank Medium.png | Bin .../UnitIcons}/Tank Medium.png.meta | 0 .../Resources/UnitIcons/placeholder.png | Bin 0 -> 3260 bytes .../Resources/UnitIcons/placeholder.png.meta | 127 + Assets/GWConquest/Scenes/GalaxyMap.unity | 2587 ++++++++++++++--- Assets/GWConquest/Scripts/CSVReader.cs | 93 + ...lassRegistry.cs.meta => CSVReader.cs.meta} | 2 +- Assets/GWConquest/Scripts/District.cs | 20 +- Assets/GWConquest/Scripts/DistrictFactory.cs | 29 + .../Scripts/DistrictFactory.cs.meta | 11 + Assets/GWConquest/Scripts/DistrictUI.cs | 20 + Assets/GWConquest/Scripts/DistrictUI.cs.meta | 11 + Assets/GWConquest/Scripts/GameManager.cs | 2 + Assets/GWConquest/Scripts/IngameUI.cs | 5 + Assets/GWConquest/Scripts/Planet.cs | 5 + Assets/GWConquest/Scripts/PlanetRegistry.cs | 57 + .../GWConquest/Scripts/PlanetRegistry.cs.meta | 11 + Assets/GWConquest/Scripts/PlanetViewUI.cs | 20 +- Assets/GWConquest/Scripts/Unit.cs | 2 +- Assets/GWConquest/Scripts/UnitClass.cs | 177 +- .../GWConquest/Scripts/UnitClassRegistry.cs | 9 - Assets/GWConquest/Scripts/Util.cs | 18 + .../Textures/Icons/ICON_Soldier_Recruit.png | Bin 0 -> 2640 bytes .../Icons/ICON_Soldier_Recruit.png.meta | 128 + Assets/GWConquest/Units/Cruiser.asset | 19 - Assets/GWConquest/Units/Fighter.asset | 19 - Assets/GWConquest/Units/Frigate.asset | 19 - 60 files changed, 4577 insertions(+), 471 deletions(-) create mode 100644 Assets/GWConquest/Animations/Corners.controller rename Assets/GWConquest/{Units/Frigate.asset.meta => Animations/Corners.controller.meta} (78%) create mode 100644 Assets/GWConquest/Prefabs/Corners.prefab rename Assets/GWConquest/Prefabs/{UnitClassRegistry.prefab.meta => Corners.prefab.meta} (74%) delete mode 100644 Assets/GWConquest/Prefabs/UnitClassRegistry.prefab rename Assets/GWConquest/{Units.meta => Resources/Database.meta} (77%) create mode 100644 Assets/GWConquest/Resources/Database/Planets.csv rename Assets/GWConquest/{Units/Cruiser.asset.meta => Resources/Database/Planets.csv.meta} (54%) create mode 100644 Assets/GWConquest/Resources/Database/Ships.csv rename Assets/GWConquest/{Units/Fighter.asset.meta => Resources/Database/Ships.csv.meta} (54%) create mode 100644 Assets/GWConquest/Resources/UnitIcons.meta rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 1,5.png (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 1,5.png.meta (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 1.png (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 1.png.meta (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 2.png (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 2.png.meta (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 2123.png (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 2123.png.meta (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 22.png (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 22.png.meta (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 3.png (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 3.png.meta (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 321.png (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 321.png.meta (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 4.png (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 4.png.meta (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 5.png (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 5.png.meta (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 6.png (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Ship 6.png.meta (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Tank Medium.png (100%) rename Assets/GWConquest/{Textures/Icons => Resources/UnitIcons}/Tank Medium.png.meta (100%) create mode 100644 Assets/GWConquest/Resources/UnitIcons/placeholder.png create mode 100644 Assets/GWConquest/Resources/UnitIcons/placeholder.png.meta create mode 100644 Assets/GWConquest/Scripts/CSVReader.cs rename Assets/GWConquest/Scripts/{UnitClassRegistry.cs.meta => CSVReader.cs.meta} (83%) create mode 100644 Assets/GWConquest/Scripts/DistrictFactory.cs create mode 100644 Assets/GWConquest/Scripts/DistrictFactory.cs.meta create mode 100644 Assets/GWConquest/Scripts/DistrictUI.cs create mode 100644 Assets/GWConquest/Scripts/DistrictUI.cs.meta create mode 100644 Assets/GWConquest/Scripts/PlanetRegistry.cs create mode 100644 Assets/GWConquest/Scripts/PlanetRegistry.cs.meta delete mode 100644 Assets/GWConquest/Scripts/UnitClassRegistry.cs create mode 100644 Assets/GWConquest/Textures/Icons/ICON_Soldier_Recruit.png create mode 100644 Assets/GWConquest/Textures/Icons/ICON_Soldier_Recruit.png.meta delete mode 100644 Assets/GWConquest/Units/Cruiser.asset delete mode 100644 Assets/GWConquest/Units/Fighter.asset delete mode 100644 Assets/GWConquest/Units/Frigate.asset diff --git a/Assets/GWConquest/Animations/Corners.controller b/Assets/GWConquest/Animations/Corners.controller new file mode 100644 index 0000000..b07ccac --- /dev/null +++ b/Assets/GWConquest/Animations/Corners.controller @@ -0,0 +1,1323 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-9183129569198441057 +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: Disabled + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1927933944911730481} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.05 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-8188753830791261495 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Normal + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 5864402263762603087} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-8017101307581134279 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Highlighted + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 6514914909761914966} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-7578000352202667207 +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: Highlighted + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8017101307581134279} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.05 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-2023863403927829338 +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: Normal + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8188753830791261495} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.1 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-1927933944911730481 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Disabled + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 5864402263762603087} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-391640759377486738 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Selected + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 6373657905013235289} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Corners + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Normal + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Highlighted + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Pressed + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Selected + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: Disabled + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 2691086488840958281} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &2201126724734518715 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pressed + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 6373657905013235289} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &2691086488840958281 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -8188753830791261495} + m_Position: {x: 330, y: -20, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8017101307581134279} + m_Position: {x: 235, y: 65, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2201126724734518715} + m_Position: {x: 270, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: -391640759377486738} + m_Position: {x: 305, y: 195, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1927933944911730481} + m_Position: {x: 340, y: 260, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: -2023863403927829338} + - {fileID: -7578000352202667207} + - {fileID: 3248687083546790375} + - {fileID: 6603536008679476294} + - {fileID: -9183129569198441057} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + 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: -8188753830791261495} +--- !u!1101 &3248687083546790375 +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: Pressed + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2201126724734518715} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.05 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!74 &5864402263762603087 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Normal + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.y + path: + classID: 224 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1460864421 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1967290853 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 538195251 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 38095219 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.y + path: + classID: 224 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!74 &5978564325119532587 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Disabled + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!74 &6373657905013235289 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pressed + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.y + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.70980394 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.28627452 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.06666667 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1460864421 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1967290853 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 538195251 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 38095219 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2526845255 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4215373228 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2334886179 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.y + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.70980394 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.28627452 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.06666667 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!74 &6514914909761914966 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Highlighted + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.y + path: + classID: 224 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1460864421 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1967290853 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 538195251 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 38095219 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -4 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.y + path: + classID: 224 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] +--- !u!1101 &6603536008679476294 +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: Selected + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -391640759377486738} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.05 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!74 &7550255554738274046 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Selected + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/GWConquest/Units/Frigate.asset.meta b/Assets/GWConquest/Animations/Corners.controller.meta similarity index 78% rename from Assets/GWConquest/Units/Frigate.asset.meta rename to Assets/GWConquest/Animations/Corners.controller.meta index d6b53f3..544a8eb 100644 --- a/Assets/GWConquest/Units/Frigate.asset.meta +++ b/Assets/GWConquest/Animations/Corners.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f67831d604221ef40bc290697f5075bf +guid: 5e70562d361616744b69c9cee1da19b4 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/Assets/GWConquest/Animations/ProductionIcon.controller b/Assets/GWConquest/Animations/ProductionIcon.controller index f511c05..80ee2b0 100644 --- a/Assets/GWConquest/Animations/ProductionIcon.controller +++ b/Assets/GWConquest/Animations/ProductionIcon.controller @@ -11,7 +11,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -2870376458642484759} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 280, y: 80, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/GWConquest/Prefabs/Corners.prefab b/Assets/GWConquest/Prefabs/Corners.prefab new file mode 100644 index 0000000..98430a5 --- /dev/null +++ b/Assets/GWConquest/Prefabs/Corners.prefab @@ -0,0 +1,140 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1738231878797738974 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1738231878797738975} + - component: {fileID: 1738231878797738963} + - component: {fileID: 1738231878797738962} + - component: {fileID: 1738231878797738961} + - component: {fileID: 1738231878797738960} + m_Layer: 5 + m_Name: Corners + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1738231878797738975 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1738231878797738974} + 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: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1738231878797738963 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1738231878797738974} + m_CullTransparentMesh: 0 +--- !u!114 &1738231878797738962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1738231878797738974} + 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: 1 + 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!114 &1738231878797738961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1738231878797738974} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1738231878797738962} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!95 &1738231878797738960 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1738231878797738974} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 5e70562d361616744b69c9cee1da19b4, 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 diff --git a/Assets/GWConquest/Prefabs/UnitClassRegistry.prefab.meta b/Assets/GWConquest/Prefabs/Corners.prefab.meta similarity index 74% rename from Assets/GWConquest/Prefabs/UnitClassRegistry.prefab.meta rename to Assets/GWConquest/Prefabs/Corners.prefab.meta index 65ec05e..b809baf 100644 --- a/Assets/GWConquest/Prefabs/UnitClassRegistry.prefab.meta +++ b/Assets/GWConquest/Prefabs/Corners.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ce18725601da90e44b6088999b4b0976 +guid: 48644caf44a9db343acb000000c25522 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/GWConquest/Prefabs/Planet.prefab b/Assets/GWConquest/Prefabs/Planet.prefab index e758516..b526ff6 100644 --- a/Assets/GWConquest/Prefabs/Planet.prefab +++ b/Assets/GWConquest/Prefabs/Planet.prefab @@ -254,6 +254,7 @@ GameObject: m_Component: - component: {fileID: 4678135252407299477} - component: {fileID: 4678135252407299476} + - component: {fileID: 4437340467061616990} m_Layer: 0 m_Name: GroundMain m_TagString: Untagged @@ -290,6 +291,24 @@ MonoBehaviour: 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 diff --git a/Assets/GWConquest/Prefabs/UnitClassRegistry.prefab b/Assets/GWConquest/Prefabs/UnitClassRegistry.prefab deleted file mode 100644 index f177209..0000000 --- a/Assets/GWConquest/Prefabs/UnitClassRegistry.prefab +++ /dev/null @@ -1,49 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &3853081484115191440 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3853081484115191446} - - component: {fileID: 3853081484115191447} - m_Layer: 0 - m_Name: UnitClassRegistry - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3853081484115191446 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3853081484115191440} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -40.8, y: -4.3, z: -713.4} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3853081484115191447 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3853081484115191440} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 20b8ae4ecc01f1340aafc50bb4faeb2b, type: 3} - m_Name: - m_EditorClassIdentifier: - unitClasses: - - {fileID: 11400000, guid: f67831d604221ef40bc290697f5075bf, type: 2} - - {fileID: 11400000, guid: 2e695488eaaece642a61f074dd1eec54, type: 2} - - {fileID: 11400000, guid: 841688f875289d94b9cdcf11abb6cb10, type: 2} diff --git a/Assets/GWConquest/Units.meta b/Assets/GWConquest/Resources/Database.meta similarity index 77% rename from Assets/GWConquest/Units.meta rename to Assets/GWConquest/Resources/Database.meta index d282a5b..758c506 100644 --- a/Assets/GWConquest/Units.meta +++ b/Assets/GWConquest/Resources/Database.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3a408f586cd03e14dbd851430371a841 +guid: 98b0b1013e669864cb266778bb06ac63 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/GWConquest/Resources/Database/Planets.csv b/Assets/GWConquest/Resources/Database/Planets.csv new file mode 100644 index 0000000..7ff6a36 --- /dev/null +++ b/Assets/GWConquest/Resources/Database/Planets.csv @@ -0,0 +1,89 @@ +Name Size Population Structure Types Factory Rating Factory Type Food Rating Civil Rating Quality Rating Alignment Start Faction Terrain Conditions Space Station Shipyard Station Power Sun Colour Special Text Info +Aeculus 1 3 1 Civil, 1 Factory 1x3 Ammo 1x3 Neutral Mild Storms With its planet's surface raveged by murderous Lightning Storms the populace of Aeculus have long since retreated into an old keep inside a hollow mountain, established in a bygone age by a mining company. +Arca 2 10 2 Civil, 2 Factory 2x2 1xAmmo, 1xWeapons 1x9, 1x2 1 Arca Neutral Mountainous none 3 2 1 With the largest population of sentient live, Arca the capitol of the Arcan Merchant Collective is covered in a city jungle with contrasting living standards. The Arcans, a humanoid species with rat-like features of industrius and highly competitous traders have turned the mountainous wastes into a chaotic mess of slums and factories. +Arnough 2 0 (1) Civil , (1) Factory 1x2 - 1x2 None Neutral Mild none Once a republic operation-base, Arnough is an abbandoned backwater world with its already little infrastruture laying in ruins. +Caine's World 2 0 (1) Civil , (1) Food 1x3 1x2 None Republic Mild none Formerly known as Ety-Hammon, a small and unimportant backwater world was the sight of....... In the wake of this decicive victory the planet is now referred to as Caines World after the Republic Remnants Commander Castor Caine. +Daton 3 0 3 Factory 3x3 2xArmour, 1xAmmo Neutral Wythler Khanate Toxic Scrap-Storms, Acid Rain 2 2 1 Once a planet whose surface was covered in dense forests, it's strategic location and ever changing military circumstances have turned this once properous world into a waste covered littered with forges and plagued by azid rain and scrap-storms. +Datonie 2 4 2 Civil, 2 Factory 2x2 Armour, Ammo 1x2 2x2 Yar'kassy Republic Desert Sandstorms, Hot Belonging to the Fiefdom of Yar'Kassy the hot and sandstorm-ridden Desert of Datonie is the functional backbone of the Fiefdoms Industry. +Eden 1 0 (1) Food 1x2 Neutral Neutral Jungle none Far off from civilized Space the untoutched jungles of Edens are a mysterious and hidden place untoutched by the spoils of war. +Elysia 2 4 2 Civil, 1 Factory 1x2 2x2 5 Elysia Elysia Jungle none 4 3 4 The Planet Elysia, a jungle world, inhabited by a culture of warriors and peace-keepers has been grudgingly classified as a big contributor to order and justice since the pre republic era. The eliteist society living in technologically advanced City Domes upon the live threatening tropical paradise world has long since expanded into space and big population centers in space now orbit the planet itself. +Exan 2 8 2 Civil, 1 Factory, 1 Food 1x1 1xWeapons 1x3 1x2 Neutral Neutral Jungle none Deep Jungles bursting and blooming with live of all sorts cover the surface of Exan. Its sentient population of Repiloid Humanoids is engulfed in an ever lasting brood war for survival although some efforts have been taken to pacify the planet only a few Exans traverse the voids beyond their homeworld. +Fankether 1 0 (1) Civil , (1) Food 1x2 1x2 Neutral Neutral Forest none A long way from civilized space, Fankether an untouched beauty awaits the coming settlers ever since space travel allowed for its discovery. Why the planet has never been touched by any form of pioneering isnt known. +Fethaphor 3 9 4 Civil 1x5, 1x2, 2x1 Republic Republic Mild none 4 2 3 The republics Capitol Fethaphor is a beacon of peace and prosperity. Its political leadership is located on the planet. Orbitting the planet is a spaceport of tremendous proportions which supplies the Republic Star Fleet with War its Ships. +Garesen 2 3 3 Civil, 1 Food 1x2 1x3 Neutral Neutral Forest Tunnel Network A tribal people dwell on the lush Forests of Garesen. The planet... +Gargamont 4 10 3 Civil, 1 Factory 1x4 Weapons 1x8, 2x1 Wythler Khanate Wythler Khanate Desert Hot Red On it's wide desert Planes, slums litter the surface of Gargamont, the largest planet in the system. The large and heterogenous population of Abhumans is spread around through enourmus citiy-slums that cover the planet. The hot Climate and unpleasant living standards mark this world as a stained hellhole. +Gargamont Kees 3 6 2 Civil, 1 Food 1x3 1x4, 1x2 Wythler Khanate Wythler Khanate Mild none Red The first moon of the Garamont System, Kees, +Gargamont Rest 3 5 1 Civil, 2 Food 2x2 1x5 Wythler Khanate Wythler Khanate Mild none Red The second moon of the Garamont System, Rest, +Gargamont Tri 2 5 1 Civil, 1 Factory 1x3 Ammo 1x5 Wythler Khanate Wythler Khanate Desert Sandstorms Red The third moon of the Garamont System, Tri, +Gargamont For 2 4 1 Civil, 1 Factory 1x2 Fuel 1x4 Wythler Khanate Wythler Khanate Desert Sandstorms Red The fourth moon of the Garamont System, For, +Gargamont Fiftan 2 3 1 Civil 1x3 Wythler Khanate Wythler Khanate Mild none Red The fifth moon of the Garamont System, Fiftan, +Gargamont Six 2 2 1 Civil 1x2 Wythler Khanate Wythler Khanate Mild none Red The sixth moon of the Garamont System, Six, +Gargamont Septa 1 1 1 Factory 1x1 0 Wythler Khanate Wythler Khanate Mountainous none Red The seventh moon of the Garamont System, Septa, +Honigiah 1 1 1 Civil, 1 Food 1x3 1x1 Neutral Republic Mild none Beeing a primarily agrarian outpost the small Republic world of Honigiah is in located in the ___ Ring and only sparsly populated. +Hothesear 5 0 1 Factory 1x3 Fuel Republic Republic Gas Giant none 3 3 2 As a Gas Giant the population of Hothesear is living in an asortment of geostationary Cloud Stations. The confined life hardened its populace to a tough and industrious kind. +Hotheseer Kees 2 4 2 Civil, 1 Factory 1x3 Weapons 1x3, 1x1 Republic Republic Mild none +Kies 1 4 1 Civil, 1 Factory, 1 Food 1x2 Ammo 1x2 1x4 Voteine Voteine Mild none 3 3 1 In its civilisational success only rivaled by its twin, the planet Kies is a vibrant progressive and temperate place inhabited by an Abhuman populace. +Kronos 1 0 1 Special Stone Excavation Site In Mysteries clad +Khalorg System 3 0 +Krustus 1 0 Barren Low Air Mysteries rank around the planet of Krustus. +Krygena 3 5 1 Civil, 3 Factory 1x3, 1x2, 1x1 Weapons, Armour, Ammo 1x5 Republic Republic Mild none As the military strongpoint of the republics Core Worlds, Krygena is a fortified world covered in parade squares, factories and miliatry infrastruture. +Lavarasis 2 0 1 Factory 1x3 Fuel Wythler Khanate Wythler Khanate Lava and Stone Hot Rivers of molten Stone squirm the hardened surface of this unlively world. Lavarasis' Lava Seas emit hot pulses only rivaled by the pyroclastic clouds emitting from its big refineries. +Leb 3 6 1 Civil, 2 Food, 1 Special 2x3 1x6 Neutral Neutral Jungle Production Bonus Slave Trade - Increased Production on nearby worlds A remote world covered by a dense and humid jungle inhabited by a seemingly eusocial race of insectioids. Place, Alignment, Merkmale, Species, Gesellschaft +Menaxurie 3 5 2 Food 2x2 Neutral Neutral Toxic Tunnel Network, Ants eat all da food, Toxic A strange and distant world covered in toxic swamps and peculiar vegetation, inhabited by a species of anthropomorphic Insectoids. +Methaphor 3 7 3 Civil 1x4,1x2,1x1 Republic Neutral Mountainous Core World - when completely under control - buff to sourrounding systems Second only to the capitol, the planet Methaphor, is a republic Core World and its cultural center. The world is littered with cities that cling to mountain ranges and inhabited by large human populace. +Montana 2 3 1 Civil, 2 Factory 2x2 Fuel, Armour 1x3 Neutral Neutral Ice World Snow-Storms, Cold Montana's cold wastelands are a barren and outlandish place only disturbed by a small human settlement alongside two factory complexes. The planets native population of monkey-like cave-dwellers keep a distance from the settlers and protect themselves from the merciless snow-storms by mostly staying undergrounds. +Nemawith 2 1 1 Civil, 1 Factory 1x1 Ammo 1x1 Republic Neutral Desert Sandstorms, Hot While beeing hot sandstorm ridden and far off, the republic inhabitants of Nemawith have found a way to live comfortable live inside huge oasisis. +Nasween 2 0 3 Factory 1x2, 1x3, 1x1 Armour, Ammo, Weapons 5 Wythler Khanate Wythler Khanate Lava and Stone Hot 4 3 3 Vulcanic to its core with gigantic factory complexes the Khanates Industrial Center is a hostile place to all life. Its rough and hot surface flooded with Lava and covered in smokeclouds of artifical and natural origin alike, the planets heart is hammer and anvil alike, feeding the Khanates War Efforts with its brutal and ironclad creations. The Warmachines are sent to distant world from an orbital station that also functions as an enourmos shipyard, beeing the Khanates fleets home harbour. +Noser 7 1 Civil, 2 Food, 1 Factory 1x3 Weapons 2x4 1x7 4 Noser Noser Waterworld Storms, Tides Having relocated their entire civilisation under water, the Amfibious Anhumans of Noser inhabit a stormy waterworld. The Oceans are only seldomly disrupted by stony islands emerging from the tidey waters. +PDG 2 0 1 Special Neutral Neutral Desert Sandstorms, Hot CommSat Station - Better Vision A hot red desert world untoutched but for a single republic listening post is riddled by sandstorms and bears no industrial but strategical worth. +Caer-Bennoq 2 3 2 Civil 1x2, 1x1 Republic Republic Forests none Ruled over by a class of noble lords houses the Free World of Caer-Bennoq is home to men and beast alike. From their Strongholds the feudal knights defend the population from the threat of total annihilation by raveging beasts that dwell in the planet covering forests and prey on the planets human inhabitors. +Rokurant 3 9 4 Civil 1x6, 3x1 3 Rokurant Rokurant Mild none Ruthless Efficiency, Exploation of natural ressources and huge Hive Cities are the defining characteristics of Rokurant. Ruled over by a High-Council of Technocrats the world is home to a big populace. +Ergos 1 0 4 Factory 3x4, 1x3 Armour, Ammo, Weapons, Fuel 3 Rokurant Rokurant Moon Landscape Low Air, Low Gravity 4 4 2 Yellow Rokurants Moon Ergos' low air athmosphere is pierced by gigantic factory cities that are the source of their civilisations wealth. The goods and products are transported between mega lifts into geostationary stations and orbitting shipping docks, home not only to a trading empire but a shipyard of unparralled size. +Sarfotohonia 2 0 Neutral Neutral Moon Landscape +Sartorius Rax 3 6 2 Civil 2x3 Republic Sartorian Syndicate Mild Bad Loyality Sartorius Rax, the Red Jewel is a temperate Planet ruled over by an aristocratic class of bojars and statesmen with an iron fist. It is a well known secret that the corrupt, ruling elite is aided by a large demographic of serfs. The Raxian influence extends to a number of nearby worlds. Their loyality to the Republic is shaky. +Sashuageen 2 0 3 Factory 1x3, 2x1 Weapons, 2xAmmo Republic Neutral Stone none As one of the republics main production centres, Sassuagen is home to a mining operation and an industrial complex that sits upon the planets rocky surface. +Seys Forty 2 0 (1) Food 1x2 Neutral Neutral Swamp Corrosive +Siggi 3 5 2 Civil, 2 Factory 2x3 Fuel, Armour 4 Republic Republic Mild none Inhabtation by generations of stonemasons have shaped the ressource rich world of Siggi into an industrial powerhouse. Drawing from Veins of delicate Crystalstructures, the worth of Siggis mining operations shows itself not only in times of peace but as source of valuable military equipment for planetary defence forces on its neighbouring worlds. +Spice 2 4 4 Civil 4x1 Republic Republic Mountainous, Ravine Cities Production Bonus With its Mountainous Planetscape disrupted only by canyons that dig deep into the planets crust the planet Spice is inhabited by the Cazoons. These cat-like Abhumans dwell in small city states deep inside the planet's ravines and mostly remote from the rest of the galaxy. Although formally part of the Republic, the Cazoon Society is keeping a distance. +Stunteen 2 5 2 Civil, 1 Food 1x2 1x3,1x2 Wythler Khanate Wythler Khanate Stone none WIth its flora reduced to bushes and small trees, the stony surface of this nearly barren planete is home to nomadic abhuman breed, living on the planet and fighting large winged creatures as hunter and prey alike. +Sumpa 4 0 1 Factory, 1 Special 1x4 Fuel Neutral Wythler Khanate Jungle Hot 1 Strategic Ressource: movement bonus A planet-spanning jungle covers the huge planetary surface of Sumpa. Beeing located on a strategic galactic junction and harboring vast quanities of +Teledan 1 0 1 Special Neutral Neutral Swamp Hostile Enviroment Covered in swamps that are inhabited by hostile flora and fauna, Teledan offers little to no planetary value. +Skaeld 2 2 1 Civil, 1 Factory 1x3 Ammo 1x2 Neutral Neutral Ice World Snow-Storms, Cold As a cold and icy world, Tohs is the most abseit republic planet with an operational base on it. Beeing a harsh enviroment for any human settlement, would it not be for the big factory complex to keeps the inhabitants warm at night this nearly uninhabitable place would be empty. +Skaeld II 1 0 1 Factory 1x2 Armour Neural Neutral Ice World Snow-Storms, Cold +Troikn 2 3 2 Civil, 1 Factory 1x2 Weapons 1x2, 1x1 2 Republic Yar'Kassy Steppe Hot Troikn is part the Fiefdom of Yar'Kassy, ruled over by a planetary govenor by the grace of the grand mogul. Its hot steppes are only sparsly populated.and its economic output extends only to military equiment for the armys of the grand vesirs of Yar'Kassy. +Ulfsun 3 1 1 Civil, 2 Food 2x3 3 Neutral Neutral Mild none Ulfsun, a peaceful and fertile grass-world in the ____arm is an exporter of food for the republics densly populated systems near the Core Worlds. +Voteine 3 6 2 Civil, 2 Factory 2x3 Armour, Weapons 2x3 4 Voteine Voteine Mild none In terms of Civilisational Harmony and population-spanning wealth and communal spirit, the Home World of the Voteine People, an Abhuman breed, is unmatched in any neighboring systems and far beyond. The planets self sufficient structures are governed by a democratic and enlightend leadership. +Wyth 2 5 3 Civil, 1 Food 1x3 1x3,2x1 4 Wythler Khanate Wythler Khanate Steppe Event = Population decrease The Steppes of Wyth, Home World to the Wythlers and the Khanates Seat of Power is the cradle of all Wythler Civilisation. The Golden Palace as well as the City of Khanar-Khargan dominates this world as much as Wyth itself domintes all neighboring worlds.Its is the source of supreme authority. +Xonorasis 1 1 1 Civil, 2 Factory 1x1,1x2 Ammo, Fuel 1x1 1 Arca Arca Stone Low Air Exploited to the core by its Arcan Inhabiors, the planet of Xonorasis is made nigh uninhabtale by greedy industrial endevours. +Yeesveer 5 0 - Republic Republic Gas Giant none +Yeesveer Kees 1 0 1 Factory 1x2 Weapons 2 Republic Republic Moon Landscape Low Air, Low Gravity +Yeesveer Rest 2 4 1 Civil, (1) Civil 1x1, 1x3 Republic Republic Mountainous none +Yeesveer Tri 1 0 Republic Republic No Atmosphere +Zami 2 4 2 Civil, 1 Food 1x3 2x2 4 Zami Technocracy Zami Technocracy Mild none While its toxic surface is populated by slaves and automatas the ruling elite of Zami concile in spires of unrivaled grace and technical sophistication. The Zami Technocracy keeps its distance from largerm organisational bodys like the republic or the Khanate, for its menacing and strange makinations are steeped in mystery and viewed with contempt throuout known space. +Zami II 2 3 2 Civil, 1 Factory, 1 Special 1x3 Weapons 1x2,1x1 4 Zami Technocracy Zami Technocracy Mild Unlocks Special (hidden) after alignment is set Cloning Tombs Mirroring the structures found on Zami, its twin planet is striving to step into its foot steps. +Yar'kassy 3 6 3 Civil 1x4,2x1 3 Republic Yar'Kassy Steppe Hot Yar'Kassy, voice of the wind, golden gem of the Fiefdom and home to the Maroon Alcázar +Yarva Primus 2 5 2 Civil Neutral Neutral Mild none While the first Yar'Kassian Pioneers settled Yarva and its moon as a military outpost, it has long since developed into a full flegded Society under the supreme governance of the Yar'Kassy Palace. +Yarva Minoris 1 3 1 Civil, 1 Factory Neutral Neutral Mild none Beeing the moon of Primus, the settlement on minoris is now also the birthplace of many Yar'Kassian Planetary Armourments. +Vestripee +Taurellia +Flynn's World 2 3 2 Civil, 1 Food 1x2 1x2, 1x1 Republic Republic Mild none +Vaiar +Marland +Ahr +Rimspace Station 1 1 1 Special A mysterius religious cult inhabits a Void Station on the edge of known space. It orbits a strange space anomaly and the cult seems to be connected to it in very unsetteling way. +Vesparus 1 Civil, 3 Food 3x3 Republic Republic As the defacto Breadbasket of the Republic, the Planet Vesparus is of vital importance. Its mild planes and gigantic fields are home to generous and friendly kind of settlers whose main Concern is the well beeing of its neighbouring systems. So they think. +Kyralos +Cervis In midnight clad, the surface of Cervis is so seldomly touched by sunlight that the pale people living on it . +Inobria +Chirago +Rythion +Binnisar +Waylen +Gysir +Garsomyr +Ehrlen +Varr +Karth +Sikhara +Ingrim 1 Civil, 2 Factory +Bail Harmonn \ No newline at end of file diff --git a/Assets/GWConquest/Units/Cruiser.asset.meta b/Assets/GWConquest/Resources/Database/Planets.csv.meta similarity index 54% rename from Assets/GWConquest/Units/Cruiser.asset.meta rename to Assets/GWConquest/Resources/Database/Planets.csv.meta index b7113b6..9bbb479 100644 --- a/Assets/GWConquest/Units/Cruiser.asset.meta +++ b/Assets/GWConquest/Resources/Database/Planets.csv.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 841688f875289d94b9cdcf11abb6cb10 -NativeFormatImporter: +guid: 82848fc2ff47b9a4689ea4ea74241a5f +TextScriptImporter: externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/GWConquest/Resources/Database/Ships.csv b/Assets/GWConquest/Resources/Database/Ships.csv new file mode 100644 index 0000000..0697bf8 --- /dev/null +++ b/Assets/GWConquest/Resources/Database/Ships.csv @@ -0,0 +1,11 @@ +Full Name,Short Name,Hitpoints,Attack Count,Damage,Penetration,Accuracy,Attack Timer,Armour,Evasion,Movement,Credit Cost,Recruit Cost,Ammo Cost,Fuel Cost,Credit Upkeep,Food Upkeep,Min Factory Tier,Description +,,,,,,in %,in sec,,in %,,,,,,pro sec,pro sec,, +Strike Craft,StrikeCraft,10,1,10,1,90,5,2,50,2,200,10,10,10,2,2,1,Basic strike craft +Frigate,Frigate,10,1/2/3,10/20/30,1/1/1,95/80/50,1/2/1,2,50,2,200,10,10,10,2,2,3,Basic strike craft +Cruiser,Cruiser,10,1/2/3,10/20/30,1/1/1,95/80/50,1/2/1,2,50,2,200,10,10,10,2,2,3,Basic strike craft +Destroyer,Destroyer,10,1/2/3,10/20/30,1/1/1,95/80/50,1/2/1,2,50,2,200,10,10,10,2,2,3,Basic strike craft +Battleship,Battleship,10,1/2/3,10/20/30,1/1/1,95/80/50,1/2/1,2,50,2,200,10,10,10,2,2,1,Basic strike craft +Dreadnought,Dreadnought,10,1/2/3,10/20/30,1/1/1,95/80/50,1/2/1,2,50,2,200,10,10,10,2,2,1,Basic strike craft +Escort Carrier,EscortCarrier,10,1/2/3,10/20/30,1/1/1,95/80/50,1/2/1,2,50,2,200,10,10,10,2,2,1,Basic strike craft +Transport Frigate,TransportFrigate,10,1/2/3,10/20/30,1/1/1,95/80/50,1/2/1,2,50,2,200,10,10,10,2,2,2,Basic strike craft +Transport Cruiser,TransportCruiser,10,1/2/3,10/20/30,1/1/1,95/80/50,1/2/1,2,50,2,200,10,10,10,2,2,3,Basic strike craft \ No newline at end of file diff --git a/Assets/GWConquest/Units/Fighter.asset.meta b/Assets/GWConquest/Resources/Database/Ships.csv.meta similarity index 54% rename from Assets/GWConquest/Units/Fighter.asset.meta rename to Assets/GWConquest/Resources/Database/Ships.csv.meta index d9f204c..8e6ca50 100644 --- a/Assets/GWConquest/Units/Fighter.asset.meta +++ b/Assets/GWConquest/Resources/Database/Ships.csv.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 2e695488eaaece642a61f074dd1eec54 -NativeFormatImporter: +guid: edfe6b3ac1426804ca46ada8dcfa22d1 +TextScriptImporter: externalObjects: {} - mainObjectFileID: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/GWConquest/Resources/UnitIcons.meta b/Assets/GWConquest/Resources/UnitIcons.meta new file mode 100644 index 0000000..800aaaa --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 477d37aaedf8ca34caf5fddc0a9120f3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Icons/Ship 1,5.png b/Assets/GWConquest/Resources/UnitIcons/Ship 1,5.png similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 1,5.png rename to Assets/GWConquest/Resources/UnitIcons/Ship 1,5.png diff --git a/Assets/GWConquest/Textures/Icons/Ship 1,5.png.meta b/Assets/GWConquest/Resources/UnitIcons/Ship 1,5.png.meta similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 1,5.png.meta rename to Assets/GWConquest/Resources/UnitIcons/Ship 1,5.png.meta diff --git a/Assets/GWConquest/Textures/Icons/Ship 1.png b/Assets/GWConquest/Resources/UnitIcons/Ship 1.png similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 1.png rename to Assets/GWConquest/Resources/UnitIcons/Ship 1.png diff --git a/Assets/GWConquest/Textures/Icons/Ship 1.png.meta b/Assets/GWConquest/Resources/UnitIcons/Ship 1.png.meta similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 1.png.meta rename to Assets/GWConquest/Resources/UnitIcons/Ship 1.png.meta diff --git a/Assets/GWConquest/Textures/Icons/Ship 2.png b/Assets/GWConquest/Resources/UnitIcons/Ship 2.png similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 2.png rename to Assets/GWConquest/Resources/UnitIcons/Ship 2.png diff --git a/Assets/GWConquest/Textures/Icons/Ship 2.png.meta b/Assets/GWConquest/Resources/UnitIcons/Ship 2.png.meta similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 2.png.meta rename to Assets/GWConquest/Resources/UnitIcons/Ship 2.png.meta diff --git a/Assets/GWConquest/Textures/Icons/Ship 2123.png b/Assets/GWConquest/Resources/UnitIcons/Ship 2123.png similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 2123.png rename to Assets/GWConquest/Resources/UnitIcons/Ship 2123.png diff --git a/Assets/GWConquest/Textures/Icons/Ship 2123.png.meta b/Assets/GWConquest/Resources/UnitIcons/Ship 2123.png.meta similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 2123.png.meta rename to Assets/GWConquest/Resources/UnitIcons/Ship 2123.png.meta diff --git a/Assets/GWConquest/Textures/Icons/Ship 22.png b/Assets/GWConquest/Resources/UnitIcons/Ship 22.png similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 22.png rename to Assets/GWConquest/Resources/UnitIcons/Ship 22.png diff --git a/Assets/GWConquest/Textures/Icons/Ship 22.png.meta b/Assets/GWConquest/Resources/UnitIcons/Ship 22.png.meta similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 22.png.meta rename to Assets/GWConquest/Resources/UnitIcons/Ship 22.png.meta diff --git a/Assets/GWConquest/Textures/Icons/Ship 3.png b/Assets/GWConquest/Resources/UnitIcons/Ship 3.png similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 3.png rename to Assets/GWConquest/Resources/UnitIcons/Ship 3.png diff --git a/Assets/GWConquest/Textures/Icons/Ship 3.png.meta b/Assets/GWConquest/Resources/UnitIcons/Ship 3.png.meta similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 3.png.meta rename to Assets/GWConquest/Resources/UnitIcons/Ship 3.png.meta diff --git a/Assets/GWConquest/Textures/Icons/Ship 321.png b/Assets/GWConquest/Resources/UnitIcons/Ship 321.png similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 321.png rename to Assets/GWConquest/Resources/UnitIcons/Ship 321.png diff --git a/Assets/GWConquest/Textures/Icons/Ship 321.png.meta b/Assets/GWConquest/Resources/UnitIcons/Ship 321.png.meta similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 321.png.meta rename to Assets/GWConquest/Resources/UnitIcons/Ship 321.png.meta diff --git a/Assets/GWConquest/Textures/Icons/Ship 4.png b/Assets/GWConquest/Resources/UnitIcons/Ship 4.png similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 4.png rename to Assets/GWConquest/Resources/UnitIcons/Ship 4.png diff --git a/Assets/GWConquest/Textures/Icons/Ship 4.png.meta b/Assets/GWConquest/Resources/UnitIcons/Ship 4.png.meta similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 4.png.meta rename to Assets/GWConquest/Resources/UnitIcons/Ship 4.png.meta diff --git a/Assets/GWConquest/Textures/Icons/Ship 5.png b/Assets/GWConquest/Resources/UnitIcons/Ship 5.png similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 5.png rename to Assets/GWConquest/Resources/UnitIcons/Ship 5.png diff --git a/Assets/GWConquest/Textures/Icons/Ship 5.png.meta b/Assets/GWConquest/Resources/UnitIcons/Ship 5.png.meta similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 5.png.meta rename to Assets/GWConquest/Resources/UnitIcons/Ship 5.png.meta diff --git a/Assets/GWConquest/Textures/Icons/Ship 6.png b/Assets/GWConquest/Resources/UnitIcons/Ship 6.png similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 6.png rename to Assets/GWConquest/Resources/UnitIcons/Ship 6.png diff --git a/Assets/GWConquest/Textures/Icons/Ship 6.png.meta b/Assets/GWConquest/Resources/UnitIcons/Ship 6.png.meta similarity index 100% rename from Assets/GWConquest/Textures/Icons/Ship 6.png.meta rename to Assets/GWConquest/Resources/UnitIcons/Ship 6.png.meta diff --git a/Assets/GWConquest/Textures/Icons/Tank Medium.png b/Assets/GWConquest/Resources/UnitIcons/Tank Medium.png similarity index 100% rename from Assets/GWConquest/Textures/Icons/Tank Medium.png rename to Assets/GWConquest/Resources/UnitIcons/Tank Medium.png diff --git a/Assets/GWConquest/Textures/Icons/Tank Medium.png.meta b/Assets/GWConquest/Resources/UnitIcons/Tank Medium.png.meta similarity index 100% rename from Assets/GWConquest/Textures/Icons/Tank Medium.png.meta rename to Assets/GWConquest/Resources/UnitIcons/Tank Medium.png.meta diff --git a/Assets/GWConquest/Resources/UnitIcons/placeholder.png b/Assets/GWConquest/Resources/UnitIcons/placeholder.png new file mode 100644 index 0000000000000000000000000000000000000000..64e5430b5ec8ed36ac4d6cf65c3ea43cc1d8e179 GIT binary patch literal 3260 zcmd5<=|9wO7oHRfgQ5r_OO32qGj=2Uj6M63>`O%QGcmR>b{b2TQDcy$$TpUWgk)`M zD2%17V?;m35JNrRp5Nzr@jQRQ^Wy%V&v|jK``qVT_jR9dswKh*%qGAF0)fCL#s=1a zZTYiKvH)MLQ5HqO91FKL(g)R#39SLn312<99thN!&3<^38Sqbq8asxAK%BjQ*0F(* zYA+Co!^*@!&-O334XlYDuLbWrvcxZydMkW;d4lJwYIJ#mbXxmTh5BEAf7J_Rhop&$ zEeysjFv&eZLlPij!kWzaXm-Qvw&lXSXKgtQUC@l_-zY8DM&t_IVsB)}d~bL!F}nyw zul1>2Euq$KmQ^I)20QlwujXqjceCHOc#j`{7S*&mCxUq`9@lc_x-whk8pe^9|>FmJ}JIxEQ+| z;igNtJtYWomMIO4H0{aH<#mzaEB9O(!)mm(%16}VhPL55qU8g`U6)=0$YO1LR0eX<}s+JNx{!sn@nCPdObXp#2syBo_3CC@m( zORl;mtQ@nPPuL-MzbTnI`jXXa&9abH;>c8t~a zXAmPyBIn|FQ_-i9vz-y|%Czp6%5p~}WD$938cqXqM6*IU6-4Q^Z$a_bax!tJx~rMS}& zMAzlXS67YD$jn}&(3!j?vglnmkU%x30ko~aR>cnBqW zq)u1!^lQk8H(UzJ@7b-O4?k(dKPk1dw)S))CFK3}6oDN94pAa2E4%XHv5xEy25iEf z5{yKH^)2UGL%-?M=<8ny>ao9n1?wPjRH+?;W*eN&U7D(7_za%Iow16v}~+yYqZl!nkz_|^susXbo6&?5A9iFK}*9@IN|$2Yd@HT zwWB8wX{*_od|^8yT-)MBRR`rvK{dqTe0re8_vzMQRf2X~Rqny(=gtU2q-~deurIfu zOj?1QD-|jf{}ZN06}cAr=2vgQf$wXN9;RlXkb?_W9c-_=fGzc|)0VLsko7@4 z$yk4|13aSPf2L|NhiR)2l@HvCEmEjigtP2_|2fYiH z(FVTiV`W+;O@H5~tz=HMg}B?xoiDADm=UvDhU_4PJri-#v(ZIRg6{|6-4j~8A|Lzn zUffmbZAug%7UrKCn?=DkOidhc~ z3>-~PW})?_aNX0^`lQ+~edUTZ^+dis!v$rTG^<_X5aZAqU}svd0#|MenJ@FC$~qG! z?a$I@dJ@!`^|Nlag!c?rfTlLwiZ)5qG&$QN}5^+=X3M~r#WlB zykk?J-G_#1w^H)u>o_hh5pCrZE|JYzBm5Qswb5U$s8U4e?1XxME!K=`I_iIP^;WWa z;Aa_oM-Y&7-^a;GKRKrswBe7ur1{Q>^-`JGATnXpP6q?gIcXL6n72|pXKgSCd9=M9 zMth$tzWb!o{0OKwFKyK%NJ06Id9iZps3c~c$P~7}y}bJ^b!aV@fZ;1Z8C@JAr8+Yz zAiMEZS$L!Dd#xnA5f^P|jT9`dvNn`2?Ncb{>Jk;jEyw{E+5scR@aoMdG`_}kdoW5e zZQbU4?W!*VYsPSKYkGV8G4F)7ChG8-r0>Y1t1H8W@?=AQj zqW8b8S&Fp9*0N`W5lvzUVJt)obQSO2UZXsW6;2zXI!-xyGfa9_SN|C3ur7wQz?T=4OlHw zL(V0#a+UgOBBO-Jmlvj4y*-(W0NlB;8=Eg+kq*#13lG8-4h8_8j~qMB(!Na@lZogZ z!d$k9e*QwrLa$9aEXvfj9({{Zacwsq@l+eR^M24+H=GhhTd7>~ky7O^t|r0ZaD@Gt zoI3#QM(1~UdJ1jzgU0!)sFjhT7LB|G+xjQ{=0qA%kG#75@a#QCMLRuyEX+Z?4U-=S zSR;Q`9rnf^OBK&Pbe_hBHtMkYws`>1tD&f^g(OTazhr@|v(G#XzPw{hKB(5UG;jST z`47WhxQowkkk0m|^T`urPoCO-+n35Sbtu!v0^>W1&GV|hHK^fvu(Kw$vX^jMYhvB^ z%rfi6fDO#TIBVdWreQh*>g4Ra7~=P^3vathx%7AAt%1&M%EKB|QhFlioi)QG^K#?? zE?;~I2>Ha?iQfdC(fXG^-V+xGvVCdIfZ(AibACqwdDO3f7LQ(pCAWvIsrI!7ekoSF zJ>w_X2wVvNt=wz|t_FK|BYa=)&*33^@m0lz^6vL$Mc_oyf@o_|*2bQM8bHT)!P3z2 zDFD0VI4h^uy6zT_tDa`mwij74#M@7CuUI8;66%-+K4;5w$^3=IETp=5e9Pu3Vk&u+ zs=LKKTC_&}ii4$CkC^+awTq0cKvW$V%y-AO#oj1%(Ge*R%-NApbVz5%1GCSRsmI3g-h*WF7shk!vVoqEe{itMyKIpV z&6tDn)TKgeGx8Y=d=F5bjI=biTiZ*62#Grz-7PJ=K3VG7B08#uSwj9TEiKn_4|&vK zJajspQ1iUMJZ6y%tpjMk!Z~@jpu?YAy{QjiOI1S99i7)(AvueqKu+MmV6Rt5`cUcv pvkEX+*D_R-_5XWZKH2+IBpNNv%+cAE4E%9`Os*pg>h(Pm{slT=Iqm=e literal 0 HcmV?d00001 diff --git a/Assets/GWConquest/Resources/UnitIcons/placeholder.png.meta b/Assets/GWConquest/Resources/UnitIcons/placeholder.png.meta new file mode 100644 index 0000000..e73068a --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/placeholder.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 661b9a59a7d094b46a5ae1a251989a4b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scenes/GalaxyMap.unity b/Assets/GWConquest/Scenes/GalaxyMap.unity index cdc93fe..59a15db 100644 --- a/Assets/GWConquest/Scenes/GalaxyMap.unity +++ b/Assets/GWConquest/Scenes/GalaxyMap.unity @@ -1623,7 +1623,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1733525146} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -1644,7 +1644,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3004,6 +3004,80 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: target: {fileID: 0} +--- !u!1 &71338307 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 71338308} + - component: {fileID: 71338310} + - component: {fileID: 71338309} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &71338308 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 71338307} + 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: 1548826460} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 4, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &71338309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 71338307} + 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.7607843} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1.8 +--- !u!222 &71338310 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 71338307} + m_CullTransparentMesh: 0 --- !u!1 &72183046 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4678135251219452000, guid: 9ae35d7f911b63f4f95f432141dd5746, @@ -3061,8 +3135,8 @@ RectTransform: m_Father: {fileID: 538000015} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.7163705} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 4, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -4138,6 +4212,51 @@ Transform: type: 3} m_PrefabInstance: {fileID: 102187271} m_PrefabAsset: {fileID: 0} +--- !u!1 &103575250 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 103575251} + - component: {fileID: 103575252} + m_Layer: 5 + m_Name: Text (9) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &103575251 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 103575250} + 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: 415812806} + m_Father: {fileID: 1069889124} + 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: 5, y: -29} + m_SizeDelta: {x: -10, y: 145.3396} + m_Pivot: {x: 0, y: 1} +--- !u!222 &103575252 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 103575250} + m_CullTransparentMesh: 0 --- !u!1 &118204286 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4678135251219452000, guid: 9ae35d7f911b63f4f95f432141dd5746, @@ -7860,6 +7979,131 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &283534714 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1733525146} + 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 &283534715 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1738231878797738975, guid: 48644caf44a9db343acb000000c25522, + type: 3} + m_PrefabInstance: {fileID: 283534714} + m_PrefabAsset: {fileID: 0} --- !u!1001 &286802685 PrefabInstance: m_ObjectHideFlags: 0 @@ -8594,8 +8838,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 75509415} m_HandleRect: {fileID: 75509414} m_Direction: 2 - m_Value: 1 - m_Size: 0.28362948 + m_Value: 0 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -8637,6 +8881,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 316651316} m_CullTransparentMesh: 0 +--- !u!1 &321296367 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 321296368} + - component: {fileID: 321296370} + - component: {fileID: 321296369} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &321296368 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 321296367} + 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: 386890075} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 4, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &321296369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 321296367} + 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.7607843} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1.8 +--- !u!222 &321296370 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 321296367} + m_CullTransparentMesh: 0 --- !u!1001 &326020191 PrefabInstance: m_ObjectHideFlags: 0 @@ -9272,6 +9590,130 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 338855352} m_CullTransparentMesh: 0 +--- !u!1 &341754044 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 341754045} + - component: {fileID: 341754048} + - component: {fileID: 341754047} + - component: {fileID: 341754046} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &341754045 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 341754044} + 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: 1548826460} + m_Father: {fileID: 807807167} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 4, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &341754046 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 341754044} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 71338309} + m_HandleRect: {fileID: 71338308} + m_Direction: 2 + m_Value: 1 + m_Size: 0.5891301 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &341754047 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 341754044} + 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.09019608} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1.8 +--- !u!222 &341754048 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 341754044} + m_CullTransparentMesh: 0 --- !u!1001 &341900356 PrefabInstance: m_ObjectHideFlags: 0 @@ -10183,7 +10625,7 @@ PrefabInstance: - target: {fileID: 3266501631720423375, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.x - value: 13 + value: 14.91 objectReference: {fileID: 0} - target: {fileID: 3266501631720423375, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -10193,7 +10635,7 @@ PrefabInstance: - target: {fileID: 3266501631720423375, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_LocalPosition.z - value: -35.4 + value: -35.86 objectReference: {fileID: 0} - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -10356,6 +10798,95 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &361538868 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 361538869} + - component: {fileID: 361538872} + - component: {fileID: 361538871} + - component: {fileID: 361538870} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &361538869 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 361538868} + 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: 2089647852} + m_Father: {fileID: 807807167} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -4, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &361538870 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 361538868} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &361538871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 361538868} + 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: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &361538872 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 361538868} + m_CullTransparentMesh: 0 --- !u!1001 &364491334 PrefabInstance: m_ObjectHideFlags: 0 @@ -10695,7 +11226,7 @@ PrefabInstance: - target: {fileID: 4678135251219452000, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: m_Name - value: Caer Bannoq + value: Caer-Bannoq objectReference: {fileID: 0} - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -10706,7 +11237,7 @@ PrefabInstance: - target: {fileID: 4678135251219452001, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} propertyPath: planetName - value: Caer Bannoq + value: Caer-Bannoq objectReference: {fileID: 0} - target: {fileID: 4678135251355824059, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} @@ -10951,6 +11482,42 @@ Transform: type: 3} m_PrefabInstance: {fileID: 382071276} m_PrefabAsset: {fileID: 0} +--- !u!1 &386890074 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 386890075} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &386890075 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 386890074} + 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: 321296368} + m_Father: {fileID: 576566015} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -4, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &390578860 PrefabInstance: m_ObjectHideFlags: 0 @@ -11124,6 +11691,52 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &392341599 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 392341600} + - component: {fileID: 392341601} + m_Layer: 5 + m_Name: CostIcon (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &392341600 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392341599} + 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: 1984794002} + - {fileID: 1279735720} + m_Father: {fileID: 1033443517} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -70, y: 0} + m_SizeDelta: {x: 60, y: 35} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &392341601 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392341599} + m_CullTransparentMesh: 0 --- !u!1001 &393053935 PrefabInstance: m_ObjectHideFlags: 0 @@ -12176,7 +12789,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1048383554} - m_RootOrder: 1 + 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} @@ -12197,7 +12810,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -12220,6 +12833,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 414428417} m_CullTransparentMesh: 0 +--- !u!1 &415812805 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 415812806} + - component: {fileID: 415812808} + - component: {fileID: 415812807} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &415812806 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 415812805} + 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: 103575251} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!114 &415812807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 415812805} + 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 &415812808 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 415812805} + m_CullTransparentMesh: 0 --- !u!1001 &418161397 PrefabInstance: m_ObjectHideFlags: 0 @@ -12707,6 +13394,7 @@ MonoBehaviour: - {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1} - {r: 1, g: 0.8901961, b: 0.5647059, a: 1} - {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1} + UnitClasses: [] --- !u!4 &426309784 Transform: m_ObjectHideFlags: 0 @@ -12719,7 +13407,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &439458478 GameObject: @@ -16678,6 +17366,130 @@ Transform: type: 3} m_PrefabInstance: {fileID: 575247646} m_PrefabAsset: {fileID: 0} +--- !u!1 &576566014 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 576566015} + - component: {fileID: 576566018} + - component: {fileID: 576566017} + - component: {fileID: 576566016} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &576566015 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 576566014} + 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: 386890075} + m_Father: {fileID: 1277175058} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 4, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &576566016 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 576566014} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 321296369} + m_HandleRect: {fileID: 321296368} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &576566017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 576566014} + 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.09019608} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1.8 +--- !u!222 &576566018 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 576566014} + m_CullTransparentMesh: 0 --- !u!1 &578637204 GameObject: m_ObjectHideFlags: 0 @@ -17181,7 +17993,7 @@ GameObject: - component: {fileID: 609493134} - component: {fileID: 609493133} m_Layer: 5 - m_Name: Text + m_Name: DistrictNameText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -17328,8 +18140,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1659683067} m_HandleRect: {fileID: 1659683066} m_Direction: 2 - m_Value: 1 - m_Size: 0.6649611 + m_Value: 0 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -19047,41 +19859,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &668698209 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 668698210} - m_Layer: 5 - m_Name: TextPanel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &668698210 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 668698209} - 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: 1420890672} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &675971137 GameObject: m_ObjectHideFlags: 0 @@ -21856,6 +22633,52 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 739592047} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &742889848 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 742889849} + - component: {fileID: 742889850} + m_Layer: 5 + m_Name: CostIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &742889849 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 742889848} + 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: 1868855359} + - {fileID: 1705961608} + m_Father: {fileID: 1033443517} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: 60, y: 35} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &742889850 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 742889848} + m_CullTransparentMesh: 0 --- !u!1 &748172935 GameObject: m_ObjectHideFlags: 0 @@ -22266,7 +23089,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 573.74054} + m_SizeDelta: {x: 0, y: 369.19482} m_Pivot: {x: 0, y: 1} --- !u!1 &756433303 GameObject: @@ -22501,7 +23324,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &765894939 RectTransform: m_ObjectHideFlags: 0 @@ -22556,8 +23379,8 @@ MonoBehaviour: GroundDistrictName: {fileID: 701605851} SpaceDistrictName: {fileID: 1050884036} FleetIcons: {fileID: 1739782529} - GroundPanel: {fileID: 1659880901} - GroundPlayerFleetPanel: {fileID: 1167835968} + GroundPanel: {fileID: 1659880903} + GroundPlayerFleetPanel: {fileID: 0} --- !u!1001 &766573527 PrefabInstance: m_ObjectHideFlags: 0 @@ -23203,6 +24026,113 @@ MonoBehaviour: sign: -1 drawCircle: 0 circle: {fileID: 2800000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3} +--- !u!1 &807807166 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 807807167} + - component: {fileID: 807807170} + - component: {fileID: 807807169} + - component: {fileID: 807807168} + m_Layer: 5 + m_Name: Scroll View (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &807807167 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 807807166} + 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: 361538869} + - {fileID: 341754045} + m_Father: {fileID: 903076478} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 20, y: -123} + m_SizeDelta: {x: -36, y: -133} + m_Pivot: {x: 0, y: 1} +--- !u!114 &807807168 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 807807166} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 2089647852} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 2 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 361538869} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 341754046} + m_HorizontalScrollbarVisibility: 1 + m_VerticalScrollbarVisibility: 1 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &807807169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 807807166} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 0 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &807807170 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 807807166} + m_CullTransparentMesh: 0 --- !u!1 &807960385 GameObject: m_ObjectHideFlags: 0 @@ -23373,80 +24303,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 808048141} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &808919757 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 808919758} - - component: {fileID: 808919760} - - component: {fileID: 808919759} - 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 &808919758 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 808919757} - 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: 1733525146} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -6, y: 0} - m_SizeDelta: {x: 58, y: 58} - m_Pivot: {x: 1, y: 0.5} ---- !u!114 &808919759 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 808919757} - 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 &808919760 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 808919757} - m_CullTransparentMesh: 0 --- !u!1001 &815902620 PrefabInstance: m_ObjectHideFlags: 0 @@ -24090,7 +24946,7 @@ Transform: - {fileID: 7718295} - {fileID: 1985410692} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &850500813 GameObject: @@ -25782,6 +26638,86 @@ Transform: type: 3} m_PrefabInstance: {fileID: 911910427} m_PrefabAsset: {fileID: 0} +--- !u!1 &913566520 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 913566521} + - component: {fileID: 913566523} + - component: {fileID: 913566522} + m_Layer: 5 + m_Name: Text (8) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &913566521 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 913566520} + 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: 1069889124} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0, y: 1} +--- !u!114 &913566522 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 913566520} + 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: 21 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Armory + +' +--- !u!222 &913566523 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 913566520} + m_CullTransparentMesh: 0 --- !u!1 &917462570 GameObject: m_ObjectHideFlags: 0 @@ -25886,7 +26822,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1048383554} - m_RootOrder: 2 + 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} @@ -25907,7 +26843,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0.70980394, g: 0.28578943, b: 0.065301925, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -25917,8 +26853,8 @@ MonoBehaviour: m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 - m_FillAmount: 0.791 - m_FillClockwise: 0 + m_FillAmount: 0.385 + m_FillClockwise: 1 m_FillOrigin: 2 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 @@ -26921,6 +27857,12 @@ 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 @@ -27539,7 +28481,7 @@ Transform: - {fileID: 2007032522} - {fileID: 1271054492} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &993895864 GameObject: @@ -27854,7 +28796,7 @@ Transform: m_LocalScale: {x: 14126.617, y: 14126.617, z: 14126.617} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 22.319, y: 136.238, z: 46.322002} --- !u!1001 &1000076786 PrefabInstance: @@ -28957,7 +29899,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 573.74054} + m_SizeDelta: {x: 0, y: 141.20746} m_Pivot: {x: 0, y: 1} --- !u!1001 &1024967746 PrefabInstance: @@ -29187,6 +30129,52 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1027921499} m_CullTransparentMesh: 0 +--- !u!1 &1033443516 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1033443517} + - component: {fileID: 1033443518} + m_Layer: 5 + m_Name: Costs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1033443517 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1033443516} + 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: 742889849} + - {fileID: 392341600} + m_Father: {fileID: 2083163756} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 155, y: 20} + m_SizeDelta: {x: -175, y: 50} + m_Pivot: {x: 0, y: 0} +--- !u!222 &1033443518 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1033443516} + m_CullTransparentMesh: 0 --- !u!1 &1037385797 GameObject: m_ObjectHideFlags: 0 @@ -29374,7 +30362,6 @@ GameObject: m_Component: - component: {fileID: 1048383554} - component: {fileID: 1048383556} - - component: {fileID: 1048383555} - component: {fileID: 1048383557} m_Layer: 5 m_Name: ProductionIcon @@ -29394,10 +30381,12 @@ RectTransform: 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} + - {fileID: 1699159793} m_Father: {fileID: 190081060} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -29406,35 +30395,6 @@ RectTransform: m_AnchoredPosition: {x: 5, y: 0} m_SizeDelta: {x: 130, y: 0} m_Pivot: {x: 0, y: 0.5} ---- !u!114 &1048383555 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1048383553} - 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 &1048383556 CanvasRenderer: m_ObjectHideFlags: 0 @@ -30490,6 +31450,43 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1069889123 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1069889124} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1069889124 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1069889123} + 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: 913566521} + - {fileID: 103575251} + m_Father: {fileID: 1805264931} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 369.19482} + m_Pivot: {x: 0, y: 1} --- !u!1001 &1070270449 PrefabInstance: m_ObjectHideFlags: 0 @@ -33061,27 +34058,6 @@ MonoBehaviour: sign: -1 drawCircle: 0 circle: {fileID: 2800000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3} ---- !u!1 &1167835967 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, - type: 3} - m_PrefabInstance: {fileID: 1420890671} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1167835968 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1167835967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5d18c4f05f567d740a67f00ca1311ebb, type: 3} - m_Name: - m_EditorClassIdentifier: - FormationUIPrefab: {fileID: 1708373286441865769, guid: a6a199668f204da4980f4edf1c2f4fea, - type: 3} - FormationParent: {fileID: 668698209} --- !u!1001 &1172288249 PrefabInstance: m_ObjectHideFlags: 0 @@ -33457,7 +34433,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1048383554} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -33478,7 +34454,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -33963,7 +34939,7 @@ PrefabInstance: - target: {fileID: -4216859302048453862, guid: ea716fd627e92314e9b5911e145db566, type: 3} propertyPath: m_RootOrder - value: 11 + value: 10 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: ea716fd627e92314e9b5911e145db566, type: 3} @@ -34792,7 +35768,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.8352941} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -34950,7 +35926,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1733525146} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -35680,26 +36656,18 @@ MonoBehaviour: sign: -1 drawCircle: 0 circle: {fileID: 2800000, guid: 9d02af9561347c349986baae6fb1fa27, type: 3} ---- !u!1 &1272010364 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4678135252407299479, guid: 9ae35d7f911b63f4f95f432141dd5746, +--- !u!114 &1272010366 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4437340467061616990, guid: 9ae35d7f911b63f4f95f432141dd5746, type: 3} m_PrefabInstance: {fileID: 30126765} m_PrefabAsset: {fileID: 0} ---- !u!114 &1272010365 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1272010364} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a89484993d239124eb667c8c33c633d3, type: 3} + m_Script: {fileID: 11500000, guid: 3097d18430809bc4db1e8e075e8199a2, type: 3} m_Name: m_EditorClassIdentifier: - DefaultSprite: {fileID: 21300000, guid: 3b81d9ff9816c8240b02293797c69234, type: 3} - DistrictName: Arnough Primus --- !u!1 &1272903228 GameObject: m_ObjectHideFlags: 0 @@ -35880,6 +36848,113 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1276485812} m_PrefabAsset: {fileID: 0} +--- !u!1 &1277175057 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1277175058} + - component: {fileID: 1277175061} + - component: {fileID: 1277175060} + - component: {fileID: 1277175059} + m_Layer: 5 + m_Name: Scroll View (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1277175058 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1277175057} + 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: 1805264931} + - {fileID: 576566015} + m_Father: {fileID: 1420890672} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 15, y: 0} + m_SizeDelta: {x: -30, y: -30} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1277175059 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1277175057} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 1069889124} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 1805264931} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 576566016} + m_HorizontalScrollbarVisibility: 1 + m_VerticalScrollbarVisibility: 1 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1277175060 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1277175057} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1277175061 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1277175057} + m_CullTransparentMesh: 0 --- !u!1 &1278756751 GameObject: m_ObjectHideFlags: 0 @@ -35973,6 +37048,84 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1278756751} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1279735719 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1279735720} + - component: {fileID: 1279735722} + - component: {fileID: 1279735721} + m_Layer: 5 + m_Name: Count + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1279735720 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1279735719} + 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: 392341600} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -40, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1279735721 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1279735719} + 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: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 10 +--- !u!222 &1279735722 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1279735719} + m_CullTransparentMesh: 0 --- !u!1001 &1281282921 PrefabInstance: m_ObjectHideFlags: 0 @@ -37056,7 +38209,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 8} m_Pivot: {x: 0.5, y: 0.5} @@ -37412,6 +38565,87 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1393522907} m_PrefabAsset: {fileID: 0} +--- !u!1 &1400073091 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1400073092} + - component: {fileID: 1400073094} + - component: {fileID: 1400073093} + m_Layer: 5 + m_Name: Text (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1400073092 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1400073091} + 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: 2083163756} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 165, y: -90} + m_SizeDelta: {x: -185, y: -205} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1400073093 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1400073091} + 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: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Heavy tank + + + stats' +--- !u!222 &1400073094 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1400073091} + m_CullTransparentMesh: 0 --- !u!1 &1400450142 GameObject: m_ObjectHideFlags: 0 @@ -37703,6 +38937,8 @@ MonoBehaviour: m_EditorClassIdentifier: DefaultSprite: {fileID: 21300000, guid: 3b81d9ff9816c8240b02293797c69234, type: 3} DistrictName: Arnough Secundus + Description: + IsCityDistrict: 0 --- !u!114 &1414113708 MonoBehaviour: m_ObjectHideFlags: 0 @@ -37895,7 +39131,7 @@ PrefabInstance: - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} propertyPath: m_Name - value: PlayerTroopsPanel + value: GarrisonPanel objectReference: {fileID: 0} - target: {fileID: 3709556431398436641, guid: 8b0edf9c7ac699a4da4b06f9b352ff47, type: 3} @@ -40781,6 +42017,42 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1548584995} m_PrefabAsset: {fileID: 0} +--- !u!1 &1548826459 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1548826460} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1548826460 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1548826459} + 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: 71338308} + m_Father: {fileID: 341754045} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -4, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1559587847 PrefabInstance: m_ObjectHideFlags: 0 @@ -41293,7 +42565,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1048383554} - m_RootOrder: 3 + 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} @@ -41314,7 +42586,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -43093,8 +44365,8 @@ RectTransform: m_Father: {fileID: 1509316992} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.3350389} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 4, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -43144,13 +44416,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1659880902} + - component: {fileID: 1659880903} m_Layer: 5 m_Name: GroundPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1659880902 RectTransform: m_ObjectHideFlags: 0 @@ -43175,6 +44448,20 @@ RectTransform: m_AnchoredPosition: {x: 19, y: -46.48999} m_SizeDelta: {x: -122, y: -178.96973} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1659880903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1659880901} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7df5e14173982b8428ae0788c3a6e13b, type: 3} + m_Name: + m_EditorClassIdentifier: + NameText: {fileID: 609493133} + DescriptionText: {fileID: 2089647853} --- !u!1 &1662758609 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4678135251219452000, guid: 9ae35d7f911b63f4f95f432141dd5746, @@ -44199,6 +45486,144 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1698295840} m_CullTransparentMesh: 0 +--- !u!1 &1699159792 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1699159793} + - component: {fileID: 1699159797} + - component: {fileID: 1699159796} + - component: {fileID: 1699159795} + - component: {fileID: 1699159794} + m_Layer: 5 + m_Name: Corners (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1699159793 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699159792} + 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: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &1699159794 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699159792} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 5e70562d361616744b69c9cee1da19b4, 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 &1699159795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699159792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1699159796} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1699159796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699159792} + 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: 1 + 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 &1699159797 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1699159792} + m_CullTransparentMesh: 0 --- !u!1 &1699325553 GameObject: m_ObjectHideFlags: 0 @@ -44366,6 +45791,84 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1699962661} m_CullTransparentMesh: 0 +--- !u!1 &1705961607 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1705961608} + - component: {fileID: 1705961610} + - component: {fileID: 1705961609} + m_Layer: 5 + m_Name: Count + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1705961608 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1705961607} + 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: 742889849} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -40, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1705961609 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1705961607} + 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: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 10 +--- !u!222 &1705961610 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1705961607} + m_CullTransparentMesh: 0 --- !u!1 &1712871362 GameObject: m_ObjectHideFlags: 0 @@ -44833,9 +46336,8 @@ GameObject: m_Component: - component: {fileID: 1733525146} - component: {fileID: 1733525148} - - component: {fileID: 1733525147} m_Layer: 5 - m_Name: ProductionIcon (3) + m_Name: ProductionMenuIcon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -44852,9 +46354,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 283534715} - {fileID: 1242554434} - {fileID: 36969550} - - {fileID: 808919758} - {fileID: 1241477597} m_Father: {fileID: 755462605} m_RootOrder: 0 @@ -44864,35 +46366,6 @@ RectTransform: m_AnchoredPosition: {x: 60.3, y: -4} m_SizeDelta: {x: 110, y: 68} m_Pivot: {x: 0.5, y: 1} ---- !u!114 &1733525147 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1733525145} - 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.7176471} - 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 &1733525148 CanvasRenderer: m_ObjectHideFlags: 0 @@ -45015,7 +46488,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1739782529 RectTransform: m_ObjectHideFlags: 0 @@ -46412,6 +47885,86 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1783084954} m_PrefabAsset: {fileID: 0} +--- !u!1 &1798217994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1798217995} + - component: {fileID: 1798217997} + - component: {fileID: 1798217996} + 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 &1798217995 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1798217994} + 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: 2083163756} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 155, y: -55} + m_SizeDelta: {x: -175, y: 25} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1798217996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1798217994} + 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: 21 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Tank 1 + +' +--- !u!222 &1798217997 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1798217994} + m_CullTransparentMesh: 0 --- !u!1 &1798411514 GameObject: m_ObjectHideFlags: 0 @@ -46463,6 +48016,95 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1805264930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1805264931} + - component: {fileID: 1805264934} + - component: {fileID: 1805264933} + - component: {fileID: 1805264932} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1805264931 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805264930} + 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: 1069889124} + m_Father: {fileID: 1277175058} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -4, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1805264932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805264930} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &1805264933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805264930} + 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: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1805264934 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1805264930} + m_CullTransparentMesh: 0 --- !u!1001 &1806309896 PrefabInstance: m_ObjectHideFlags: 0 @@ -46975,6 +48617,8 @@ MonoBehaviour: m_EditorClassIdentifier: DefaultSprite: {fileID: 21300000, guid: 37cef7217b3b5b0489b9f3c509958358, type: 3} DistrictName: Factory + Description: + IsCityDistrict: 0 --- !u!114 &1810911858 MonoBehaviour: m_ObjectHideFlags: 0 @@ -48207,6 +49851,86 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1860086266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1860086267} + - component: {fileID: 1860086269} + - component: {fileID: 1860086268} + m_Layer: 5 + m_Name: Text (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1860086267 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1860086266} + 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: 2083163756} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 155, y: 80} + m_SizeDelta: {x: -175, y: 26.837097} + m_Pivot: {x: 0, y: 0} +--- !u!114 &1860086268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1860086266} + 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: 21 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 6 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Costs + +' +--- !u!222 &1860086269 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1860086266} + m_CullTransparentMesh: 0 --- !u!1 &1860894687 GameObject: m_ObjectHideFlags: 0 @@ -48300,6 +50024,80 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1860894687} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1868855358 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1868855359} + - component: {fileID: 1868855361} + - component: {fileID: 1868855360} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1868855359 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868855358} + 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: 742889849} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 35, y: 0} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &1868855360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868855358} + 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: 37886999ca665794c9a20cebe80d56cc, 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 &1868855361 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868855358} + m_CullTransparentMesh: 0 --- !u!1001 &1881453206 PrefabInstance: m_ObjectHideFlags: 0 @@ -49434,7 +51232,7 @@ Transform: m_LocalScale: {x: 624.14606, y: 624.14606, z: 624.14606} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 90.00001, y: 0, z: 0} --- !u!1 &1935837316 stripped GameObject: @@ -50543,6 +52341,8 @@ MonoBehaviour: m_EditorClassIdentifier: DefaultSprite: {fileID: 21300000, guid: bd93e35d8eadb9844adef76ee7beacee, type: 3} DistrictName: Fields + Description: + IsCityDistrict: 0 --- !u!114 &1968289578 MonoBehaviour: m_ObjectHideFlags: 0 @@ -51472,7 +53272,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 86cc84fa3c4888445a10b07e33132af1, type: 3} m_Name: m_EditorClassIdentifier: - district1: {fileID: 1272010365} + district1: {fileID: 1272010366} district2: {fileID: 1968289577} --- !u!1 &1983076280 stripped GameObject: @@ -51495,6 +53295,80 @@ MonoBehaviour: StrengthBar: {fileID: 337027206} MaxFillAmount: 15 MaxFormationStrength: 100 +--- !u!1 &1984794001 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1984794002} + - component: {fileID: 1984794004} + - component: {fileID: 1984794003} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1984794002 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1984794001} + 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: 392341600} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 35, y: 0} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &1984794003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1984794001} + 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: 9dd934dc01acfe443a7ff320f825e6fe, 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 &1984794004 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1984794001} + m_CullTransparentMesh: 0 --- !u!1001 &1985410691 PrefabInstance: m_ObjectHideFlags: 0 @@ -52202,75 +54076,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2005292001} m_CullTransparentMesh: 0 ---- !u!1001 &2005582405 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3853081484115191440, guid: ce18725601da90e44b6088999b4b0976, - type: 3} - propertyPath: m_Name - value: UnitClassRegistry - objectReference: {fileID: 0} - - target: {fileID: 3853081484115191446, guid: ce18725601da90e44b6088999b4b0976, - type: 3} - propertyPath: m_LocalPosition.x - value: -40.8 - objectReference: {fileID: 0} - - target: {fileID: 3853081484115191446, guid: ce18725601da90e44b6088999b4b0976, - type: 3} - propertyPath: m_LocalPosition.y - value: -4.3 - objectReference: {fileID: 0} - - target: {fileID: 3853081484115191446, guid: ce18725601da90e44b6088999b4b0976, - type: 3} - propertyPath: m_LocalPosition.z - value: -713.4 - objectReference: {fileID: 0} - - target: {fileID: 3853081484115191446, guid: ce18725601da90e44b6088999b4b0976, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3853081484115191446, guid: ce18725601da90e44b6088999b4b0976, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3853081484115191446, guid: ce18725601da90e44b6088999b4b0976, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3853081484115191446, guid: ce18725601da90e44b6088999b4b0976, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3853081484115191446, guid: ce18725601da90e44b6088999b4b0976, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3853081484115191446, guid: ce18725601da90e44b6088999b4b0976, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3853081484115191446, guid: ce18725601da90e44b6088999b4b0976, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3853081484115191446, guid: ce18725601da90e44b6088999b4b0976, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ce18725601da90e44b6088999b4b0976, type: 3} --- !u!1001 &2007032521 PrefabInstance: m_ObjectHideFlags: 0 @@ -52659,7 +54464,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &2017850870 PrefabInstance: @@ -54184,8 +55989,9 @@ GameObject: - component: {fileID: 2089647852} - component: {fileID: 2089647854} - component: {fileID: 2089647853} + - component: {fileID: 2089647855} m_Layer: 5 - m_Name: Text (3) + m_Name: DescriptionText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -54202,13 +56008,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 903076478} - m_RootOrder: 1 + m_Father: {fileID: 361538869} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 20, y: -123} - m_SizeDelta: {x: -36, y: -133} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2089647853 MonoBehaviour: @@ -54258,6 +56064,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2089647851} m_CullTransparentMesh: 0 +--- !u!114 &2089647855 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2089647851} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1001 &2090400055 PrefabInstance: m_ObjectHideFlags: 0 @@ -55947,6 +57767,125 @@ 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 diff --git a/Assets/GWConquest/Scripts/CSVReader.cs b/Assets/GWConquest/Scripts/CSVReader.cs new file mode 100644 index 0000000..b2845b5 --- /dev/null +++ b/Assets/GWConquest/Scripts/CSVReader.cs @@ -0,0 +1,93 @@ +using System; +using System.Collections.Generic; + +namespace GWConquest +{ + public class CSVFile + { + private Dictionary headers = new Dictionary(); + + private string[,] data; + + public CSVEntry GetEntry(int index) + { + return new CSVEntry(this, index); + } + + public int Length + { + get => data.GetLength(0); + } + + public class CSVEntry + { + public CSVEntry(CSVFile _file, int _index) + { + file = _file; + index = _index; + } + + protected CSVFile file; + protected int index; + + public string GetString(string key) + { + int headerIndex = file.headers[key]; + return file.data[index, headerIndex].Trim(); + } + + public int GetInt(string key) + { + return int.Parse(GetString(key)); + } + + public float GetFloat(string key) + { + return float.Parse(GetString(key)); + } + } + + public static CSVFile ParseCSV(string csv, int headerLines = 1, char delimiter = ',') + { + string[] lines = csv.Split('\n'); + if (lines.Length > headerLines) + { + int lineCount = lines.Length - headerLines; + string[] headers = lines[0].Split(delimiter); + int fieldCount = headers.Length; + if (fieldCount > 0) + { + string[,] data = new string[lineCount, fieldCount]; + for (int i = 0; i < lineCount; i++) + { + string[] fields = lines[i + headerLines].Split(delimiter); + if (fields.Length == fieldCount) + { + for(int j = 0; j < fieldCount; j++) + { + data[i, j] = fields[j]; + } + + } + else throw new FormatException("Wrong number of fields on line " + (i + 1)); + } + + CSVFile file = new CSVFile + { + data = data + }; + for (int j = 0; j < fieldCount; j++) + { + UnityEngine.Debug.LogFormat("added header {0} {1}", headers[j], j); + file.headers.Add(headers[j].Trim(), j); + } + + return file; + } + else throw new FormatException("First line is empty!"); + } + else throw new FormatException("Not enough lines in CSV file!"); + } + } + +} \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/UnitClassRegistry.cs.meta b/Assets/GWConquest/Scripts/CSVReader.cs.meta similarity index 83% rename from Assets/GWConquest/Scripts/UnitClassRegistry.cs.meta rename to Assets/GWConquest/Scripts/CSVReader.cs.meta index 10c0ce1..46a7a1e 100644 --- a/Assets/GWConquest/Scripts/UnitClassRegistry.cs.meta +++ b/Assets/GWConquest/Scripts/CSVReader.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 20b8ae4ecc01f1340aafc50bb4faeb2b +guid: 06fe35a0a160f174a926782204a8b0b2 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/GWConquest/Scripts/District.cs b/Assets/GWConquest/Scripts/District.cs index cc3b4cc..fb58c9b 100644 --- a/Assets/GWConquest/Scripts/District.cs +++ b/Assets/GWConquest/Scripts/District.cs @@ -7,6 +7,10 @@ namespace GWConquest public Sprite DefaultSprite; public string DistrictName; + public string Description; + + public bool IsCityDistrict; + public Zone Zone { get; private set; } private Planet planet; @@ -17,7 +21,6 @@ namespace GWConquest } - public virtual Sprite GetCurrentSprite() { return DefaultSprite; @@ -25,7 +28,20 @@ namespace GWConquest public virtual string GetDistrictName() { - return DistrictName; + if(IsCityDistrict) + { + return planet.planetName + " " + DistrictName; + } + else return DistrictName; + } + + public virtual string GetDescription() + { + if(IsCityDistrict) + { + return planet.PlanetData?.Description; + } + else return Description; } } diff --git a/Assets/GWConquest/Scripts/DistrictFactory.cs b/Assets/GWConquest/Scripts/DistrictFactory.cs new file mode 100644 index 0000000..d2807d9 --- /dev/null +++ b/Assets/GWConquest/Scripts/DistrictFactory.cs @@ -0,0 +1,29 @@ +using UnityEngine; +using System.Collections.Generic; +using System.Linq; + +namespace GWConquest +{ + public class DistrictFactory : District + { + public int Tier = 1; + + public string[] SpecialUnits; + + public IEnumerable GetAvailableUnitClasses() + { + var classes = UnitClass.AllUnitClasses.Where(uc => uc.MinFactoryTier <= Tier); + var special = SpecialUnits.ToList().ConvertAll(name => UnitClass.FromName(name)); + return classes.Union(special); + } + + } + + public enum FactoryType + { + City, + Infantry, + Armour, + Space + } +} \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/DistrictFactory.cs.meta b/Assets/GWConquest/Scripts/DistrictFactory.cs.meta new file mode 100644 index 0000000..db5e13e --- /dev/null +++ b/Assets/GWConquest/Scripts/DistrictFactory.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3097d18430809bc4db1e8e075e8199a2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/DistrictUI.cs b/Assets/GWConquest/Scripts/DistrictUI.cs new file mode 100644 index 0000000..e34c4e0 --- /dev/null +++ b/Assets/GWConquest/Scripts/DistrictUI.cs @@ -0,0 +1,20 @@ +using UnityEngine; +using UnityEngine.UI; + +namespace GWConquest +{ + public class DistrictUI : MonoBehaviour + { + public Text NameText; + public Text DescriptionText; + + private District district; + + public void SelectDistrict(District d) + { + district = d; + NameText.text = district.GetDistrictName(); + DescriptionText.text = district.GetDescription(); + } + } +} \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/DistrictUI.cs.meta b/Assets/GWConquest/Scripts/DistrictUI.cs.meta new file mode 100644 index 0000000..fd86f7f --- /dev/null +++ b/Assets/GWConquest/Scripts/DistrictUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7df5e14173982b8428ae0788c3a6e13b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/GameManager.cs b/Assets/GWConquest/Scripts/GameManager.cs index bcfa010..1dcd167 100644 --- a/Assets/GWConquest/Scripts/GameManager.cs +++ b/Assets/GWConquest/Scripts/GameManager.cs @@ -6,6 +6,8 @@ namespace GWConquest { public Color[] PlayerColors; + public UnitClass[] UnitClasses; + private static GameManager _instance; public static GameManager Instance { diff --git a/Assets/GWConquest/Scripts/IngameUI.cs b/Assets/GWConquest/Scripts/IngameUI.cs index c252215..8243393 100644 --- a/Assets/GWConquest/Scripts/IngameUI.cs +++ b/Assets/GWConquest/Scripts/IngameUI.cs @@ -97,6 +97,11 @@ namespace GWConquest if (!hasHit) { DeselectAll(); + + if(PlanetViewEnabled) + { + PlanetView.Deselect(); + } } return hasHit; } diff --git a/Assets/GWConquest/Scripts/Planet.cs b/Assets/GWConquest/Scripts/Planet.cs index e9ee07c..3aa67ce 100644 --- a/Assets/GWConquest/Scripts/Planet.cs +++ b/Assets/GWConquest/Scripts/Planet.cs @@ -31,6 +31,11 @@ namespace GWConquest public Transform planetCameraTransform; + public PlanetData PlanetData + { + get => PlanetRegistry.GetPlanetData(gameObject.name); + } + private PlanetIndicatorUI indicatorUI; public Zone[] GetZones(ZoneType type) diff --git a/Assets/GWConquest/Scripts/PlanetRegistry.cs b/Assets/GWConquest/Scripts/PlanetRegistry.cs new file mode 100644 index 0000000..c2b6fc8 --- /dev/null +++ b/Assets/GWConquest/Scripts/PlanetRegistry.cs @@ -0,0 +1,57 @@ +using System.Collections.Generic; +using UnityEngine; + +namespace GWConquest +{ + public class PlanetData + { + public string Name; + public string Description; + public string StartPopulation; + } + + public class PlanetRegistry + { + private static Dictionary planetDataMap; + + public static PlanetData GetPlanetData(string planetName) + { + if(planetDataMap == null) + { + planetDataMap = new Dictionary(); + Load(); + } + + if (planetDataMap.ContainsKey(planetName)) + { + return planetDataMap[planetName]; + } + else + { + BoltLog.Warn("Planet {0} not found in planet map!", planetName); + return null; + } + } + + private static void Load() + { + BoltLog.Info("Loading Planet Map..."); + TextAsset database = Resources.Load("Database/Planets"); + CSVFile csv = CSVFile.ParseCSV(database.text, delimiter: '\t'); + for(int i = 0; i < csv.Length; i++) + { + var data = csv.GetEntry(i); + PlanetData planet = new PlanetData + { + Name = data.GetString("Name"), + Description = data.GetString("Text Info"), + StartPopulation = data.GetString("Population") + }; + BoltLog.Info("Loaded planet {0}", planet.Name); + + planetDataMap.Add(planet.Name, planet); + } + } + } + +} \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/PlanetRegistry.cs.meta b/Assets/GWConquest/Scripts/PlanetRegistry.cs.meta new file mode 100644 index 0000000..441509d --- /dev/null +++ b/Assets/GWConquest/Scripts/PlanetRegistry.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9ee0ea1e7b57e7d43975fe5da5a996af +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/PlanetViewUI.cs b/Assets/GWConquest/Scripts/PlanetViewUI.cs index c64acbd..e72a5cc 100644 --- a/Assets/GWConquest/Scripts/PlanetViewUI.cs +++ b/Assets/GWConquest/Scripts/PlanetViewUI.cs @@ -27,7 +27,7 @@ namespace GWConquest public Transform FleetIcons; - public GameObject GroundPanel; + public DistrictUI GroundPanel; public FleetPanelUI GroundPlayerFleetPanel; //public FleetPanelUI GroundEnemyFleetPanel; @@ -173,8 +173,10 @@ namespace GWConquest { SpaceIndicatorPanel.SetActive(false); FleetIcons.gameObject.SetActive(false); - GroundPanel.SetActive(true); + GroundPanel.gameObject.SetActive(true); + GroundPanel.SelectDistrict(selectedDistrict); + /* Formation[] playerFormations; Formation[] enemyFormations; if(selectedDistrict == null) @@ -190,7 +192,21 @@ namespace GWConquest GroundPlayerFleetPanel.SetFormations(playerFormations); // GroundEnemyFleetPanel.SetFormations(enemyFormations); + */ } + + public void HideGroundPanel() + { + SpaceIndicatorPanel.SetActive(true); + FleetIcons.gameObject.SetActive(true); + GroundPanel.gameObject.SetActive(false); + } + + public void Deselect() + { + selectedDistrict = null; + HideGroundPanel(); + } } } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/Unit.cs b/Assets/GWConquest/Scripts/Unit.cs index 90ca470..4d73ebc 100644 --- a/Assets/GWConquest/Scripts/Unit.cs +++ b/Assets/GWConquest/Scripts/Unit.cs @@ -12,7 +12,7 @@ } else { - state.UnitClass = value.name; + state.UnitClass = value.ShortName; } } } diff --git a/Assets/GWConquest/Scripts/UnitClass.cs b/Assets/GWConquest/Scripts/UnitClass.cs index c438dfe..af8b42b 100644 --- a/Assets/GWConquest/Scripts/UnitClass.cs +++ b/Assets/GWConquest/Scripts/UnitClass.cs @@ -1,11 +1,12 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; +using System.Linq; using UnityEngine; namespace GWConquest { - - [CreateAssetMenu] - public class UnitClass : ScriptableObject + [Serializable] + public class UnitClass { private static Dictionary classMap; @@ -13,18 +14,108 @@ namespace GWConquest { BoltLog.Info("Loading unit classes..."); classMap = new Dictionary(); - UnitClassRegistry registry = FindObjectOfType(); - if(registry == null) - { - Debug.LogError("Fatal: Unit registry not found!"); - throw new System.Exception("Fatal: Unit registry not found!"); - } - foreach (UnitClass unitClass in registry.unitClasses) + TextAsset shipsDatabase = Resources.Load("Database/Ships"); + LoadDatabase(shipsDatabase, ZoneType.Space); + + GameManager.Instance.UnitClasses = classMap.Values.ToArray(); + BoltLog.Info("All unit classes loaded."); + } + + private static void LoadDatabase(TextAsset asset, ZoneType zoneType) + { + CSVFile csv = CSVFile.ParseCSV(asset.text); + for (int i = 0; i < csv.Length; i++) { - classMap.Add(unitClass.name, unitClass); - BoltLog.Info("Loaded unit class {0}", unitClass.name); + try + { + var data = csv.GetEntry(i); + UnitClass unitClass = new UnitClass(); + + unitClass.ShortName = data.GetString("Short Name"); + + if (unitClass.ShortName == "") continue; + + unitClass.FullName = data.GetString("Full Name"); + + BoltLog.Info("Parsing unit class {0}", unitClass.ShortName); + + unitClass.Hitpoints = data.GetInt("Hitpoints"); + + string[] attackCounts = data.GetString("Attack Count").Split('/'); + string[] damages = data.GetString("Damage").Split('/'); + string[] penetrations = data.GetString("Penetration").Split('/'); + string[] accuracies = data.GetString("Accuracy").Split('/'); + string[] attackTimers = data.GetString("Attack Timer").Split('/'); + + if (Util.AllEqual(attackCounts.Length, damages.Length, penetrations.Length, accuracies.Length, attackTimers.Length)) + { + unitClass.WeaponStatsArray = new WeaponStats[attackCounts.Length]; + for (int j = 0; j < attackCounts.Length; j++) + { + unitClass.WeaponStatsArray[j] = new WeaponStats + { + AttackCount = int.Parse(attackCounts[j]), + Damage = int.Parse(damages[j]), + Penetration = int.Parse(penetrations[j]), + Accuracy = float.Parse(accuracies[j]), + AttackTimer = float.Parse(attackTimers[j]) + }; + } + } + else + { + throw new FormatException("Unequal length in weapon stats!"); + } + + unitClass.Armour = data.GetInt("Armour"); + unitClass.Evasion = data.GetFloat("Evasion"); + unitClass.Movement = data.GetFloat("Movement"); + + unitClass.BuildCost = new BuildCost + { + CreditCost = data.GetInt("Credit Cost"), + RecruitCost = data.GetInt("Recruit Cost"), + AmmoCost = data.GetInt("Ammo Cost"), + FuelCost = data.GetInt("Fuel Cost") + }; + + unitClass.CreditUpkeep = data.GetFloat("Credit Upkeep"); + unitClass.FoodUpkeep = data.GetFloat("Food Upkeep"); + + if(zoneType == ZoneType.Space) + { + unitClass.FactoryType = FactoryType.Space; + } + else + { + switch(data.GetString("Factory Type")) + { + case "City": + unitClass.FactoryType = FactoryType.City; + break; + case "Infantry": + unitClass.FactoryType = FactoryType.Infantry; + break; + case "Armour": + unitClass.FactoryType = FactoryType.Armour; + break; + } + } + + unitClass.Description = data.GetString("Description"); + + unitClass.ZoneType = zoneType; + unitClass.UnitStrength = unitClass.BuildCost.CreditCost; + + classMap.Add(unitClass.ShortName, unitClass); + } + catch (Exception ex) + { + BoltLog.Error("Could not parse unit class"); + BoltLog.Exception(ex); + } + } - BoltLog.Info("All unit classes loaded."); } public static UnitClass FromName(string name) @@ -44,13 +135,67 @@ namespace GWConquest } } + public static IEnumerable AllUnitClasses + { + get => classMap.Values; + } + public string FullName; - public Sprite Sprite; + public string ShortName; + public Sprite Sprite + { + get; private set; + } public ZoneType ZoneType; public float UnitStrength; - public float MaxHealth; + public int Hitpoints; + public int Armour; + public float Evasion; + public float Movement; + + public WeaponStats[] WeaponStatsArray; + + public BuildCost BuildCost; + + public float CreditUpkeep; + public float FoodUpkeep; + + public int MinFactoryTier = 1; + + public FactoryType FactoryType; + + public string Description; + + private void LoadTexture() + { + Sprite = Resources.Load("UnitIcons/" + ShortName); + if(Sprite == null) + { + Sprite = Resources.Load("UnitIcons/placeholder"); + } + } + + } + + [System.Serializable] + public class WeaponStats + { + public int AttackCount; + public int Damage; + public int Penetration; + public float Accuracy; + public float AttackTimer; + } + + [System.Serializable] + public class BuildCost + { + public int CreditCost; + public int RecruitCost; + public int AmmoCost; + public int FuelCost; } } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/UnitClassRegistry.cs b/Assets/GWConquest/Scripts/UnitClassRegistry.cs deleted file mode 100644 index c781c2d..0000000 --- a/Assets/GWConquest/Scripts/UnitClassRegistry.cs +++ /dev/null @@ -1,9 +0,0 @@ -using UnityEngine; - -namespace GWConquest -{ - public class UnitClassRegistry : MonoBehaviour - { - public UnitClass[] unitClasses; - } -} \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/Util.cs b/Assets/GWConquest/Scripts/Util.cs index ba4b9d8..6a5fbfb 100644 --- a/Assets/GWConquest/Scripts/Util.cs +++ b/Assets/GWConquest/Scripts/Util.cs @@ -125,6 +125,24 @@ namespace GWConquest transform.localScale = Vector3.one; } + + + public static bool AllEqual(params int[] arr) + { + if(arr == null || arr.Length < 2) + { + return true; + } + for(int i = 1; i < arr.Length; i++) + { + if(arr[0] != arr[i]) + { + return false; + } + } + return true; + } + } } \ No newline at end of file diff --git a/Assets/GWConquest/Textures/Icons/ICON_Soldier_Recruit.png b/Assets/GWConquest/Textures/Icons/ICON_Soldier_Recruit.png new file mode 100644 index 0000000000000000000000000000000000000000..54cb391b6139334178607125ff4101c1d6d54904 GIT binary patch literal 2640 zcmcIlXHyf377QIiXhI_0gx;lzBSj_Dgccx3?>#640#YubC{iRKA%HW1_nk(MkXdE zW@cs<78X`kRyH;^AP~sT&JF^BI5;>sIXStwxVX8wd3bm(UAn}}%ge{d2L^*75Xj}r zm-+em1q1{H1qFqKgoK5KMMOkIMMbY%xdMekVKA7On3%Y@xP*j+q@<*jl$5lzw2X|5 ztgNh@oSeM8yn=#)qN1XblG4?ySCy5ORa8_|RaMp0)YR40uU)&Qp`mg8`t=((ZfI(1 zYH4X{YisN1=-j+{^VY3fw{PFp)zyW=;d**{`uh3?1_p+PhDJt4#>U171OkafnwXfF znVFfJn_E~|pin4FOG_&&D{E_OG#YJVV`FP;YiDO?Z*TA5;Na-!=;Y+&?Ck8~;^OM+ z>gML=?(Xj4;o<4&>E-3+?d|RB>+9#|hrwV10s`*cyB8Q37!(wQ#bSelgF`|>a5!9O zXlPhi*!}zW!^6WPA|fIqBcr0CqNAf@VqzXXeE8_mqsNaQKYjW%K0ZD%F)=AA36IC8 zq@<*#rapiEoIoI?r>7H%#EguL%*;#@iIkn4{p!^#GMSu{lS83Ua&vR@^75!uYJPrx zK|w)bVPSD`acOC3Sy@?md3i-eMP+4WRaMp7w{PFQdskCaQ(IeGS65eGU*FKs(Ae16 z)YR16+}zUA^5MgW*4Eaxwzl^6_KzPwc6N4t`t+%*tE;=ayQin;^XJdKy}kYY{R0C7 zU%q@992^`P8X6uR9vK;-(P*Qiqhn)Z^)u<-r+_a8rgEG{lCEiJ9AtgNoCuC1-Dudi=xY;10BZf$LCZ*Twn`EzGy zXLomZZ*OmZfB)d%;PCM9=;-M9`1seaUneIgr>Cc9XJ_Z<=NA_jzf<~unh_yEpWm<9 zu*UW{0N@h#59na8NEiTsc?zMgi;i&FczNQ;XT#s^8}7`^B}&m_Vz7 zi95`giBGB<9zOmVmINz*V3WO%t;yYOdhe{Pr0b}pSk!x<)&*jT92xHGvs7R6SA2KT z;x4T}TW#xjGjitetB=5|3(n2j5*$Q{5xv5%q(E`Vwf zHksgrqQMO_N{->kH7V)QI-u_+%+Dm@N%1_%cj>i*WY=*U!Vkf6VHF>oxgR!`1&W_o zo+pP0I*b$q@vS~%j^6KJWN+$F`RO}?r*qQo(Ef%{8dMYoY>kNT%X|Ej*wl`1F12mk zw9|F$%By?q&2U=A@8gGc+Hf(v9+X488teT)GsuGkS_XE$0hJa+eGGgX(B{KOP&>mu zIeNSpz4kJkqhD~Fzf{{bKR=x9lRn}UQogz{LwK=_ty+HK*q<8fCKg3LcC)?`$ngy5 zGgPY4*iA-&O;OOwOLtd8TA+r-E+{TZl9R*Fm7XS6sr^Y}N~z`oHgHjtCufJgqKzM= zut-)lU^KT~v7zl6Ce(y1U5}S$@hdS_ z?MuO0~O$aWUX<>?F@QdIx^Yjcr464t_+a*D|BmU-l-;|AKt>Ns@q2A#7u|&QT zJ+(+BmZtXOI&0-xAyg(N-V2YObFT|Ow8JyKf(J^HV4@}?4f#(m4V$7R-<$_Ej->AZ zov?8TeM??0#wybFQEN9}Che;E%(2O&S;f`kX=(CRmuZ$N+t$ho1-sh;hXkh0;=}V; zF#(Q<<(NawnHqfRv+rrMd#+_wQ*|1)lcHQPP64m>oK=w%n1@UBa&p4fPdk^6DOoiM z2R1ForZIQ4O*yM;?z_e&AjieS&4M;bW<^)y6%>_R(8?$6>$R2*66sUOHl3)Ii73aq zvPk2#rsRdZCUB>j%&)k+TA^;lA&jR^1&>pF2ROXUci>=^c_A|Ep$J4c1N&y0q7nml zi5c$mc0C^-of5aVUmd=dJYULNp%qSP9U6snRdG=v8<$rIdpe|RedbZguId)(SQ}af zY7eolPqAI4 zIw;nLxCa>#ZXnYbPS|m$6i(*lG`=oa0q{-eV1@^UzPZq^ukb}tTj)_|(KNC3MnB>g8w>S7Or>6b>B)OL=3?_8~--;^9ujHPIb&+;I-#58K2B}$| zs1ec&!X0P1@baw!FO?UMB9is<2IhB^EnJU@??;JfuOXtadcoj|KjhhM^Xy=d;7GeG zuJw%=clJr1qM2szvd9r8-APWz?a9l-D)X(X7}j*{-Lb({rL@f1%w1{DyAJ}LS}#s?p@ClGUKTOB zF@ar^uVeP&8Ytd6*b1}M=M^)o6Oh?Y;?mvkqU6^?ub5!$rJf|VVeh_gO3UETr!Vm& z;PY5P-BH$g+P7O|=sZ(E*{mRGb^<(i{ymc_pBT4{{G~W(O7j;8X#dHW4k& zQOKL+k+3R686;!@QxzpF%ArP7J!ht+KG+ZRPvAXwxJW_aV`AgSG6Kz~y(8`J>+~Cj zRQfkq6a$-szwYY@1~cTY)jWwCY-RhJ1!qg4`5*{kw|-fol!Ec5OiR2*@A9JI-!-i= z7Scvk@`2g%8UBiA9CP9aMR-&uVmRYaxeTTEFm$I81TtLGb|LzLz{J&mDHC`zxkb^VjJw(#(C2ll@*K}gR4C?v3L2H5P+|Lf>iYn=NzlUOxgel_Lq%YRB0VPLLb33q$^AEg|) AnE(I) literal 0 HcmV?d00001 diff --git a/Assets/GWConquest/Textures/Icons/ICON_Soldier_Recruit.png.meta b/Assets/GWConquest/Textures/Icons/ICON_Soldier_Recruit.png.meta new file mode 100644 index 0000000..654af48 --- /dev/null +++ b/Assets/GWConquest/Textures/Icons/ICON_Soldier_Recruit.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 37886999ca665794c9a20cebe80d56cc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Units/Cruiser.asset b/Assets/GWConquest/Units/Cruiser.asset deleted file mode 100644 index 08f3457..0000000 --- a/Assets/GWConquest/Units/Cruiser.asset +++ /dev/null @@ -1,19 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 866efe5bcc98fde42bdab9c01ab3b6ba, type: 3} - m_Name: Cruiser - m_EditorClassIdentifier: - FullName: Battlecruiser - Sprite: {fileID: 21300000, guid: ce4e8e58b24032c41813c44cf346ac9c, type: 3} - ZoneType: 0 - UnitStrength: 20 - MaxHealth: 0 diff --git a/Assets/GWConquest/Units/Fighter.asset b/Assets/GWConquest/Units/Fighter.asset deleted file mode 100644 index aaf705b..0000000 --- a/Assets/GWConquest/Units/Fighter.asset +++ /dev/null @@ -1,19 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 866efe5bcc98fde42bdab9c01ab3b6ba, type: 3} - m_Name: Fighter - m_EditorClassIdentifier: - FullName: Fighter Squadron - Sprite: {fileID: 21300000, guid: 52e22bcf1988b2b4da1b4da2ffba5c9d, type: 3} - ZoneType: 0 - UnitStrength: 2 - MaxHealth: 0 diff --git a/Assets/GWConquest/Units/Frigate.asset b/Assets/GWConquest/Units/Frigate.asset deleted file mode 100644 index d10baea..0000000 --- a/Assets/GWConquest/Units/Frigate.asset +++ /dev/null @@ -1,19 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 866efe5bcc98fde42bdab9c01ab3b6ba, type: 3} - m_Name: Frigate - m_EditorClassIdentifier: - FullName: Frigate Squadron - Sprite: {fileID: 21300000, guid: a725f0b3a4d26a945a5b8ccbcffef516, type: 3} - ZoneType: 0 - UnitStrength: 10 - MaxHealth: 0