new ship color

maxilevi · Nov 10, 2017 · 3f9aabf · 3f9aabf
1 parent 0555d75
commit 3f9aabf
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 23 deletions.
diff --git a/Assets/Controls.cs b/Assets/Controls.cs
@@ -13,6 +13,22 @@ void Start () {
 
 	// Update is called once per frame
 	void Update () {
-		transform.position += Time.deltaTime * Vector3.forward * Speed;
+		if(Input.GetKey(KeyCode.W))
+			transform.Rotate(transform.right, Time.deltaTime * 64f);
+
+		if(Input.GetKey(KeyCode.S))
+			transform.Rotate(-transform.right, Time.deltaTime * 64f);
+
+		if(Input.GetKey(KeyCode.D))
+			transform.Rotate(transform.forward, Time.deltaTime * 64f);
+
+		if(Input.GetKey(KeyCode.A))
+			transform.Rotate(-transform.forward, Time.deltaTime * 64f);
+
+		transform.position += Time.deltaTime * transform.forward * Speed;
+	}
+
+	void OnCollisionEnter(){
+		Debug.Log ("Explosion");
 	}
 }
diff --git a/Assets/Game.unity b/Assets/Game.unity
@@ -276,7 +276,7 @@ Transform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 729518478}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: -10}
+  m_LocalPosition: {x: 0, y: 2.09, z: -18.5}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2004386719}
@@ -669,7 +669,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: aebc15e318f4c7748bb9d3b03976707f, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Speed: 8
+  Speed: 32
 --- !u!54 &2004386721
 Rigidbody:
   m_ObjectHideFlags: 0

diff --git a/Assets/Generation/ChunkLoader.cs b/Assets/Generation/ChunkLoader.cs
@@ -96,7 +96,7 @@ private IEnumerator LoadChunks()
                     {
 						for (int _z = -GraphicsOptions.ChunkLoaderRadius / 2; _z < GraphicsOptions.ChunkLoaderRadius / 2; _z++)
                         {
-							for (int _y = -6; _y < 6; _y++)
+							for (int _y = -2; _y < 2; _y++)
                             {
 								int x = _x, y = _y ,z  = _z;
 

diff --git a/Assets/Ship0.mat b/Assets/Ship0.mat
@@ -8,8 +8,8 @@ Material:
   m_PrefabInternal: {fileID: 0}
   m_Name: Ship0
   m_Shader: {fileID: 4800000, guid: f41b97872ce3bba439516a22765e895b, type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _GLOW_ON _MODE_DEFAULT _WLIGHT_SURFACE _WSTYLE_DEFAULT
-    _WUV_UV0
+  m_ShaderKeywords: _ALPHATEST_ON _EMISSION _GLOW_ON _MODE_DEFAULT _WLIGHT_SURFACE
+    _WSTYLE_DEFAULT _WUV_UV0
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -76,9 +76,9 @@ Material:
     - _FPow: 5
     - _Fade: 0
     - _Fold: 7
-    - _GDist: 0.35
-    - _GEmission: 0
-    - _GPower: 0.66
+    - _GDist: 0.25
+    - _GEmission: 1.48
+    - _GPower: 0.86
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
@@ -108,7 +108,7 @@ Material:
     - _WUV: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 1, g: 0, b: 0, a: 1}
+    - _Color: {r: 0.2647059, g: 0.2647059, b: 0.2647059, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _GColor: {r: 0.36551714, g: 0, b: 1, a: 1}
+    - _GColor: {r: 0, g: 0.7529412, b: 1, a: 1}
     - _WColor: {r: 0, g: 0.751724, b: 1, a: 1}
diff --git a/Assets/Ship1.mat b/Assets/Ship1.mat
@@ -8,8 +8,8 @@ Material:
   m_PrefabInternal: {fileID: 0}
   m_Name: Ship1
   m_Shader: {fileID: 4800000, guid: 2f1a6e4a47a2cf7439ccf35a179a2d97, type: 3}
-  m_ShaderKeywords: _AA_ON _ALPHATEST_ON _GLOW_ON _MODE_DEFAULT _QUAD_ON _WLIGHT_SURFACE
-    _WSTYLE_DEFAULT _WUV_UV0
+  m_ShaderKeywords: _AA_ON _ALPHATEST_ON _EMISSION _GLOW_ON _MODE_DEFAULT _QUAD_ON
+    _WLIGHT_SURFACE _WSTYLE_DEFAULT _WUV_UV0
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -65,7 +65,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
-    - _AASmooth: 1.5
+    - _AASmooth: 4
     - _BumpScale: 1
     - _Cull: 2
     - _Cutoff: 0.518
@@ -75,10 +75,10 @@ Material:
     - _FMode: 1
     - _FPow: 5
     - _Fade: 0
-    - _Fold: 7
-    - _GDist: 0.35
-    - _GEmission: 0
-    - _GPower: 0.5
+    - _Fold: 31
+    - _GDist: 0.21
+    - _GEmission: 0.16
+    - _GPower: 0.68
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
@@ -94,19 +94,19 @@ Material:
     - _SrcBlend: 1
     - _TwoSided: 0
     - _UVSec: 0
-    - _WEmission: 0
+    - _WEmission: 3
     - _WInvert: 0
     - _WLight: 0
     - _WMode: 0
     - _WOpacity: 1
     - _WParam: 0
     - _WStyle: 0
-    - _WThickness: 0.18150002
+    - _WThickness: 0.13530001
     - _WTransparency: 0.43
     - _WUV: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.32352942, g: 0.32352942, b: 0.32352942, a: 1}
+    - _Color: {r: 0.28676468, g: 0.28676468, b: 0.28676468, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _GColor: {r: 0, g: 0, b: 0, a: 1}
-    - _WColor: {r: 0, g: 0, b: 0, a: 1}
+    - _GColor: {r: 1, g: 0.30980393, b: 0, a: 1}
+    - _WColor: {r: 1, g: 0.31034487, b: 0, a: 1}