Merge branch 'develop' of github.com:Razsiel/1718_Game_Engineering in…

…to develop
Razsiel · Apr 19, 2018 · 7b51329 · 7b51329
2 parents a261b45 + b40161c
commit 7b51329
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/Assets/Data/Grids/Grid_demo1.asset b/Assets/Data/Grids/Grid_demo1.asset
@@ -32,10 +32,10 @@ MonoBehaviour:
       - ChannelMaterials:
         - {fileID: 2100000, guid: 59f62f02069d6df47b65c65bf835b176, type: 2}
         - {fileID: 2100000, guid: 172a18ba7d76ad146a2081ffd5161c5b, type: 2}
-        DecorationData: {fileID: 11400000, guid: 9a8327d31861d6748b2ea5935d05d848,
+        DecorationData: {fileID: 11400000, guid: 99126c26551877946babed7444451c8e,
           type: 2}
-        RelativePosition: {x: 0, y: 24, z: 0}
-        Scale: 10
+        RelativePosition: {x: 0, y: 32, z: 8}
+        Scale: 1
         Rotation: 0
         Orientation: 5
         Type: 1
@@ -146,10 +146,10 @@ MonoBehaviour:
       - ChannelMaterials:
         - {fileID: 2100000, guid: 59f62f02069d6df47b65c65bf835b176, type: 2}
         - {fileID: 2100000, guid: 172a18ba7d76ad146a2081ffd5161c5b, type: 2}
-        DecorationData: {fileID: 11400000, guid: 9a8327d31861d6748b2ea5935d05d848,
+        DecorationData: {fileID: 11400000, guid: 99126c26551877946babed7444451c8e,
           type: 2}
-        RelativePosition: {x: 0, y: 24, z: 0}
-        Scale: 10
+        RelativePosition: {x: 0, y: 32, z: -8}
+        Scale: 1
         Rotation: 0
         Orientation: 1
         Type: 1

diff --git a/Assets/Data/Tiles/Decorations/Lever.asset b/Assets/Data/Tiles/Decorations/Lever.asset
@@ -11,8 +11,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3afcb17830163fc45884b3f3ded6154b, type: 3}
   m_Name: Lever
   m_EditorClassIdentifier: 
-  Mesh: {fileID: 0}
-  Material: {fileID: 0}
-  MeshToAnimate: {fileID: 0}
-  MaterialOfMeshToAnimate: {fileID: 0}
+  Mesh: {fileID: 4300000, guid: e473f35f8f5c669469885fee4e242487, type: 3}
+  Material: {fileID: 2100000, guid: 2a9da3a078bb5b849a7aa78117841feb, type: 2}
+  MeshToAnimate: {fileID: 4300000, guid: 1a70ad61a87e5a340b53dbb6bc38a2b1, type: 3}
+  MaterialOfMeshToAnimate: {fileID: 2100000, guid: 2a9da3a078bb5b849a7aa78117841feb,
+    type: 2}
   AnimatePosition: {x: 0, y: 0, z: 0}
+  StartRotation: {x: -45, y: 0, z: 0}
+  EndRotation: {x: 45, y: 0, z: 0}
+  Walkable: 1
diff --git a/Assets/Models/Decorations/Nature/Materials/Large_TreeMat.mat b/Assets/Models/Decorations/Nature/Materials/Large_TreeMat.mat
@@ -82,5 +82,5 @@ Material:
     - _ZWrite: 1
     - _node_1169: 2
     m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 0}
+    - _Color: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}