Planeten in die Galaxiekarte zugefügt, viel mehr

Assets/GWConquest/PlanetNames.mat

@@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: PlanetNames
+  m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 10
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _UseUIAlphaClip: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/GWConquest/PlanetNames.mat.meta

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

Assets/GWConquest/Prefabs/Planet.prefab

@@ -49,8 +49,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   NearScalingDistance: 550
-  FarScalingDistance: 1600
-  FixPlanetSize: 2
+  FarScalingDistance: 550
+  FixPlanetSize: 0.77
 --- !u!114 &4678135251219452001
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -63,12 +63,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6ded4d2fd3f18ad40916c57fe4f6a566, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  textPrefab: {fileID: 0}
   spaceZones:
   - {fileID: 4678135251998877762}
   - {fileID: 4678135252239284612}
   groundZones:
   - {fileID: 4678135252407299476}
   - {fileID: 4678135251355824059}
+  showPlanetName: 1
+  planetName: 
   connections: []
 --- !u!1 &4678135251355824058
 GameObject:

Assets/GWConquest/Prefabs/PlanetName.prefab

@@ -35,9 +35,9 @@ 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: 62.643814, y: 24.54837}
+  m_AnchoredPosition: {x: 201.05869, y: 55.54934}
   m_SizeDelta: {x: 546.38, y: 64.14}
-  m_Pivot: {x: -0.26, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1.95}
 --- !u!222 &8467716388278459801
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -58,20 +58,20 @@ MonoBehaviour:
   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.5686275}
+  m_Material: {fileID: 2100000, guid: 4efcda70235ff1d4ca9ef256caac46ee, type: 2}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.36078432}
   m_RaycastTarget: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: c47f9c9ae53006b46bef8b5c48a002a5, type: 3}
-    m_FontSize: 40
+    m_FontSize: 27
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 4
+    m_MinSize: 2
     m_MaxSize: 74
-    m_Alignment: 3
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0

Assets/GWConquest/Resources.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 40398c4130baae0408f3a774d7b3b300
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/GWConquest/Scenes/GalaxyMap.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9f36bfc6cf7983247a4db014bed21e46
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/GWConquest/Scenes/GalaxyMapTest.unity

@@ -460,34 +460,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6547d18b2bc62c94aa5ec1e87434da4e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  boost: 4.8
-  positionLerpTime: 0.2
-  mouseSensitivityCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0.5
-      inSlope: 0
-      outSlope: 5
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    - serializedVersion: 3
-      time: 1
-      value: 2.5
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0
-      outWeight: 0
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  rotationLerpTime: 0.01
-  invertY: 0
 --- !u!114 &113513875
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -943,7 +915,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &190198966
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2585,6 +2557,79 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 567617664}
   m_CullTransparentMesh: 0
+--- !u!1 &573505744
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 573505745}
+  - component: {fileID: 573505747}
+  - component: {fileID: 573505746}
+  m_Layer: 5
+  m_Name: Image (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &573505745
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 573505744}
+  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: 1954647564}
+  m_RootOrder: 9
+  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: -12.9}
+  m_SizeDelta: {x: 300, y: 300}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &573505746
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 573505744}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.53333336}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 28b105de74cd71c449fa536714e074fe, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &573505747
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 573505744}
+  m_CullTransparentMesh: 0
 --- !u!1 &644600674
 GameObject:
   m_ObjectHideFlags: 0
@@ -2684,16 +2729,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
-        type: 3}
-      propertyPath: FarScalingDistance
-      value: 550
-      objectReference: {fileID: 0}
-    - target: {fileID: 4678135251219451998, guid: 9ae35d7f911b63f4f95f432141dd5746,
-        type: 3}
-      propertyPath: FixPlanetSize
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 4678135251219451999, guid: 9ae35d7f911b63f4f95f432141dd5746,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -4371,7 +4406,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 79ff36e58ec1bab4a9c75691df9c152b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  PlanetHud: {fileID: 517667253}
+  PlanetHud: {fileID: 1954647562}
   UnitIcons: {fileID: 1272946850}
 --- !u!4 &1092885814 stripped
 Transform:
@@ -7074,7 +7109,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1920619492
 RectTransform:
   m_ObjectHideFlags: 0
@@ -7354,6 +7389,7 @@ RectTransform:
   - {fileID: 567617665}
   - {fileID: 1920619492}
   - {fileID: 190198966}
+  - {fileID: 573505745}
   m_Father: {fileID: 1090750279}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/GWConquest/Scripts/Editor/ContextMenuHooks.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using UnityEditor;
+using GWConquest;
 
 public class ContextMenuHooks
 {
@@ -15,4 +16,6 @@ public class ContextMenuHooks
 
         PrefabUtility.RecordPrefabInstancePropertyModifications(rt);
     }
+
+    
 }

Assets/GWConquest/Scripts/Editor/LoadEditorHooks.cs

@@ -0,0 +1,26 @@
+using UnityEngine;
+using UnityEditor;
+
+namespace GWConquest
+{
+    [InitializeOnLoad]
+    public class LoadEditorHooks
+    {
+        static LoadEditorHooks()
+        {
+            planetGuiStyle.normal.textColor = Color.white;
+            planetGuiStyle.fontSize = 20;
+            SceneView.duringSceneGui += SceneView_duringSceneGui;
+        }
+
+        private static GUIStyle planetGuiStyle = new GUIStyle();
+
+        private static void SceneView_duringSceneGui(SceneView obj)
+        {
+            foreach (Planet planet in Object.FindObjectsOfType<Planet>())
+            {
+                Handles.Label(planet.transform.position, planet.planetName, planetGuiStyle);
+            }
+        }
+    }
+}

Assets/GWConquest/Scripts/Editor/LoadEditorHooks.cs.meta

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

Assets/GWConquest/Scripts/Editor/PlanetEditor.cs

@@ -0,0 +1,65 @@
+using UnityEngine;
+using UnityEditor;
+
+namespace GWConquest
+{
+    [CustomEditor(typeof(Planet))]
+    public class PlanetEditor : Editor
+    {
+        bool showConnections;
+
+        public override void OnInspectorGUI()
+        {
+            base.OnInspectorGUI();
+
+
+            Planet planet = target as Planet;    
+
+            showConnections = EditorGUILayout.BeginFoldoutHeaderGroup(showConnections, "Planet Connections");
+
+            if(showConnections)
+            {
+                PlanetConnection[] pcs = FindObjectsOfType<PlanetConnection>();
+                pcs = System.Array.FindAll(pcs, pc => pc.planet1 == planet || pc.planet2 == planet);
+
+                foreach (PlanetConnection conn in pcs)
+                {
+
+                    if(conn.planet1 != planet)
+                    {
+                        Planet p = EditorGUILayout.ObjectField(conn.planet1, typeof(Planet), true) as Planet;
+                        if(p != conn.planet1 && p != planet)
+                        {
+                            Undo.RecordObject(conn, "Change planet connection");
+                            conn.planet1 = p;
+                            PrefabUtility.RecordPrefabInstancePropertyModifications(conn);
+                        }
+                    }
+                    if(conn.planet2 != planet)
+                    {
+                        Planet p = EditorGUILayout.ObjectField(conn.planet2, typeof(Planet), true) as Planet;
+                        if (p != conn.planet2 && p != planet)
+                        {
+                            Undo.RecordObject(conn, "Change planet connection");
+                            conn.planet2 = p;
+                            PrefabUtility.RecordPrefabInstancePropertyModifications(conn);
+                        }
+                    }
+                }
+                if(GUILayout.Button("New", GUILayout.Width(100)))
+                {
+                    GameObject pcPrefab = Resources.Load("PlanetConnection") as GameObject;
+                    GameObject parent = GameObject.Find("PlanetConnections");
+                    GameObject pcGO = PrefabUtility.InstantiatePrefab(pcPrefab, parent.transform) as GameObject;
+                    pcGO.GetComponent<PlanetConnection>().planet1 = planet;
+
+                    Undo.RegisterCreatedObjectUndo(pcGO, "Add new planet connection");
+                }
+                EditorGUILayout.EndFoldoutHeaderGroup();
+            }
+            
+        }
+
+        
+    }
+}

Assets/GWConquest/Scripts/Editor/PlanetEditor.cs.meta

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

Assets/GWConquest/Scripts/GWCamera.cs

@@ -18,7 +18,7 @@ namespace GWConquest
         public float minCameraZoom;
         public float maxCameraZoom;
 
-        private void FixedUpdate()
+        private void Update()
         {
             float horizontal = Input.GetAxis("Horizontal");
             float vertical = Input.GetAxis("Vertical");
@@ -27,8 +27,8 @@ namespace GWConquest
             Vector3 right = transform.right;
 
 
-            transform.localPosition += vertical * cameraTranslationSpeed * Time.fixedDeltaTime * forward;
-            transform.localPosition += horizontal * cameraTranslationSpeed * Time.fixedDeltaTime * right;
+            transform.localPosition += vertical * cameraTranslationSpeed * Time.deltaTime * forward;
+            transform.localPosition += horizontal * cameraTranslationSpeed * Time.deltaTime * right;
 
             if (Input.GetButton("Middle Click"))
             {
@@ -36,8 +36,8 @@ namespace GWConquest
                 float mouseY = Input.GetAxis("Mouse Y");
 
                 Vector3 eulerAngles = transform.localEulerAngles;
-                eulerAngles.x -= mouseY * cameraRotationSpeed * Time.fixedDeltaTime;
-                eulerAngles.y += mouseX * cameraRotationSpeed * Time.fixedDeltaTime;
+                eulerAngles.x -= mouseY * cameraRotationSpeed * Time.deltaTime;
+                eulerAngles.y += mouseX * cameraRotationSpeed * Time.deltaTime;
 
                 eulerAngles.x = Mathf.Clamp(eulerAngles.x, minCameraAngle, maxCameraAngle);
 
@@ -46,11 +46,22 @@ namespace GWConquest
 
             float middle = Input.GetAxis("Mouse ScrollWheel");
 
-            Vector3 cameraPos = cameraTransform.localPosition;
-            cameraPos.z += middle* cameraZoomSpeed * Time.fixedDeltaTime;
-            cameraPos.z = Mathf.Clamp(cameraPos.z, minCameraZoom, maxCameraZoom);
+            Camera cam = cameraTransform.GetComponent<Camera>();
+            if(cam.orthographic)
+            {
+                float camSize = cam.orthographicSize + middle * cameraZoomSpeed * Time.deltaTime;
+                camSize = Mathf.Clamp(camSize, minCameraZoom, maxCameraZoom);
+                cam.orthographicSize = camSize;
+            }
+            else
+            {
+                Vector3 cameraPos = cameraTransform.localPosition;
+                cameraPos.z += middle * cameraZoomSpeed * Time.deltaTime;
+                cameraPos.z = Mathf.Clamp(cameraPos.z, minCameraZoom, maxCameraZoom);
 
-            cameraTransform.localPosition = cameraPos;
+                cameraTransform.localPosition = cameraPos;
+            }
+           
         }
     }
 }

Assets/GWConquest/Scripts/Planet.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 
 namespace GWConquest
 {
+    [ExecuteInEditMode]
     public class Planet : MonoBehaviour
     {
         public GameObject textPrefab;
@@ -27,6 +28,7 @@ namespace GWConquest
             }
         }
 
+        [HideInInspector]
         public List<PlanetConnection> connections = new List<PlanetConnection>();
 
         public Zone GetMainZone(ZoneType type)
