From 07d3a79e3965ea628fe8c6357d8c736dfbafb38b Mon Sep 17 00:00:00 2001 From: laurids Date: Tue, 5 Oct 2021 20:47:20 +0200 Subject: [PATCH] Galaxy UI Rework --- .../Animations/DistrictIconBattle.anim | 146 +- .../Animations/PlanetBattleAura.anim | 32 +- Assets/GWConquest/Prefabs/Planet.prefab | 517 +++++- .../GWConquest/Prefabs/UI/DistrictIcon.prefab | 142 +- Assets/GWConquest/Prefabs/UI/FleetIcon.prefab | 1054 +++++++++--- .../Prefabs/UI/PlanetIndicator.prefab | 310 +++- .../Resources/PlanetConnection.prefab | 2 + .../UnitIcons/CaerBannoqRealmHunters.png | Bin 0 -> 2815 bytes .../UnitIcons/CaerBannoqRealmHunters.png.meta | 132 ++ ...swornSquad.png => ElysiaReconInfantry.png} | Bin ....png.meta => ElysiaReconInfantry.png.meta} | 0 .../UnitIcons/SartoriusHeavyInfantry.png | Bin 0 -> 2674 bytes .../UnitIcons/SartoriusHeavyInfantry.png.meta | 132 ++ .../Resources/UnitIcons/SartoriusInfantry.png | Bin 2853 -> 2388 bytes Assets/GWConquest/Scenes/GalaxyMap.unity | 1505 +++++++++++++++-- .../Scripts/Editor/ContextMenuHooks.cs | 23 + Assets/GWConquest/Scripts/GWCamera.cs | 36 + Assets/GWConquest/Scripts/GameManager.cs | 6 + Assets/GWConquest/Scripts/Planet.cs | 50 +- Assets/GWConquest/Scripts/PlanetConnection.cs | 69 +- Assets/GWConquest/Scripts/PlanetPlacement.cs | 1 + Assets/GWConquest/Scripts/PlanetScaling.cs | 93 +- Assets/GWConquest/Scripts/UI/FormationIcon.cs | 4 +- Assets/GWConquest/Scripts/UI/IngameUI.cs | 3 +- .../Scripts/UI/PlanetIndicatorUI.cs | 61 +- Assets/GWConquest/Scripts/UI/UIZoomScaling.cs | 54 + .../Scripts/UI/UIZoomScaling.cs.meta | 11 + Assets/GWConquest/Scripts/ZoomSkyboxEffect.cs | 28 + .../Scripts/ZoomSkyboxEffect.cs.meta | 11 + .../GWConquest/Textures/UI/Blackest Whole.png | Bin 0 -> 4560 bytes .../Textures/UI/Blackest Whole.png.meta | 132 ++ .../Textures/UI/Materials/kreiswichs3 2.mat | 109 ++ .../UI/Materials/kreiswichs3 2.mat.meta | 8 + Assets/GWConquest/Textures/UI/RAUTE FETT.png | Bin 0 -> 984 bytes .../Textures/UI/RAUTE FETT.png.meta | 132 ++ Assets/GWConquest/Textures/UI/RAUTE.png | Bin 0 -> 1335 bytes Assets/GWConquest/Textures/UI/RAUTE.png.meta | 132 ++ Assets/GWConquest/Textures/UI/kreis3.png | Bin 4005 -> 4527 bytes Assets/Starfield Skybox/Skybox.mat | 4 +- 39 files changed, 4462 insertions(+), 477 deletions(-) create mode 100644 Assets/GWConquest/Resources/UnitIcons/CaerBannoqRealmHunters.png create mode 100644 Assets/GWConquest/Resources/UnitIcons/CaerBannoqRealmHunters.png.meta rename Assets/GWConquest/Resources/UnitIcons/{ElysiaOathswornSquad.png => ElysiaReconInfantry.png} (100%) rename Assets/GWConquest/Resources/UnitIcons/{ElysiaOathswornSquad.png.meta => ElysiaReconInfantry.png.meta} (100%) create mode 100644 Assets/GWConquest/Resources/UnitIcons/SartoriusHeavyInfantry.png create mode 100644 Assets/GWConquest/Resources/UnitIcons/SartoriusHeavyInfantry.png.meta create mode 100644 Assets/GWConquest/Scripts/UI/UIZoomScaling.cs create mode 100644 Assets/GWConquest/Scripts/UI/UIZoomScaling.cs.meta create mode 100644 Assets/GWConquest/Scripts/ZoomSkyboxEffect.cs create mode 100644 Assets/GWConquest/Scripts/ZoomSkyboxEffect.cs.meta create mode 100644 Assets/GWConquest/Textures/UI/Blackest Whole.png create mode 100644 Assets/GWConquest/Textures/UI/Blackest Whole.png.meta create mode 100644 Assets/GWConquest/Textures/UI/Materials/kreiswichs3 2.mat create mode 100644 Assets/GWConquest/Textures/UI/Materials/kreiswichs3 2.mat.meta create mode 100644 Assets/GWConquest/Textures/UI/RAUTE FETT.png create mode 100644 Assets/GWConquest/Textures/UI/RAUTE FETT.png.meta create mode 100644 Assets/GWConquest/Textures/UI/RAUTE.png create mode 100644 Assets/GWConquest/Textures/UI/RAUTE.png.meta diff --git a/Assets/GWConquest/Animations/DistrictIconBattle.anim b/Assets/GWConquest/Animations/DistrictIconBattle.anim index 82adb1c..b32a05d 100644 --- a/Assets/GWConquest/Animations/DistrictIconBattle.anim +++ b/Assets/GWConquest/Animations/DistrictIconBattle.anim @@ -73,6 +73,71 @@ AnimationClip: path: PlayerIndicatorMask/EnemyIndicatorMask/CircleMask/BattleAura classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.25 + value: 0.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Background/BattleAura + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Background/BattleAura + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -95,13 +160,27 @@ AnimationClip: typeID: 114 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3922344059 + attribute: 304273561 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3922344059 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.5 + m_StopTime: 2.25 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -173,6 +252,71 @@ AnimationClip: path: PlayerIndicatorMask/EnemyIndicatorMask/CircleMask/BattleAura classID: 114 script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.75 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.25 + value: 0.3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: Background/BattleAura + classID: 114 + script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Background/BattleAura + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/GWConquest/Animations/PlanetBattleAura.anim b/Assets/GWConquest/Animations/PlanetBattleAura.anim index 4932bad..291fd0c 100644 --- a/Assets/GWConquest/Animations/PlanetBattleAura.anim +++ b/Assets/GWConquest/Animations/PlanetBattleAura.anim @@ -41,7 +41,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -50,7 +50,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.75 - value: 0.3 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -59,7 +59,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.5 - value: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.25 + value: 0.5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -127,7 +136,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.5 + m_StopTime: 2.25 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -167,7 +176,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0.5 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -176,7 +185,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.75 - value: 0.3 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -185,7 +194,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.5 - value: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.25 + value: 0.5 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/GWConquest/Prefabs/Planet.prefab b/Assets/GWConquest/Prefabs/Planet.prefab index 1fef33f..6d32ae4 100644 --- a/Assets/GWConquest/Prefabs/Planet.prefab +++ b/Assets/GWConquest/Prefabs/Planet.prefab @@ -1,5 +1,36 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &36703679271264929 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2523886465982048557} + m_Layer: 10 + m_Name: PlanetCircle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2523886465982048557 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 36703679271264929} + 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: 9127401858082693168} + m_Father: {fileID: 4678135251219451999} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &653090530281819911 GameObject: m_ObjectHideFlags: 0 @@ -31,6 +62,174 @@ Transform: m_Father: {fileID: 4678135251219451999} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: -330, z: 0} +--- !u!1 &3268448675433890451 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1572027918287746877} + - component: {fileID: 9063450203288621825} + m_Layer: 10 + m_Name: InnerCircleLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1572027918287746877 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3268448675433890451} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} + m_Children: [] + m_Father: {fileID: 9127401858082693168} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!120 &9063450203288621825 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3268448675433890451} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: 0.5, y: 0, z: -0} + - {x: 0.49384418, y: -0.000000009324221, z: -0.078217246} + - {x: 0.47552827, y: -0.000000018418849, z: -0.15450852} + - {x: 0.44550326, y: -0.000000027059944, z: -0.22699529} + - {x: 0.4045085, y: -0.00000003503473, z: -0.29389265} + - {x: 0.35355338, y: -0.000000042146848, z: -0.3535534} + - {x: 0.29389262, y: -0.00000004822117, z: -0.40450856} + - {x: 0.22699526, y: -0.000000053108128, z: -0.44550332} + - {x: 0.15450849, y: -0.000000056687387, z: -0.47552833} + - {x: 0.078217186, y: -0.000000058870814, z: -0.49384424} + - {x: -0.000000021855694, y: -0.000000059604645, z: -0.50000006} + - {x: -0.07821722, y: -0.000000058870814, z: -0.49384424} + - {x: -0.15450852, y: -0.000000056687384, z: -0.4755283} + - {x: -0.2269953, y: -0.000000053108124, z: -0.4455033} + - {x: -0.2938926, y: -0.00000004822117, z: -0.40450856} + - {x: -0.35355338, y: -0.000000042146848, z: -0.3535534} + - {x: -0.40450853, y: -0.000000035034727, z: -0.29389262} + - {x: -0.4455033, y: -0.000000027059935, z: -0.22699521} + - {x: -0.4755283, y: -0.000000018418836, z: -0.15450841} + - {x: -0.49384418, y: -0.00000000932422, z: -0.07821723} + - {x: -0.5, y: 5.2108035e-15, z: 0.000000043711392} + - {x: -0.49384415, y: 0.000000009324229, z: 0.07821731} + - {x: -0.47552827, y: 0.000000018418847, z: 0.1545085} + - {x: -0.44550326, y: 0.000000027059945, z: 0.2269953} + - {x: -0.40450847, y: 0.000000035034738, z: 0.2938927} + - {x: -0.35355332, y: 0.000000042146855, z: 0.35355347} + - {x: -0.29389253, y: 0.000000048221178, z: 0.40450862} + - {x: -0.22699511, y: 0.000000053108135, z: 0.44550338} + - {x: -0.15450855, y: 0.000000056687384, z: 0.4755283} + - {x: -0.07821726, y: 0.00000005887081, z: 0.4938442} + - {x: 0.0000000059624403, y: 0.000000059604645, z: 0.50000006} + - {x: 0.07821727, y: 0.00000005887081, z: 0.4938442} + - {x: 0.15450856, y: 0.000000056687384, z: 0.4755283} + - {x: 0.22699533, y: 0.00000005310812, z: 0.44550326} + - {x: 0.29389274, y: 0.00000004822116, z: 0.40450847} + - {x: 0.3535535, y: 0.000000042146834, z: 0.3535533} + - {x: 0.40450862, y: 0.000000035034713, z: 0.2938925} + - {x: 0.44550326, y: 0.000000027059944, z: 0.22699529} + - {x: 0.47552827, y: 0.000000018418845, z: 0.15450849} + - {x: 0.49384418, y: 0.000000009324214, z: 0.078217186} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 3 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 0.03, g: 0.03, b: 0.03, a: 0.972549} + key1: {r: 0.03, g: 0.03, b: 0.03, a: 0.972549} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0.003921569} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 29876 + atime3: 65535 + atime4: 65535 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_UseWorldSpace: 0 + m_Loop: 1 --- !u!1 &4678135251219452000 GameObject: m_ObjectHideFlags: 0 @@ -65,6 +264,7 @@ Transform: - {fileID: 4678135251355824056} - {fileID: 7191419555384860655} - {fileID: 841831665631638574} + - {fileID: 2523886465982048557} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -80,9 +280,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d32a8fe07c5601c4aafeb8c69edeff7c, type: 3} m_Name: m_EditorClassIdentifier: - NearScalingDistance: 550 + NearScalingDistance: 0 FarScalingDistance: 550 FixPlanetSize: 1.12 + CircleWidth: 0.0025 + InnerCircleWidth: 0.001 + CircleRenderer: {fileID: 5980546624515681467} + InnerCircleRenderer: {fileID: 9063450203288621825} --- !u!114 &4678135251219452001 MonoBehaviour: m_ObjectHideFlags: 0 @@ -109,6 +313,10 @@ MonoBehaviour: CameraRotatorTransform: {fileID: 7191419555384860655} planetCameraTransform: {fileID: 3266501631720423375} AdditionalObjects: {fileID: 0} + RefuseConnections: 0 + CircleTransform: {fileID: 9127401858082693168} + CircleTransformDamp: 0.1 + MaxCircleScale: 400 InTransitFormations: [] VisibilityStatus: 0 OriginalDesaturation: 0 @@ -310,3 +518,310 @@ Transform: m_Father: {fileID: 7191419555384860655} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 42.538002, y: 28.511002, z: 0} +--- !u!1 &6717268396553122152 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9127401858082693168} + - component: {fileID: 5980546624515681467} + m_Layer: 10 + m_Name: CircleLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9127401858082693168 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6717268396553122152} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 8866216275828915038} + - {fileID: 1572027918287746877} + m_Father: {fileID: 2523886465982048557} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!120 &5980546624515681467 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6717268396553122152} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: 0.5, y: 0, z: -0} + - {x: 0.49845865, y: -0.0000000046765267, z: -0.039229553} + - {x: 0.49384418, y: -0.000000009324221, z: -0.078217246} + - {x: 0.48618495, y: -0.000000013914429, z: -0.1167227} + - {x: 0.47552827, y: -0.000000018418849, z: -0.15450852} + - {x: 0.46193975, y: -0.000000022809711, z: -0.19134176} + - {x: 0.44550326, y: -0.000000027059944, z: -0.22699529} + - {x: 0.42632008, y: -0.00000003114334, z: -0.2612493} + - {x: 0.4045085, y: -0.00000003503473, z: -0.29389265} + - {x: 0.38020298, y: -0.000000038710123, z: -0.32472408} + - {x: 0.35355338, y: -0.000000042146848, z: -0.3535534} + - {x: 0.32472402, y: -0.000000045323727, z: -0.38020304} + - {x: 0.29389262, y: -0.00000004822117, z: -0.40450856} + - {x: 0.26124924, y: -0.000000050821317, z: -0.42632017} + - {x: 0.22699526, y: -0.000000053108128, z: -0.44550332} + - {x: 0.19134171, y: -0.00000005506751, z: -0.4619398} + - {x: 0.15450849, y: -0.000000056687387, z: -0.47552833} + - {x: 0.11672265, y: -0.000000057957763, z: -0.486185} + - {x: 0.078217186, y: -0.000000058870814, z: -0.49384424} + - {x: 0.039229542, y: -0.000000059420902, z: -0.4984587} + - {x: -0.000000021855694, y: -0.000000059604645, z: -0.50000006} + - {x: -0.039229587, y: -0.000000059420902, z: -0.4984587} + - {x: -0.07821722, y: -0.000000058870814, z: -0.49384424} + - {x: -0.116722696, y: -0.000000057957763, z: -0.486185} + - {x: -0.15450852, y: -0.000000056687384, z: -0.4755283} + - {x: -0.19134176, y: -0.00000005506751, z: -0.4619398} + - {x: -0.2269953, y: -0.000000053108124, z: -0.4455033} + - {x: -0.26124933, y: -0.00000005082131, z: -0.4263201} + - {x: -0.2938926, y: -0.00000004822117, z: -0.40450856} + - {x: -0.32472402, y: -0.000000045323727, z: -0.38020304} + - {x: -0.35355338, y: -0.000000042146848, z: -0.3535534} + - {x: -0.380203, y: -0.00000003871012, z: -0.32472405} + - {x: -0.40450853, y: -0.000000035034727, z: -0.29389262} + - {x: -0.4263201, y: -0.000000031143337, z: -0.26124927} + - {x: -0.4455033, y: -0.000000027059935, z: -0.22699521} + - {x: -0.4619398, y: -0.0000000228097, z: -0.19134167} + - {x: -0.4755283, y: -0.000000018418836, z: -0.15450841} + - {x: -0.48618495, y: -0.000000013914429, z: -0.1167227} + - {x: -0.49384418, y: -0.00000000932422, z: -0.07821723} + - {x: -0.49845868, y: -0.000000004676523, z: -0.039229523} + - {x: -0.5, y: 5.2108035e-15, z: 0.000000043711392} + - {x: -0.49845865, y: 0.000000004676534, z: 0.039229613} + - {x: -0.49384415, y: 0.000000009324229, z: 0.07821731} + - {x: -0.48618492, y: 0.0000000139144385, z: 0.116722785} + - {x: -0.47552827, y: 0.000000018418847, z: 0.1545085} + - {x: -0.46193975, y: 0.00000002280971, z: 0.19134174} + - {x: -0.44550326, y: 0.000000027059945, z: 0.2269953} + - {x: -0.42632008, y: 0.000000031143344, z: 0.26124933} + - {x: -0.40450847, y: 0.000000035034738, z: 0.2938927} + - {x: -0.38020295, y: 0.000000038710127, z: 0.3247241} + - {x: -0.35355332, y: 0.000000042146855, z: 0.35355347} + - {x: -0.32472396, y: 0.000000045323734, z: 0.3802031} + - {x: -0.29389253, y: 0.000000048221178, z: 0.40450862} + - {x: -0.26124915, y: 0.000000050821324, z: 0.42632023} + - {x: -0.22699511, y: 0.000000053108135, z: 0.44550338} + - {x: -0.19134156, y: 0.00000005506752, z: 0.4619399} + - {x: -0.15450855, y: 0.000000056687384, z: 0.4755283} + - {x: -0.116722725, y: 0.000000057957763, z: 0.486185} + - {x: -0.07821726, y: 0.00000005887081, z: 0.4938442} + - {x: -0.039229557, y: 0.000000059420902, z: 0.4984587} + - {x: 0.0000000059624403, y: 0.000000059604645, z: 0.50000006} + - {x: 0.039229568, y: 0.000000059420902, z: 0.4984587} + - {x: 0.07821727, y: 0.00000005887081, z: 0.4938442} + - {x: 0.11672273, y: 0.000000057957763, z: 0.486185} + - {x: 0.15450856, y: 0.000000056687384, z: 0.4755283} + - {x: 0.1913418, y: 0.000000055067506, z: 0.46193978} + - {x: 0.22699533, y: 0.00000005310812, z: 0.44550326} + - {x: 0.2612494, y: 0.000000050821306, z: 0.42632008} + - {x: 0.29389274, y: 0.00000004822116, z: 0.40450847} + - {x: 0.32472414, y: 0.000000045323716, z: 0.38020295} + - {x: 0.3535535, y: 0.000000042146834, z: 0.3535533} + - {x: 0.3802031, y: 0.000000038710105, z: 0.32472393} + - {x: 0.40450862, y: 0.000000035034713, z: 0.2938925} + - {x: 0.42632008, y: 0.000000031143344, z: 0.26124933} + - {x: 0.44550326, y: 0.000000027059944, z: 0.22699529} + - {x: 0.46193978, y: 0.00000002280971, z: 0.19134174} + - {x: 0.47552827, y: 0.000000018418845, z: 0.15450849} + - {x: 0.48618495, y: 0.000000013914423, z: 0.11672266} + - {x: 0.49384418, y: 0.000000009324214, z: 0.078217186} + - {x: 0.49845868, y: 0.000000004676518, z: 0.03922948} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 3 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 0.11372549, g: 0.11372549, b: 0.11372549, a: 0.8} + key1: {r: 0.11372549, g: 0.11372549, b: 0.11372549, a: 0.8} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 0.003921569} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 29876 + atime3: 65535 + atime4: 65535 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_UseWorldSpace: 0 + m_Loop: 1 +--- !u!1 &8529789795141961521 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8866216275828915038} + - component: {fileID: 5724708215066058970} + - component: {fileID: 6046382291019176640} + - component: {fileID: 5096925138249974101} + m_Layer: 10 + m_Name: Circle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8866216275828915038 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8529789795141961521} + m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.7071079} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.015, y: 1.015, z: 1.015} + m_Children: [] + m_Father: {fileID: 9127401858082693168} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!33 &5724708215066058970 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8529789795141961521} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6046382291019176640 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8529789795141961521} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 07d369c3f2a56e243bbc3de292c2b105, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &5096925138249974101 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8529789795141961521} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/GWConquest/Prefabs/UI/DistrictIcon.prefab b/Assets/GWConquest/Prefabs/UI/DistrictIcon.prefab index 71664e0..cf73a64 100644 --- a/Assets/GWConquest/Prefabs/UI/DistrictIcon.prefab +++ b/Assets/GWConquest/Prefabs/UI/DistrictIcon.prefab @@ -60,6 +60,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -104,7 +105,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2621911208064913515} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -134,6 +135,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -211,6 +213,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -300,6 +303,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -388,6 +392,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -483,6 +488,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 0.8901961, b: 0.5686275, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -528,8 +534,9 @@ RectTransform: m_LocalScale: {x: 1.24, y: 1.24, z: 1.24} m_Children: - {fileID: 6443802886500576743} - - {fileID: 2621911208135885732} + - {fileID: 3169879512136001048} - {fileID: 2621911209262666223} + - {fileID: 2621911208135885732} - {fileID: 6228127094338109271} m_Father: {fileID: 2621911208907321623} m_RootOrder: 2 @@ -562,6 +569,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.08235294, g: 0.08235294, b: 0.08235294, a: 0.72156864} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -649,6 +657,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.8, g: 0.25490198, b: 0.14509805, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -693,7 +702,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2621911208064913515} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -723,6 +732,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -997,6 +1007,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 6530463141977457202} + m_TargetAssemblyTypeName: m_MethodName: OnClicked m_Mode: 1 m_Arguments: @@ -1012,6 +1023,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 6530463141977457202} + m_TargetAssemblyTypeName: m_MethodName: OnPointerEnter m_Mode: 1 m_Arguments: @@ -1027,6 +1039,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 6530463141977457202} + m_TargetAssemblyTypeName: m_MethodName: OnPointerExit m_Mode: 1 m_Arguments: @@ -1098,6 +1111,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1185,6 +1199,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1210,6 +1225,7 @@ GameObject: - component: {fileID: 2621911209262666223} - component: {fileID: 2621911209262666221} - component: {fileID: 2621911209262666222} + - component: {fileID: 5508291047484427147} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -1259,6 +1275,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1273,6 +1290,109 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5508291047484427147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2621911209262666208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 5.38 + spread: 0.8 + offsetAngle: 43.15237 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.5529412} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] +--- !u!1 &3236815388754272088 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3169879512136001048} + - component: {fileID: 7667509430992582846} + - component: {fileID: 5519992837941038288} + m_Layer: 5 + m_Name: BattleAura + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3169879512136001048 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3236815388754272088} + 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: 2621911208064913515} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7667509430992582846 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3236815388754272088} + m_CullTransparentMesh: 0 +--- !u!114 &5519992837941038288 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3236815388754272088} + 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: 0.54901963, b: 0.27058825, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c5c5d1f6b8fa0404ca44f3ea7c937909, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3272311115306710728 GameObject: m_ObjectHideFlags: 0 @@ -1333,6 +1453,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1407,6 +1528,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.72300005, g: 0.72300005, b: 0.72300005, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1481,6 +1603,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1555,6 +1678,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1621,7 +1745,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4942337363061449355} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -1629,6 +1753,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 0.64446914, b: 0.2688679, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1706,6 +1831,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 0.08235294, g: 0.08235294, b: 0.08235294, a: 0.72156864} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1761,7 +1887,7 @@ RectTransform: m_GameObject: {fileID: 5980683245453820297} 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_LocalScale: {x: 0.79, y: 0.79, z: 0.79} m_Children: - {fileID: 7713023655582307560} - {fileID: 662622465737993192} @@ -1770,7 +1896,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 64.4} + m_AnchoredPosition: {x: 0, y: 60.499977} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3801364161784695816 @@ -1795,6 +1921,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -1825,6 +1952,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 6530463141977457202} + m_TargetAssemblyTypeName: m_MethodName: OpenBattleMenu m_Mode: 1 m_Arguments: @@ -1914,6 +2042,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1990,6 +2119,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/GWConquest/Prefabs/UI/FleetIcon.prefab b/Assets/GWConquest/Prefabs/UI/FleetIcon.prefab index aaa1402..16e3a63 100644 --- a/Assets/GWConquest/Prefabs/UI/FleetIcon.prefab +++ b/Assets/GWConquest/Prefabs/UI/FleetIcon.prefab @@ -60,6 +60,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -74,6 +75,110 @@ MonoBehaviour: m_FillOrigin: 2 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1780805658968895848 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 636246201113047790} + - component: {fileID: 3033481703927816275} + - component: {fileID: 578803475640962780} + - component: {fileID: 4549687374652456961} + m_Layer: 5 + m_Name: CooldownCircle (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &636246201113047790 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1780805658968895848} + 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: 6934264676097734671} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3033481703927816275 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1780805658968895848} + m_CullTransparentMesh: 0 +--- !u!114 &578803475640962780 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1780805658968895848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.165, g: 0.165, b: 0.165, a: 0.7921569} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a43560515f2118344a10a45c5dda1764, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 2 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4549687374652456961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1780805658968895848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.816 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.69411767} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &2758084404895688604 GameObject: m_ObjectHideFlags: 0 @@ -103,10 +208,11 @@ RectTransform: m_Children: - {fileID: 3734323249960474404} - {fileID: 6934264676081351464} + - {fileID: 2257467532120856162} - {fileID: 6934264676898299648} - {fileID: 9087990028491932013} m_Father: {fileID: 6934264676097734671} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -173,11 +279,12 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.05882353} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c5c5d1f6b8fa0404ca44f3ea7c937909, type: 3} + m_Sprite: {fileID: 21300000, guid: a43560515f2118344a10a45c5dda1764, type: 3} m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 @@ -237,6 +344,81 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!1 &5299232025506492160 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2257467532120856162} + - component: {fileID: 7506280693539082904} + - component: {fileID: 5171089029562589261} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2257467532120856162 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5299232025506492160} + 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: 5513503267205880076} + m_RootOrder: 2 + 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 &7506280693539082904 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5299232025506492160} + m_CullTransparentMesh: 1 +--- !u!114 &5171089029562589261 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5299232025506492160} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2f346b30884e9424bbb8f1a1d98e2436, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6934264674832292904 GameObject: m_ObjectHideFlags: 0 @@ -248,6 +430,7 @@ GameObject: - component: {fileID: 6934264674832292905} - component: {fileID: 6934264674832292907} - component: {fileID: 6934264674832292906} + - component: {fileID: 2811812415009070641} m_Layer: 5 m_Name: Kreis (2) m_TagString: Untagged @@ -269,9 +452,9 @@ RectTransform: m_Father: {fileID: 6934264676281443875} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -8.2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 29, y: -11} m_SizeDelta: {x: 8, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264674832292907 @@ -295,8 +478,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3882353} + m_Color: {r: 1, g: 1, b: 1, a: 0.77254903} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -311,6 +495,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2811812415009070641 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934264674832292904} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.83 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.8235294} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264674898851119 GameObject: m_ObjectHideFlags: 0 @@ -322,6 +534,7 @@ GameObject: - component: {fileID: 6934264674898851088} - component: {fileID: 6934264674898851090} - component: {fileID: 6934264674898851089} + - component: {fileID: 4032417284746928195} m_Layer: 5 m_Name: Kreis (4) m_TagString: Untagged @@ -343,9 +556,9 @@ RectTransform: m_Father: {fileID: 6934264675173919768} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -14.6, y: -11.2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 11, y: -29} m_SizeDelta: {x: 8, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264674898851090 @@ -369,8 +582,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3882353} + m_Color: {r: 1, g: 1, b: 1, a: 0.77254903} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -385,6 +599,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4032417284746928195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934264674898851119} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.83 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.8235294} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264674906001148 GameObject: m_ObjectHideFlags: 0 @@ -396,13 +638,14 @@ GameObject: - component: {fileID: 6934264674906001149} - component: {fileID: 6934264674906001151} - component: {fileID: 6934264674906001150} + - component: {fileID: 9139015935337329742} m_Layer: 5 m_Name: Kreis (2) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6934264674906001149 RectTransform: m_ObjectHideFlags: 0 @@ -417,9 +660,9 @@ RectTransform: m_Father: {fileID: 6934264676128576590} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -8.2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 20, y: -20} m_SizeDelta: {x: 8, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264674906001151 @@ -443,8 +686,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3882353} + m_Color: {r: 1, g: 1, b: 1, a: 0.77254903} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -459,6 +703,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &9139015935337329742 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934264674906001148} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.83 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.8235294} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264674992649802 GameObject: m_ObjectHideFlags: 0 @@ -508,6 +780,7 @@ GameObject: - component: {fileID: 6934264675011364039} - component: {fileID: 6934264675011364041} - component: {fileID: 6934264675011364040} + - component: {fileID: 4013564468630538908} m_Layer: 5 m_Name: Kreis (2) m_TagString: Untagged @@ -529,9 +802,9 @@ RectTransform: m_Father: {fileID: 6934264676736199430} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -8.2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 20, y: -20} m_SizeDelta: {x: 8, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264675011364041 @@ -555,8 +828,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3882353} + m_Color: {r: 1, g: 1, b: 1, a: 0.77254903} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -571,6 +845,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4013564468630538908 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934264675011364038} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.83 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.8235294} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264675043216174 GameObject: m_ObjectHideFlags: 0 @@ -582,6 +884,7 @@ GameObject: - component: {fileID: 6934264675043216175} - component: {fileID: 6934264675043216145} - component: {fileID: 6934264675043216144} + - component: {fileID: 6386237599832679770} m_Layer: 5 m_Name: Kreis (3) m_TagString: Untagged @@ -603,9 +906,9 @@ RectTransform: m_Father: {fileID: 6934264675533803899} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 7.9, y: -9.8} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 24.5, y: -15.5} m_SizeDelta: {x: 8, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264675043216145 @@ -629,8 +932,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3882353} + m_Color: {r: 1, g: 1, b: 1, a: 0.77254903} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -645,6 +949,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6386237599832679770 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934264675043216174} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.83 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.8235294} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264675066306907 GameObject: m_ObjectHideFlags: 0 @@ -656,8 +988,8 @@ GameObject: - component: {fileID: 6934264675066306908} - component: {fileID: 6934264675066306880} - component: {fileID: 6934264675066306911} - - component: {fileID: 6934264675066306910} - component: {fileID: 6934264675066306909} + - component: {fileID: 4815721975425215669} m_Layer: 5 m_Name: PlanetName (2) m_TagString: Untagged @@ -675,14 +1007,13 @@ RectTransform: 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: 6934264676830680019} + m_Children: [] m_Father: {fileID: 4038486383170554002} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.1, y: 0.1} m_AnchorMax: {x: 0.9, y: 0.9} - m_AnchoredPosition: {x: 0, y: 13.3} + m_AnchoredPosition: {x: -19.5, y: 25.600048} m_SizeDelta: {x: 0, y: -18.018324} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264675066306880 @@ -708,13 +1039,14 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 0.7921569} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} - m_FontSize: 19 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -726,7 +1058,7 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 14 ---- !u!114 &6934264675066306910 +--- !u!114 &6934264675066306909 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -735,13 +1067,12 @@ MonoBehaviour: m_GameObject: {fileID: 6934264675066306907} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} m_Name: m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 2, y: -2} - m_UseGraphicAlpha: 1 ---- !u!114 &6934264675066306909 + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &4815721975425215669 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -750,11 +1081,25 @@ MonoBehaviour: m_GameObject: {fileID: 6934264675066306907} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 + size: 3.48 + spread: 0.774 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.69411767} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264675109408864 GameObject: m_ObjectHideFlags: 0 @@ -766,6 +1111,7 @@ GameObject: - component: {fileID: 6934264675109408865} - component: {fileID: 6934264675109408867} - component: {fileID: 6934264675109408866} + - component: {fileID: 1752357981529044353} m_Layer: 5 m_Name: Kreis (3) m_TagString: Untagged @@ -787,9 +1133,9 @@ RectTransform: m_Father: {fileID: 6934264676281443875} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 14.6, y: -11.2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 20, y: -20} m_SizeDelta: {x: 8, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264675109408867 @@ -813,8 +1159,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3882353} + m_Color: {r: 1, g: 1, b: 1, a: 0.77254903} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -829,6 +1176,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1752357981529044353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934264675109408864} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.83 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.8235294} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264675160474755 GameObject: m_ObjectHideFlags: 0 @@ -840,6 +1215,7 @@ GameObject: - component: {fileID: 6934264675160474756} - component: {fileID: 6934264675160474758} - component: {fileID: 6934264675160474757} + - component: {fileID: 4123405819435060435} m_Layer: 5 m_Name: Kreis (4) m_TagString: Untagged @@ -861,9 +1237,9 @@ RectTransform: m_Father: {fileID: 6934264675533803899} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -7.3, y: -9.8} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 15.5, y: -24.5} m_SizeDelta: {x: 8, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264675160474758 @@ -887,8 +1263,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3882353} + m_Color: {r: 1, g: 1, b: 1, a: 0.77254903} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -903,6 +1280,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4123405819435060435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934264675160474755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.83 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.8235294} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264675173919767 GameObject: m_ObjectHideFlags: 0 @@ -952,6 +1357,7 @@ GameObject: - component: {fileID: 6934264675288409418} - component: {fileID: 6934264675288409420} - component: {fileID: 6934264675288409419} + - component: {fileID: 4106610913990048382} m_Layer: 5 m_Name: Kreis (3) m_TagString: Untagged @@ -973,9 +1379,9 @@ RectTransform: m_Father: {fileID: 6934264675173919768} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 14.6, y: -11.2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 29, y: -11} m_SizeDelta: {x: 8, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264675288409420 @@ -999,8 +1405,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3882353} + m_Color: {r: 1, g: 1, b: 1, a: 0.77254903} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1015,6 +1422,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4106610913990048382 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934264675288409417} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.83 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.8235294} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264675402512296 GameObject: m_ObjectHideFlags: 0 @@ -1026,6 +1461,7 @@ GameObject: - component: {fileID: 6934264675402512297} - component: {fileID: 6934264675402512299} - component: {fileID: 6934264675402512298} + - component: {fileID: 5428539131399160665} m_Layer: 5 m_Name: Kreis (4) m_TagString: Untagged @@ -1047,9 +1483,9 @@ RectTransform: m_Father: {fileID: 6934264676281443875} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -14.6, y: -11.2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 11, y: -29} m_SizeDelta: {x: 8, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264675402512299 @@ -1073,8 +1509,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3882353} + m_Color: {r: 1, g: 1, b: 1, a: 0.77254903} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1089,6 +1526,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5428539131399160665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934264675402512296} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.83 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.8235294} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264675533803898 GameObject: m_ObjectHideFlags: 0 @@ -1137,6 +1602,7 @@ GameObject: - component: {fileID: 6934264675631535516} - component: {fileID: 6934264675631535518} - component: {fileID: 6934264675631535517} + - component: {fileID: 1484677139816293718} m_Layer: 5 m_Name: Kreis (3) m_TagString: Untagged @@ -1158,9 +1624,9 @@ RectTransform: m_Father: {fileID: 6934264676736199430} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 14.6, y: -11.2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 29, y: -11} m_SizeDelta: {x: 8, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264675631535518 @@ -1184,8 +1650,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3882353} + m_Color: {r: 1, g: 1, b: 1, a: 0.77254903} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1200,6 +1667,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1484677139816293718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934264675631535515} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.83 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.8235294} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264675738820694 GameObject: m_ObjectHideFlags: 0 @@ -1211,6 +1706,7 @@ GameObject: - component: {fileID: 6934264675738820695} - component: {fileID: 6934264675738820697} - component: {fileID: 6934264675738820696} + - component: {fileID: 368260383425976321} m_Layer: 5 m_Name: Kreis (2) m_TagString: Untagged @@ -1232,9 +1728,9 @@ RectTransform: m_Father: {fileID: 6934264674992649803} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -8.2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 20, y: -20} m_SizeDelta: {x: 8, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264675738820697 @@ -1258,8 +1754,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3882353} + m_Color: {r: 1, g: 1, b: 1, a: 0.77254903} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1274,6 +1771,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &368260383425976321 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934264675738820694} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.83 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.8235294} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264675817071609 GameObject: m_ObjectHideFlags: 0 @@ -1285,6 +1810,7 @@ GameObject: - component: {fileID: 6934264675817071610} - component: {fileID: 6934264675817071612} - component: {fileID: 6934264675817071611} + - component: {fileID: 4678819580509093330} m_Layer: 5 m_Name: Kreis (4) m_TagString: Untagged @@ -1306,9 +1832,9 @@ RectTransform: m_Father: {fileID: 6934264674992649803} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -14.6, y: -11.2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 11, y: -29} m_SizeDelta: {x: 8, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264675817071612 @@ -1332,8 +1858,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3882353} + m_Color: {r: 1, g: 1, b: 1, a: 0.77254903} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1348,6 +1875,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4678819580509093330 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934264675817071609} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.83 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.8235294} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264675933924743 GameObject: m_ObjectHideFlags: 0 @@ -1359,6 +1914,7 @@ GameObject: - component: {fileID: 6934264675933924744} - component: {fileID: 6934264675933924746} - component: {fileID: 6934264675933924745} + - component: {fileID: 3925694411205975716} m_Layer: 5 m_Name: Kreis (2) m_TagString: Untagged @@ -1380,9 +1936,9 @@ RectTransform: m_Father: {fileID: 6934264675173919768} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -8.2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 20, y: -20} m_SizeDelta: {x: 8, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264675933924746 @@ -1406,8 +1962,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3882353} + m_Color: {r: 1, g: 1, b: 1, a: 0.77254903} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1422,6 +1979,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3925694411205975716 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934264675933924743} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.83 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.8235294} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264675955888899 GameObject: m_ObjectHideFlags: 0 @@ -1433,6 +2018,7 @@ GameObject: - component: {fileID: 6934264675955888900} - component: {fileID: 6934264675955888902} - component: {fileID: 6934264675955888901} + - component: {fileID: 6991269287449308434} m_Layer: 5 m_Name: Kreis (3) m_TagString: Untagged @@ -1454,9 +2040,9 @@ RectTransform: m_Father: {fileID: 6934264674992649803} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 14.6, y: -11.2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 29, y: -11} m_SizeDelta: {x: 8, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264675955888902 @@ -1480,8 +2066,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3882353} + m_Color: {r: 1, g: 1, b: 1, a: 0.77254903} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1496,6 +2083,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6991269287449308434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934264675955888899} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.83 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.8235294} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264676081351463 GameObject: m_ObjectHideFlags: 0 @@ -1506,7 +2121,6 @@ GameObject: m_Component: - component: {fileID: 6934264676081351464} - component: {fileID: 6934264676081351466} - - component: {fileID: 6934264676081351465} m_Layer: 5 m_Name: Kreis m_TagString: Untagged @@ -1542,35 +2156,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6934264676081351463} m_CullTransparentMesh: 0 ---- !u!114 &6934264676081351465 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6934264676081351463} - 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: 9d02af9561347c349986baae6fb1fa27, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &6934264676097734670 GameObject: m_ObjectHideFlags: 0 @@ -1602,7 +2187,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1011144588136270061} + - {fileID: 636246201113047790} - {fileID: 5513503267205880076} + - {fileID: 5489280391875434129} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1633,7 +2220,6 @@ MonoBehaviour: m_EditorClassIdentifier: FormationImage: {fileID: 6934264676539302134} FormationNumberText: {fileID: 6934264675066306911} - FormationNumberEnding: {fileID: 6934264676830680021} Arrow: {fileID: 9087990028491932013} StrengthGameObjects: - {fileID: 6934264676128576589} @@ -1683,7 +2269,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6934264676128576590 RectTransform: m_ObjectHideFlags: 0 @@ -1753,6 +2339,7 @@ GameObject: - component: {fileID: 6934264676454998589} - component: {fileID: 6934264676454998591} - component: {fileID: 6934264676454998590} + - component: {fileID: 4297757512820293869} m_Layer: 5 m_Name: Kreis (4) m_TagString: Untagged @@ -1774,9 +2361,9 @@ RectTransform: m_Father: {fileID: 6934264676736199430} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -14.6, y: -11.2} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 11, y: -29} m_SizeDelta: {x: 8, y: 8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264676454998591 @@ -1800,8 +2387,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.3882353} + m_Color: {r: 1, g: 1, b: 1, a: 0.77254903} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1816,6 +2404,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4297757512820293869 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934264676454998588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.83 + offsetAngle: 90 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 0.8235294} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264676539302132 GameObject: m_ObjectHideFlags: 0 @@ -1827,6 +2443,7 @@ GameObject: - component: {fileID: 6934264676539302133} - component: {fileID: 6934264676539302135} - component: {fileID: 6934264676539302134} + - component: {fileID: 1841788201415583367} m_Layer: 5 m_Name: Kreis (1) m_TagString: Untagged @@ -1848,10 +2465,10 @@ RectTransform: m_Father: {fileID: 4038486383170554002} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.1, y: 0.1} - m_AnchorMax: {x: 0.9, y: 0.9} - m_AnchoredPosition: {x: 0, y: -6.7} - m_SizeDelta: {x: 0, y: -3} + m_AnchorMin: {x: 0.15, y: 0.15} + m_AnchorMax: {x: 0.85, y: 0.85} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6934264676539302135 CanvasRenderer: @@ -1876,11 +2493,12 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4c9086bbb799f844fae73d0d44f7f1c9, type: 3} + m_Sprite: {fileID: 21300000, guid: 90e2e9a658be3c4459cefa7fe4ed62c1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1890,6 +2508,34 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &1841788201415583367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6934264676539302132} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.868 + offsetAngle: 90 + offsetDistance: 8 + offset: {x: 0, y: 0} + color: {r: 0, g: 0, b: 0, a: 1} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 0 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &6934264676736199429 GameObject: m_ObjectHideFlags: 0 @@ -1928,100 +2574,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &6934264676830680018 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6934264676830680019} - - component: {fileID: 6934264676830680022} - - component: {fileID: 6934264676830680021} - - component: {fileID: 6934264676830680020} - m_Layer: 5 - m_Name: PlanetName (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6934264676830680019 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6934264676830680018} - 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: 6934264675066306908} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10.3, y: -11.2} - m_SizeDelta: {x: 20.295, y: 17.26383} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6934264676830680022 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6934264676830680018} - m_CullTransparentMesh: 0 ---- !u!114 &6934264676830680021 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6934264676830680018} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.7921569} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3} - m_FontSize: 11 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 300 - m_Alignment: 6 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: th ---- !u!114 &6934264676830680020 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6934264676830680018} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 2, y: -2} - m_UseGraphicAlpha: 1 --- !u!1 &6934264676898299679 GameObject: m_ObjectHideFlags: 0 @@ -2056,12 +2608,12 @@ RectTransform: - {fileID: 6934264675173919768} - {fileID: 6934264676736199430} m_Father: {fileID: 5513503267205880076} - m_RootOrder: 2 + m_RootOrder: 3 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: 7.5} - m_SizeDelta: {x: 0, y: 15} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8138893207784313283 GameObject: @@ -2093,7 +2645,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5513503267205880076} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2115,7 +2667,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8138893207784313283} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -2123,6 +2675,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2137,3 +2690,78 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8335768618916712872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5489280391875434129} + - component: {fileID: 5882352594346764105} + - component: {fileID: 2240190295040866393} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5489280391875434129 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8335768618916712872} + 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: 6934264676097734671} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 55, y: 55} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5882352594346764105 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8335768618916712872} + m_CullTransparentMesh: 1 +--- !u!114 &2240190295040866393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8335768618916712872} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: fd99aecc0d5e31a42a58d6583e2da8d3, 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 diff --git a/Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab b/Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab index 70ce8e5..2f178fe 100644 --- a/Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab +++ b/Assets/GWConquest/Prefabs/UI/PlanetIndicator.prefab @@ -282,7 +282,8 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -100} m_LocalScale: {x: 1, y: 1, z: 0} - m_Children: [] + m_Children: + - {fileID: 4694286665432162353} m_Father: {fileID: 3206999086042524838} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -306,7 +307,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1504973411824923093} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -633,6 +634,110 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2601710222791204670 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3597273204616103648} + - component: {fileID: 6649543984312342684} + - component: {fileID: 1071791650260473966} + - component: {fileID: 7779311651342929745} + m_Layer: 5 + m_Name: SwordRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3597273204616103648 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2601710222791204670} + 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: 4694286665432162353} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6649543984312342684 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2601710222791204670} + m_CullTransparentMesh: 0 +--- !u!114 &1071791650260473966 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2601710222791204670} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6fee5394bcf59dc49a420d82f8c59cc2, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7779311651342929745 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2601710222791204670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.866 + offsetAngle: 74.307144 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 1} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &2757051028987816225 GameObject: m_ObjectHideFlags: 0 @@ -708,6 +813,72 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2946785577647416901 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4694286665432162353} + - component: {fileID: 5630722018663237976} + - component: {fileID: 6927743059354002062} + m_Layer: 5 + m_Name: BattleIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4694286665432162353 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2946785577647416901} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8990498, y: 0.8990418, z: 0} + m_Children: + - {fileID: 2039808984436274979} + - {fileID: 3597273204616103648} + m_Father: {fileID: 5933915466098524944} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5630722018663237976 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2946785577647416901} + m_CullTransparentMesh: 0 +--- !u!95 &6927743059354002062 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2946785577647416901} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 03da4631450b7c54188502294251bc63, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &3536075192841412823 GameObject: m_ObjectHideFlags: 0 @@ -720,6 +891,7 @@ GameObject: - component: {fileID: 8817467615109816757} - component: {fileID: 8517481495962601137} - component: {fileID: 5092933628985013823} + - component: {fileID: 3848447959370661838} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -802,20 +974,34 @@ MonoBehaviour: m_EditorClassIdentifier: size: 3.48 spread: 0.916 - offsetAngle: 90 - offsetDistance: 8 - offset: {x: 0, y: 0} + offsetAngle: 74.307144 + offsetDistance: 0 + offset: {x: 0, y: -0} color: {r: 0, g: 0, b: 0, a: 1} inset: 0 blendMode: 0 useCasterAlpha: 1 ignoreCasterColor: 0 - colorBleedMode: 0 + colorBleedMode: 2 shadowAsSibling: 0 cutout: 0 baked: 0 modifiedFromInspector: 0 bakedShadows: [] +--- !u!114 &3848447959370661838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3536075192841412823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 02e6f936b2dd0634b921848bc8ca4842, type: 3} + m_Name: + m_EditorClassIdentifier: + ZoomThreshold: 550 + ConstantScale: 1 --- !u!1 &4082808148708746503 GameObject: m_ObjectHideFlags: 0 @@ -966,6 +1152,110 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4882745342399101360 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2039808984436274979} + - component: {fileID: 1339691316115769468} + - component: {fileID: 558019578109838434} + - component: {fileID: 2973735675637770142} + m_Layer: 5 + m_Name: SwordLeft + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2039808984436274979 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4882745342399101360} + 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: 4694286665432162353} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1339691316115769468 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4882745342399101360} + m_CullTransparentMesh: 0 +--- !u!114 &558019578109838434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4882745342399101360} + 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6fee5394bcf59dc49a420d82f8c59cc2, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2973735675637770142 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4882745342399101360} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52c162dc854d2f24fa639ba0623de5ef, type: 3} + m_Name: + m_EditorClassIdentifier: + size: 3.48 + spread: 0.866 + offsetAngle: 74.307144 + offsetDistance: 0 + offset: {x: 0, y: -0} + color: {r: 0, g: 0, b: 0, a: 1} + inset: 0 + blendMode: 0 + useCasterAlpha: 1 + ignoreCasterColor: 0 + colorBleedMode: 2 + shadowAsSibling: 0 + cutout: 0 + baked: 0 + modifiedFromInspector: 0 + bakedShadows: [] --- !u!1 &5727137025483658638 GameObject: m_ObjectHideFlags: 0 @@ -1317,8 +1607,8 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7992197144211585402} 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_LocalPosition: {x: 0, y: 0, z: -90} + m_LocalScale: {x: 0.45136, y: 0.45136, z: 0.45136} m_Children: [] m_Father: {fileID: 3206999086042524838} m_RootOrder: 0 @@ -1349,14 +1639,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.64446914, b: 0.2688679, a: 1} + m_Color: {r: 1, g: 0.54901963, b: 0.27058825, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c573113a2d867074eb8afdfc86ac4273, type: 3} + m_Sprite: {fileID: 21300000, guid: 589ce6136fc485849980aca7b4e282d3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/GWConquest/Resources/PlanetConnection.prefab b/Assets/GWConquest/Resources/PlanetConnection.prefab index c3459a1..74c6e1a 100644 --- a/Assets/GWConquest/Resources/PlanetConnection.prefab +++ b/Assets/GWConquest/Resources/PlanetConnection.prefab @@ -149,5 +149,7 @@ MonoBehaviour: drawLine: 1 QuadPrefab: {fileID: 6069422642220358092, guid: 1d8cf03ddf5b714438fd0ecc04ac501c, type: 3} + ConstantWidth: 0.0025 + ConstantQuadScale: 0.012 QuadCount: 8 QuadSpeed: 200 diff --git a/Assets/GWConquest/Resources/UnitIcons/CaerBannoqRealmHunters.png b/Assets/GWConquest/Resources/UnitIcons/CaerBannoqRealmHunters.png new file mode 100644 index 0000000000000000000000000000000000000000..a313724b7a3324cc0753b2806d53991514c51c1e GIT binary patch literal 2815 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 LSR2qD literal 0 HcmV?d00001 diff --git a/Assets/GWConquest/Resources/UnitIcons/CaerBannoqRealmHunters.png.meta b/Assets/GWConquest/Resources/UnitIcons/CaerBannoqRealmHunters.png.meta new file mode 100644 index 0000000..7395752 --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/CaerBannoqRealmHunters.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 2c806ffd7b37b4144b486cc58dd64d92 +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Resources/UnitIcons/ElysiaOathswornSquad.png b/Assets/GWConquest/Resources/UnitIcons/ElysiaReconInfantry.png similarity index 100% rename from Assets/GWConquest/Resources/UnitIcons/ElysiaOathswornSquad.png rename to Assets/GWConquest/Resources/UnitIcons/ElysiaReconInfantry.png diff --git a/Assets/GWConquest/Resources/UnitIcons/ElysiaOathswornSquad.png.meta b/Assets/GWConquest/Resources/UnitIcons/ElysiaReconInfantry.png.meta similarity index 100% rename from Assets/GWConquest/Resources/UnitIcons/ElysiaOathswornSquad.png.meta rename to Assets/GWConquest/Resources/UnitIcons/ElysiaReconInfantry.png.meta diff --git a/Assets/GWConquest/Resources/UnitIcons/SartoriusHeavyInfantry.png b/Assets/GWConquest/Resources/UnitIcons/SartoriusHeavyInfantry.png new file mode 100644 index 0000000000000000000000000000000000000000..3bab7fa92b1c146af567d56fe8718cb1d7ddca0d GIT binary patch literal 2674 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 literal 0 HcmV?d00001 diff --git a/Assets/GWConquest/Resources/UnitIcons/SartoriusHeavyInfantry.png.meta b/Assets/GWConquest/Resources/UnitIcons/SartoriusHeavyInfantry.png.meta new file mode 100644 index 0000000..feb4c44 --- /dev/null +++ b/Assets/GWConquest/Resources/UnitIcons/SartoriusHeavyInfantry.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 5fa48d9a73b102a49bf2d3a4e2f43e79 +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 2 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Resources/UnitIcons/SartoriusInfantry.png b/Assets/GWConquest/Resources/UnitIcons/SartoriusInfantry.png index 47595a20cae4d54e201ce450aad86174406552eb..cdece0f275b66269387672da03116ffb4864d2e1 100644 GIT binary patch delta 2349 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 + } + return _instance; + } + } + public Transform cameraTransform; public Camera mainCam; @@ -38,6 +49,21 @@ namespace GWConquest private Plane cameraPlane; + private List zoomScalings = new List(); + + public void AddZoomScaling(IZoomScaling scaling) + { + zoomScalings.Add(scaling); + } + + public void RemoveZoomScaling(IZoomScaling scaling) + { + if(zoomScalings.Contains(scaling)) + { + zoomScalings.Remove(scaling); + } + } + private void Start() { if(mainCam.orthographic) @@ -187,6 +213,11 @@ namespace GWConquest cameraTransform.localPosition = cameraPos; } + foreach(var scaling in zoomScalings) + { + scaling.UpdateScaling(); + } + } transform.position = Vector3.SmoothDamp(transform.position, transformPositionTarget, ref transformPositionVelocity, cameraTranslationSmooth); @@ -199,6 +230,11 @@ namespace GWConquest mainCam.transform.SetParent(cameraTransform, true); } } + + public interface IZoomScaling + { + void UpdateScaling(); + } } diff --git a/Assets/GWConquest/Scripts/GameManager.cs b/Assets/GWConquest/Scripts/GameManager.cs index 7875e6f..1a76f2c 100644 --- a/Assets/GWConquest/Scripts/GameManager.cs +++ b/Assets/GWConquest/Scripts/GameManager.cs @@ -50,6 +50,8 @@ namespace GWConquest public float ShieldsCooldown; + public float ZoomPlanetThreshold; + public bool SpawnAIPlayer; public bool IsLoaded { get; private set; } = false; @@ -185,5 +187,9 @@ namespace GWConquest SoundEffects.Instance = null; } + public bool ShowCircles { + get => Camera.main.orthographicSize < ZoomPlanetThreshold; + } + } } \ No newline at end of file diff --git a/Assets/GWConquest/Scripts/Planet.cs b/Assets/GWConquest/Scripts/Planet.cs index 803f5a9..e01f303 100644 --- a/Assets/GWConquest/Scripts/Planet.cs +++ b/Assets/GWConquest/Scripts/Planet.cs @@ -51,9 +51,16 @@ namespace GWConquest public Transform CameraRotatorTransform; public Transform planetCameraTransform; + public GameObject PrefabObject; public GameObject AdditionalObjects; public bool RefuseConnections = false; + public Transform CircleTransform; + public float CircleTransformDamp; + public float MaxCircleScale; + private float CircleScaleVelocity; + + public PlanetData PlanetData { get => PlanetRegistry.GetPlanetData(gameObject.name); @@ -334,10 +341,10 @@ namespace GWConquest { FormationsChanged?.Invoke(); - if (indicatorUI != null) - { - indicatorUI.UpdateIndicator(); - } + //if (indicatorUI != null) + //{ + // indicatorUI.UpdateIndicator(); + //} formationsChangedSinceLastFrame = false; } @@ -441,7 +448,7 @@ namespace GWConquest if(IngameUI.Instance.PlanetView.selectedPlanet != this) { - foreach(Renderer r in GetComponentsInChildren()) + foreach(Renderer r in PrefabObject.GetComponentsInChildren()) { r.enabled = false; } @@ -455,7 +462,7 @@ namespace GWConquest indicatorUI.gameObject.SetActive(false); } else { - foreach(Renderer r in GetComponentsInChildren()) + foreach(Renderer r in PrefabObject.GetComponentsInChildren()) { r.enabled = true; @@ -481,6 +488,27 @@ namespace GWConquest } } + public void Update() + { + if(Application.isPlaying) + { + float CircleSizeTarget = GameManager.Instance.ShowCircles ? MaxCircleScale : 0f; + + float CircleSize = CircleTransform.localScale.x; + CircleSize = Mathf.SmoothDamp(CircleSize, CircleSizeTarget, ref CircleScaleVelocity, CircleTransformDamp); + + CircleTransform.localScale = Vector3.one * CircleSize; + + if(IngameUI.PlanetViewEnabled || (!DebugUI.ShowAllPlanets && VisibilityStatus == PlanetVisibilityStatus.Hidden) || CircleSize == 0f) + { + CircleTransform.gameObject.SetActive(false); + } + else { + CircleTransform.gameObject.SetActive(true); + } + } + } + #if UNITY_EDITOR @@ -735,6 +763,16 @@ namespace GWConquest view.LookAt(camT.position + camT.forward, camT.rotation, 1f); } + [ContextMenu("Fix Prefab Objects")] + public void FixPrefabObjects() + { + foreach (Planet p in AllPlanets) + { + p.PrefabObject = p.GetComponentInChildren().gameObject; + UnityEditor.PrefabUtility.RecordPrefabInstancePropertyModifications(p); + } + } + #endif } diff --git a/Assets/GWConquest/Scripts/PlanetConnection.cs b/Assets/GWConquest/Scripts/PlanetConnection.cs index fc1ec88..6e08dfb 100644 --- a/Assets/GWConquest/Scripts/PlanetConnection.cs +++ b/Assets/GWConquest/Scripts/PlanetConnection.cs @@ -18,6 +18,9 @@ namespace GWConquest public GameObject QuadPrefab; + public float ConstantWidth; + public float ConstantQuadScale; + public float QuadCount; public float QuadSpeed; @@ -91,26 +94,45 @@ namespace GWConquest private void Update() { -#if UNITY_EDITOR - if(!Application.isPlaying) - { + + //if(!Application.isPlaying) + //{ UpdatePositions(); - if (IsPreConnection) + +#if UNITY_EDITOR + if (!Application.isPlaying && IsPreConnection) { var lineRenderer = GetComponent(); lineRenderer.startColor = Util.UpdateColorRGB(lineRenderer.startColor, Color.green); lineRenderer.endColor = Util.UpdateColorRGB(lineRenderer.endColor, Color.green); } - } + //} #endif if(Application.isPlaying && !IsPreConnection) { + + Camera cam = Camera.main; + float distance; + + if(cam.orthographic) + { + distance = cam.orthographicSize; + } + else + { + distance = Vector3.Distance(transform.position, cam.transform.position); + } + + float scale = distance * 1000f / cam.pixelHeight; + lineRenderer.widthMultiplier = ConstantWidth * scale; + var delta = QuadSpeed * Time.deltaTime; for(int i = Quads.Count-1; i >= 0; i--) { var quad = Quads[i]; quad.transform.position = Vector3.MoveTowards(quad.transform.position, quad.target, delta); + quad.transform.localScale = Vector3.one * ConstantQuadScale * scale; if(Vector3.SqrMagnitude(quad.transform.position - quad.target) <= 0.1) { Destroy(quad.transform.gameObject); @@ -127,22 +149,37 @@ namespace GWConquest { if (planet1 != null && planet2 != null) { - LineRenderer lineRenderer = GetComponent(); - if (drawLine) + var lr = lineRenderer; + + if(lr == null) { - lineRenderer.enabled = true; - lineRenderer.SetPositions(new Vector3[] { planet1.transform.position, planet2.transform.position }); -#if UNITY_EDITOR - UnityEditor.PrefabUtility.RecordPrefabInstancePropertyModifications(lineRenderer); -#endif + lr = GetComponent(); } - else + + Vector3 pos1 = planet1.transform.position; + Vector3 pos2 = planet2.transform.position; + Vector3 diff = (pos2 - pos1).normalized; + + if (Application.isPlaying) { - lineRenderer.enabled = false; + pos1 += diff * planet1.CircleTransform.lossyScale.x / 2f; + pos2 -= diff * planet2.CircleTransform.lossyScale.x / 2f; + } + + lr.SetPositions(new Vector3[] { pos1, pos2 }); + + + + + #if UNITY_EDITOR - UnityEditor.PrefabUtility.RecordPrefabInstancePropertyModifications(lineRenderer); -#endif + + if (!Application.isPlaying) + { + lr.enabled = drawLine; } + UnityEditor.PrefabUtility.RecordPrefabInstancePropertyModifications(lr); +#endif } diff --git a/Assets/GWConquest/Scripts/PlanetPlacement.cs b/Assets/GWConquest/Scripts/PlanetPlacement.cs index 752c0e3..1aa46e3 100644 --- a/Assets/GWConquest/Scripts/PlanetPlacement.cs +++ b/Assets/GWConquest/Scripts/PlanetPlacement.cs @@ -114,6 +114,7 @@ namespace GWConquest planet.OriginalDesaturation = rend.material.GetFloat("_Desaturation"); } + planet.PrefabObject = sphereGO; } public PlanetConnection SpawnPlanetConnection(Planet planet1, Planet planet2) diff --git a/Assets/GWConquest/Scripts/PlanetScaling.cs b/Assets/GWConquest/Scripts/PlanetScaling.cs index e7fbcf5..5b927e1 100644 --- a/Assets/GWConquest/Scripts/PlanetScaling.cs +++ b/Assets/GWConquest/Scripts/PlanetScaling.cs @@ -1,49 +1,78 @@ using UnityEngine; -public class PlanetScaling : MonoBehaviour +namespace GWConquest { - public float NearScalingDistance = 1f; - public float FarScalingDistance = 1f; + public class PlanetScaling : MonoBehaviour, IZoomScaling + { - public float FixPlanetSize = 1f; + public float NearScalingDistance = 1f; + public float FarScalingDistance = 1f; - void Update() - { - Camera cam = Camera.main; - float distance; - - if(cam.orthographic) - { - distance = cam.orthographicSize; - } - else - { - distance = Vector3.Distance(transform.position, cam.transform.position); - } + public float FixPlanetSize = 1f; + + public float CircleWidth; + public float InnerCircleWidth; - float scale; + public LineRenderer CircleRenderer; + public LineRenderer InnerCircleRenderer; - if (distance < NearScalingDistance) + public void UpdateScaling() { - // Linear slope through zero - float planetScaleNear = FixPlanetSize / NearScalingDistance; - scale = distance * planetScaleNear; + Camera cam = Camera.main; + float distance; + + if(cam.orthographic) + { + distance = cam.orthographicSize; + } + else + { + distance = Vector3.Distance(transform.position, cam.transform.position); + } + + float scale; + + if (distance < NearScalingDistance) + { + // Linear slope through zero + float planetScaleNear = FixPlanetSize / NearScalingDistance; + scale = distance * planetScaleNear; + } + else if (distance > FarScalingDistance) + { + // Linear slope, also through zero + float planetScaleFar = FixPlanetSize / FarScalingDistance; + scale = distance * planetScaleFar; + } + else + { + // Constant value + scale = FixPlanetSize; + } + + scale *= (1000f / cam.pixelHeight); + + transform.localScale = scale * Vector3.one; + + float circleScale = distance * CircleWidth * (1000f / cam.pixelHeight); + CircleRenderer.widthMultiplier = circleScale; + + float innerCircleScale = distance * InnerCircleWidth * (1000f / cam.pixelHeight); + InnerCircleRenderer.widthMultiplier = innerCircleScale; } - else if (distance > FarScalingDistance) + + void OnEnable() { - // Linear slope, also through zero - float planetScaleFar = FixPlanetSize / FarScalingDistance; - scale = distance * planetScaleFar; + GWCamera.Instance.AddZoomScaling(this); } - else + + void OnDisable() { - // Constant value - scale = FixPlanetSize; + GWCamera.Instance.RemoveZoomScaling(this); } + } + - scale *= (1000f / cam.pixelHeight); - transform.localScale = scale * Vector3.one; - } } diff --git a/Assets/GWConquest/Scripts/UI/FormationIcon.cs b/Assets/GWConquest/Scripts/UI/FormationIcon.cs index b9d0f1b..57ac966 100644 --- a/Assets/GWConquest/Scripts/UI/FormationIcon.cs +++ b/Assets/GWConquest/Scripts/UI/FormationIcon.cs @@ -11,7 +11,7 @@ namespace GWConquest { { public Image FormationImage; public Text FormationNumberText; - public Text FormationNumberEnding; + //public Text FormationNumberEnding; public RectTransform Arrow; @@ -47,7 +47,7 @@ namespace GWConquest { FormationImage.sprite = category.Icon; FormationNumberText.gameObject.SetActive(true); FormationNumberText.text = f.FormationNumber.ToString(); - FormationNumberEnding.text = Util.GetOrdinalEnding(f.FormationNumber); + //FormationNumberEnding.text = Util.GetOrdinalEnding(f.FormationNumber); for(int i = 0; i < StrengthGameObjects.Length; i++) { diff --git a/Assets/GWConquest/Scripts/UI/IngameUI.cs b/Assets/GWConquest/Scripts/UI/IngameUI.cs index 02de082..2295bce 100644 --- a/Assets/GWConquest/Scripts/UI/IngameUI.cs +++ b/Assets/GWConquest/Scripts/UI/IngameUI.cs @@ -215,8 +215,7 @@ namespace GWConquest PlanetView.HideUI(); PlanetView.gameObject.SetActive(false); - GWCamera camera = FindObjectOfType(); - camera.ResetCameraTransform(); + GWCamera.Instance.ResetCameraTransform(); Camera.main.orthographic = true; diff --git a/Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs b/Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs index 8882cd7..fe5d9ef 100644 --- a/Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs +++ b/Assets/GWConquest/Scripts/UI/PlanetIndicatorUI.cs @@ -68,7 +68,7 @@ namespace GWConquest public void UpdateIndicator() { - if (DebugUI.ShowAllPlanets || Planet.VisibilityStatus == PlanetVisibilityStatus.Visible) + if ((DebugUI.ShowAllPlanets || Planet.VisibilityStatus == PlanetVisibilityStatus.Visible) && !GameManager.Instance.ShowCircles) { IEnumerable formations = Planet.GetAllFormations(ZoneType.Space); float playerStrength = formations.Sum(f => f.Player == Player.CurrentPlayer ? f.GetFormationStrength() : 0f); @@ -124,57 +124,76 @@ namespace GWConquest private void FixedUpdate() { if(GameManager.EntitiesLoaded && Planet != null) { + UpdateIndicator(); + if (DebugUI.ShowAllPlanets || Planet.VisibilityStatus == PlanetVisibilityStatus.Visible) { var controllingPlayer = Planet.ControllingPlayer; + var circleRend = Planet.CircleTransform.GetComponent(); + if (controllingPlayer != null) { - FactionImage.gameObject.SetActive(true); - FactionImage.sprite = controllingPlayer.Faction.FactionLogo; - FactionImage.color = Util.UpdateColorRGB(FactionImage.color, controllingPlayer.Faction.FactionColor); + if(GameManager.Instance.ShowCircles) + { + FactionImage.gameObject.SetActive(false); + } + else { + FactionImage.gameObject.SetActive(true); + FactionImage.sprite = controllingPlayer.Faction.FactionLogo; + FactionImage.color = Util.UpdateColorRGB(FactionImage.color, controllingPlayer.Faction.FactionColor); + } PlanetNameText.color = Util.UpdateColorRGB(PlanetNameText.color, controllingPlayer.Faction.FactionColor); - + circleRend.startColor = Util.UpdateColorRGB(circleRend.startColor, controllingPlayer.Faction.FactionColor); + circleRend.endColor = circleRend.startColor; } else { FactionImage.gameObject.SetActive(false); PlanetNameText.color = Util.UpdateColorRGB(PlanetNameText.color, NeutralColor); + circleRend.startColor = Util.UpdateColorRGB(circleRend.startColor, NeutralColor); + circleRend.endColor = circleRend.startColor; } - DistrictSymbols.gameObject.SetActive(true); - var districts = Planet.GetComponentsInChildren(); - foreach (var type in DistrictSymbolDict.Keys) + if (!GameManager.Instance.ShowCircles) { - var typeDistricts = districts.Where(d => d.GetFullType() == type); + DistrictSymbols.gameObject.SetActive(true); + var districts = Planet.GetComponentsInChildren(); + foreach (var type in DistrictSymbolDict.Keys) + { + var typeDistricts = districts.Where(d => d.GetFullType() == type); - Color color = NeutralColor; + Color color = NeutralColor; - if (typeDistricts.All(d => d.ControllingPlayer == Player.CurrentPlayer)) - { - if (typeDistricts.All(d => d.GetComponent() != null)) + if (typeDistricts.All(d => d.ControllingPlayer == Player.CurrentPlayer)) { - if (typeDistricts.All(d => d.GetComponent().IsProducing)) + if (typeDistricts.All(d => d.GetComponent() != null)) + { + if (typeDistricts.All(d => d.GetComponent().IsProducing)) + { + color = controllingPlayer.Faction.FactionColor; + } + } + else { color = controllingPlayer.Faction.FactionColor; } } - else + + foreach (Image img in DistrictSymbolDict[type].GetComponentsInChildren()) { - color = controllingPlayer.Faction.FactionColor; + img.color = Util.UpdateColorRGB(img.color, color); } - } - foreach (Image img in DistrictSymbolDict[type].GetComponentsInChildren()) - { - img.color = Util.UpdateColorRGB(img.color, color); } - + } + else { + DistrictSymbols.gameObject.SetActive(false); } GetComponent().SetBool("Battle", Planet.HasBattle); diff --git a/Assets/GWConquest/Scripts/UI/UIZoomScaling.cs b/Assets/GWConquest/Scripts/UI/UIZoomScaling.cs new file mode 100644 index 0000000..f096d1e --- /dev/null +++ b/Assets/GWConquest/Scripts/UI/UIZoomScaling.cs @@ -0,0 +1,54 @@ +using UnityEngine; + +namespace GWConquest { + + public class UIZoomScaling : MonoBehaviour, IZoomScaling + { + public float ZoomThreshold; + public float ConstantScale; + + public void UpdateScaling() + { + Camera cam = Camera.main; + float distance; + + if(cam.orthographic) + { + distance = cam.orthographicSize; + } + else + { + distance = Vector3.Distance(transform.position, cam.transform.position); + } + + float scale; + + if (distance < ZoomThreshold) + { + // Linear slope through zero + float planetScaleNear = ConstantScale / ZoomThreshold; + scale = distance * planetScaleNear; + } + else + { + // Constant value + scale = ConstantScale; + } + + //scale *= (1000f / cam.pixelHeight); + + transform.localScale = scale * Vector3.one; + } + + void OnEnable() + { + GWCamera.Instance.AddZoomScaling(this); + } + + void OnDisable() + { + GWCamera.Instance.RemoveZoomScaling(this); + } + } + +} diff --git a/Assets/GWConquest/Scripts/UI/UIZoomScaling.cs.meta b/Assets/GWConquest/Scripts/UI/UIZoomScaling.cs.meta new file mode 100644 index 0000000..f681b30 --- /dev/null +++ b/Assets/GWConquest/Scripts/UI/UIZoomScaling.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 02e6f936b2dd0634b921848bc8ca4842 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Scripts/ZoomSkyboxEffect.cs b/Assets/GWConquest/Scripts/ZoomSkyboxEffect.cs new file mode 100644 index 0000000..38fe7af --- /dev/null +++ b/Assets/GWConquest/Scripts/ZoomSkyboxEffect.cs @@ -0,0 +1,28 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace GWConquest +{ + + public class ZoomSkyboxEffect : MonoBehaviour + { + public float minExposure; + public float maxExposure; + + public Color minColor; + public Color maxColor; + + void Update() + { + float percent = Mathf.InverseLerp(GWCamera.Instance.minCameraZoom, GWCamera.Instance.maxCameraZoom, Camera.main.orthographicSize); + + float exposure = Mathf.Lerp(minExposure, maxExposure, percent); + Color color = Color.Lerp(minColor, maxColor, percent); + + var mat = RenderSettings.skybox; + mat.SetFloat("_Exposure", exposure); + mat.SetColor("_Tint", color); + } + } +} diff --git a/Assets/GWConquest/Scripts/ZoomSkyboxEffect.cs.meta b/Assets/GWConquest/Scripts/ZoomSkyboxEffect.cs.meta new file mode 100644 index 0000000..e1ccf5a --- /dev/null +++ b/Assets/GWConquest/Scripts/ZoomSkyboxEffect.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a289462fbfb62f14ea4aee1a69f8767f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/UI/Blackest Whole.png b/Assets/GWConquest/Textures/UI/Blackest Whole.png new file mode 100644 index 0000000000000000000000000000000000000000..3de6388da765738e3bf11f56e4ad9b2a1e55b3fc GIT binary patch literal 4560 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 literal 0 HcmV?d00001 diff --git a/Assets/GWConquest/Textures/UI/RAUTE.png.meta b/Assets/GWConquest/Textures/UI/RAUTE.png.meta new file mode 100644 index 0000000..16c10b0 --- /dev/null +++ b/Assets/GWConquest/Textures/UI/RAUTE.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 2f346b30884e9424bbb8f1a1d98e2436 +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 2 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/UI/kreis3.png b/Assets/GWConquest/Textures/UI/kreis3.png index 2a616970be18410f6c5fbd345a1880234cbde8a8..9e0b69794ff27c09d5bd45c2e5902b8263a652e7 100644 GIT binary patch literal 4527 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 Ru0vfku(LU0U25rd?SDYSOY8su diff --git a/Assets/Starfield Skybox/Skybox.mat b/Assets/Starfield Skybox/Skybox.mat index 3caa2d7..8808238 100644 --- a/Assets/Starfield Skybox/Skybox.mat +++ b/Assets/Starfield Skybox/Skybox.mat @@ -85,7 +85,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _Exposure: 0.72 + - _Exposure: 0.4 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -102,5 +102,5 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _Tint: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _Tint: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1} m_BuildTextureStacks: []