Merge

Assets/Exo planets/Materials/Atmospheres/Atmosphere orange.mat

@@ -62,7 +62,7 @@ Material:
     - _Atmospherecircle: 0.272
     - _Atmosphereintensity: 1.5
     - _Atmospherepower: 6.94
-    - _Atmospheresize: 1.19
+    - _Atmospheresize: 1.87
     - _BumpScale: 1
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1

Assets/Exo planets/Materials/Atmospheres/Atmosphere white 1.mat

@@ -69,7 +69,7 @@ Material:
     - _Atmospherecircle: 0.269
     - _Atmosphereintensity: 1.7
     - _Atmospherepower: 20
-    - _Atmospheresize: 2.66
+    - _Atmospheresize: 1.51
     - _BumpScale: 1
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
@@ -90,7 +90,7 @@ Material:
     - _node_3418: 0
     m_Colors:
     - _AtmosphereColor: {r: 0.40900004, g: 0.3526758, b: 0.22372302, a: 1}
-    - _Atmospherecolor: {r: 1, g: 1, b: 1, a: 0}
+    - _Atmospherecolor: {r: 0.9538613, g: 0.8160377, b: 1, a: 1}
     - _Color: {r: 0.353, g: 0.54486895, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Exo planets/Materials/Atmospheres/Atmosphere white 2.mat

@@ -0,0 +1,96 @@
+%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: Atmosphere white 2
+  m_Shader: {fileID: 4800000, guid: 891e0cda09491ba4297849df9f68db9f, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  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}
+    - _node_5714:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _node_9973:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _: 13.39
+    - _AtmosphereSharpness: 0.204
+    - _Atmospherecircle: 0.269
+    - _Atmosphereintensity: 1.7
+    - _Atmospherepower: 20
+    - _Atmospheresize: 2.43
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _FullBright: 0
+    - _Glossiness: 0.5
+    - _MaskClipValue: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    - __dirty: 0
+    - _node_1089: 0
+    - _node_1218: 0
+    - _node_3418: 0
+    m_Colors:
+    - _AtmosphereColor: {r: 0.40900004, g: 0.3526758, b: 0.22372302, a: 1}
+    - _Atmospherecolor: {r: 0.89320046, g: 0.9733234, b: 0.9811321, a: 1}
+    - _Color: {r: 0.353, g: 0.54486895, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Exo planets/Materials/Atmospheres/Atmosphere white 2.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 609b347fed897b04981a2a66a5eccad1
+timeCreated: 1460805013
+licenseType: Store
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Exo planets/Materials/Atmospheres/Atmosphere white 3.mat

@@ -0,0 +1,96 @@
+%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: Atmosphere white 3
+  m_Shader: {fileID: 4800000, guid: 891e0cda09491ba4297849df9f68db9f, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  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}
+    - _node_5714:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _node_9973:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _: 13.39
+    - _AtmosphereSharpness: 0.231
+    - _Atmospherecircle: 0.269
+    - _Atmosphereintensity: 1.7
+    - _Atmospherepower: 20
+    - _Atmospheresize: 1.4
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _FullBright: 0
+    - _Glossiness: 0.5
+    - _MaskClipValue: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    - __dirty: 0
+    - _node_1089: 0
+    - _node_1218: 0
+    - _node_3418: 0
+    m_Colors:
+    - _AtmosphereColor: {r: 0.40900004, g: 0.3526758, b: 0.22372302, a: 1}
+    - _Atmospherecolor: {r: 0.89320046, g: 0.9733234, b: 0.9811321, a: 1}
+    - _Color: {r: 0.353, g: 0.54486895, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Exo planets/Materials/Atmospheres/Atmosphere white 3.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cf2f78f3446136247892d1fe81e56e98
+timeCreated: 1460805013
+licenseType: Store
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Exo planets/Materials/Atmospheres/Atmosphere yellow.mat

@@ -58,10 +58,10 @@ Material:
     m_Floats:
     - _: 13.39
     - _AtmosphereSharpness: 0.26
-    - _Atmospherecircle: 0.343
+    - _Atmospherecircle: 0.088
     - _Atmosphereintensity: 1.5
     - _Atmospherepower: 6.94
-    - _Atmospheresize: 2.83
+    - _Atmospheresize: 2.14
     - _BumpScale: 1
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1

Assets/Exo planets/Materials/Ogma/Ogma Ring.mat

@@ -68,7 +68,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _Ringsalpha:
-        m_Texture: {fileID: 2800000, guid: a534b3bf85e48d845a4ba57cd1e41a64, type: 3}
+        m_Texture: {fileID: 2800000, guid: 6f14fa116aeaaad4ea0e2e7d2c7fc4f1, type: 3}
         m_Scale: {x: -0.2, y: 1}
         m_Offset: {x: 0, y: 0}
     - _node_7600:
@@ -93,7 +93,7 @@ Material:
     - _Mode: 2
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Ringintensity: 2.63
+    - _Ringintensity: 0.73
     - _SrcBlend: 5
     - _TransAmbient: 0.2
     - _TransDirect: 1