@@ -56,28 +58,36 @@ namespace GWConquest
 
         private void Start()
         {
-            foreach(Zone zone in groundZones)
+            if (Application.isPlaying)
             {
-                zone.planet = this;
-            }
-            foreach(Zone zone in spaceZones)
-            {
-                zone.planet = this;
-            }
+                foreach (Zone zone in groundZones)
+                {
+                    zone.planet = this;
+                }
+                foreach (Zone zone in spaceZones)
+                {
+                    zone.planet = this;
+                }
 
-            if(showPlanetName)
-            {
-                IngameUI ui = FindObjectOfType<IngameUI>();
-                GameObject text = Instantiate(textPrefab);
-                text.transform.parent = ui.transform;
-                text.transform.localRotation = Quaternion.identity;
-                text.GetComponent<StickUIToPlanet>().target = transform;
-                text.GetComponent<UnityEngine.UI.Text>().text = planetName.ToUpper();
+                if (showPlanetName)
+                {
+                    IngameUI ui = FindObjectOfType<IngameUI>();
+                    GameObject text = Instantiate(textPrefab);
+                    text.transform.SetParent(ui.transform, false);
+                    text.transform.localRotation = Quaternion.identity;
+                    text.GetComponent<StickUIToPlanet>().target = transform;
+                    text.GetComponent<UnityEngine.UI.Text>().text = planetName.ToUpper();
+                }
             }
             
+            
         }
 
+
+
 #if UNITY_EDITOR
+
+
         [ContextMenu("Setup Zones")]
         public void SetupZones()
         {

Assets/GWConquest/Scripts/PlanetScaling.cs

@@ -11,7 +11,16 @@ public class PlanetScaling : MonoBehaviour
     void Update()
     {
         Camera cam = Camera.main;
-        float distance = Vector3.Distance(transform.position, cam.transform.position);
+        float distance;
+        
+        if(cam.orthographic)
+        {
+            distance = cam.orthographicSize;
+        }
+        else
+        {
+           distance = Vector3.Distance(transform.position, cam.transform.position);
+        }
 
         float scale;
 

Assets/GWConquest/Scripts/PlanetScaling3.cs

@@ -0,0 +1,35 @@
+using UnityEngine;
+
+namespace GWConquest
+{
+    public class PlanetScaling3 : MonoBehaviour
+    {
+        public static float GetMajorSemiAxis(float alpha, float beta, float s, float z)
+        {
+            float CosAlpha = Mathf.Cos(alpha);
+            float SinAlpha = Mathf.Sin(alpha);
+            float CosBeta = Mathf.Cos(beta);
+            float SinBeta = Mathf.Sin(beta);
+
+            float CosAlphaSq = CosAlpha * CosAlpha;
+            float CosBetaSq = CosBeta * CosBeta;
+            float SinBetaSq = SinBeta * SinBeta;
+
+            float Cos2Alpha = 2f * CosAlphaSq - 1f;
+            float Cos2Beta = 2f * CosBetaSq - 1f;
+
+            float CotAlpha = CosAlpha / SinAlpha;
+
+            float sSq = s * s;
+            float zSq = z * z;
+
+            float f1 = (-3f + Cos2Alpha + 2f * CosAlphaSq * Cos2Beta);
+            float f2 = (2f * Cos2Alpha * (1f + (1f + sSq) * Cos2Beta) * CotAlpha + sSq * (-3f + Cos2Alpha) / SinAlpha);
+            float f3 = (64f * sSq * zSq * (1f + CotAlpha * CotAlpha * SinBetaSq));
+
+            float aInvSq = -f1 * f2 * f2 / f3;
+
+            return 1f / Mathf.Sqrt(aInvSq);
+        }
+    }
+}

Assets/GWConquest/Scripts/PlanetScaling3.cs.meta

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

Assets/GWConquest/Textures/Icons/Tank Medium.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 2
     aniso: 2
     mipBias: -100
     wrapU: 1

Assets/GWConquest/Textures/UI/Logo Neu.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 28b105de74cd71c449fa536714e074fe
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 10
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: 2
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: -1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 8192
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: 1
+    filterMode: 2
     aniso: 2
     mipBias: -100
     wrapU: 1

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

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 2
     aniso: 2
     mipBias: -100
     wrapU: 1