Updated SeedQuest to 0.2.5.2

reputage · May 24, 2019 · 1d609a7 · 1d609a7
1 parent 9dbe9b8
commit 1d609a7
Show file tree

Hide file tree

Showing 49 changed files with 7,645 additions and 1,882 deletions.
diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Farm/Material/Farm_Swing_Mat.mat b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Farm/Material/Farm_Swing_Mat.mat
@@ -40,7 +40,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 4e6f4773b3d8621438e6eb307b579f7e, type: 3}
+        m_Texture: {fileID: 2800000, guid: fda37f81a9d0644a78947acebb54a5e6, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

diff --git a/...dQuest/Assets/SeedQuestPrototype/Art/Farm/Prefabs/Apple_Tree_Action_DigForTreasure.prefab b/...dQuest/Assets/SeedQuestPrototype/Art/Farm/Prefabs/Apple_Tree_Action_DigForTreasure.prefab
@@ -145,10 +145,10 @@ PrefabInstance:
     - target: {fileID: 2300000, guid: 68ab6bae9ff31ba48928576f04d34576, type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
-      objectReference: {fileID: 2100000, guid: 528df0267f5468946bb7d6fe22b237fc, type: 2}
+      objectReference: {fileID: 2100000, guid: 0beab8ec34c5a7c4b9d8b77fb1a2fedb, type: 2}
     - target: {fileID: 2300002, guid: 68ab6bae9ff31ba48928576f04d34576, type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
-      objectReference: {fileID: 2100000, guid: 528df0267f5468946bb7d6fe22b237fc, type: 2}
+      objectReference: {fileID: 2100000, guid: 0beab8ec34c5a7c4b9d8b77fb1a2fedb, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 68ab6bae9ff31ba48928576f04d34576, type: 3}
diff --git a/...y/SeedQuest/Assets/SeedQuestPrototype/Art/Farm/Prefabs/Apple_Tree_Action_HangSwing.prefab b/...y/SeedQuest/Assets/SeedQuestPrototype/Art/Farm/Prefabs/Apple_Tree_Action_HangSwing.prefab
@@ -1,94 +1,124 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8449319876460463559
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2402381507374226718}
+  m_Layer: 0
+  m_Name: farm_swing (Missing Prefab)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &2402381507374226718
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8449319876460463559}
+  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: 2228873763192351996}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &8291713779246960796
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     m_TransformParent: {fileID: 2228873763192351996}
     m_Modifications:
-    - target: {fileID: -927199367670048503, guid: 5136c3317cd5f6f4a856304f603b6228,
+    - target: {fileID: -927199367670048503, guid: a8f6b600a04804c488c75dcfc394cde0,
         type: 3}
       propertyPath: m_Name
       value: farm_swing
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 5136c3317cd5f6f4a856304f603b6228,
+    - target: {fileID: -4216859302048453862, guid: a8f6b600a04804c488c75dcfc394cde0,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0.75
+      value: 3.03
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 5136c3317cd5f6f4a856304f603b6228,
+    - target: {fileID: -4216859302048453862, guid: a8f6b600a04804c488c75dcfc394cde0,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: -4.57
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 5136c3317cd5f6f4a856304f603b6228,
+    - target: {fileID: -4216859302048453862, guid: a8f6b600a04804c488c75dcfc394cde0,
         type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 5136c3317cd5f6f4a856304f603b6228,
+    - target: {fileID: -4216859302048453862, guid: a8f6b600a04804c488c75dcfc394cde0,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0.7071068
+      value: -0.6769041
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 5136c3317cd5f6f4a856304f603b6228,
+    - target: {fileID: -4216859302048453862, guid: a8f6b600a04804c488c75dcfc394cde0,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 5136c3317cd5f6f4a856304f603b6228,
+    - target: {fileID: -4216859302048453862, guid: a8f6b600a04804c488c75dcfc394cde0,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 5136c3317cd5f6f4a856304f603b6228,
+    - target: {fileID: -4216859302048453862, guid: a8f6b600a04804c488c75dcfc394cde0,
         type: 3}
       propertyPath: m_LocalRotation.w
-      value: 0.7071068
+      value: 0.7360712
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 5136c3317cd5f6f4a856304f603b6228,
+    - target: {fileID: -4216859302048453862, guid: a8f6b600a04804c488c75dcfc394cde0,
         type: 3}
       propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 5136c3317cd5f6f4a856304f603b6228,
+    - target: {fileID: -4216859302048453862, guid: a8f6b600a04804c488c75dcfc394cde0,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
+      value: -85.204
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 5136c3317cd5f6f4a856304f603b6228,
+    - target: {fileID: -4216859302048453862, guid: a8f6b600a04804c488c75dcfc394cde0,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 5136c3317cd5f6f4a856304f603b6228,
+    - target: {fileID: -4216859302048453862, guid: a8f6b600a04804c488c75dcfc394cde0,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 5136c3317cd5f6f4a856304f603b6228,
+    - target: {fileID: -4216859302048453862, guid: a8f6b600a04804c488c75dcfc394cde0,
         type: 3}
       propertyPath: m_LocalScale.x
-      value: 3
+      value: 2.0639
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 5136c3317cd5f6f4a856304f603b6228,
+    - target: {fileID: -4216859302048453862, guid: a8f6b600a04804c488c75dcfc394cde0,
         type: 3}
       propertyPath: m_LocalScale.y
-      value: 3
+      value: 2.0639
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 5136c3317cd5f6f4a856304f603b6228,
+    - target: {fileID: -4216859302048453862, guid: a8f6b600a04804c488c75dcfc394cde0,
         type: 3}
       propertyPath: m_LocalScale.z
-      value: 3
+      value: 2.0639
       objectReference: {fileID: 0}
-    - target: {fileID: -1504981713932161579, guid: 5136c3317cd5f6f4a856304f603b6228,
+    - target: {fileID: -1504981713932161579, guid: a8f6b600a04804c488c75dcfc394cde0,
         type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: 626babd51fdb67c42a67f13b6bb4951a, type: 2}
     m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 5136c3317cd5f6f4a856304f603b6228, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: a8f6b600a04804c488c75dcfc394cde0, type: 3}
 --- !u!1001 &9137815026865951354
 PrefabInstance:
   m_ObjectHideFlags: 0

diff --git a/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Farm/Prefabs/Apple_Tree_Action_Picnic.prefab b/Unity/SeedQuest/Assets/SeedQuestPrototype/Art/Farm/Prefabs/Apple_Tree_Action_Picnic.prefab
@@ -166,7 +166,8 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 3
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 7414644237719133936, guid: 87baaa561d69c4145b59fce8831272f1, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: 87baaa561d69c4145b59fce8831272f1, type: 3}
 --- !u!1001 &7046378274626157124
 PrefabInstance: