Merge pull request #43 from paradoxrevolver/update-yarn

Update yarn
paradoxrevolver · May 2, 2020 · aff0f07 · aff0f07
2 parents ad4d546 + eb654e8
commit aff0f07
Show file tree

Hide file tree

Showing 32 changed files with 981 additions and 456 deletions.
diff --git a/Assets/Prefabs/Match.prefab b/Assets/Prefabs/Match.prefab
@@ -24,7 +24,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8523065194936625137}
   - component: {fileID: 8523065194936625138}
-  - component: {fileID: 8839065093546782790}
+  - component: {fileID: 5940000930525792920}
   m_Layer: 0
   m_Name: Match
   m_TagString: Untagged
@@ -59,7 +59,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cd85f814f92a48f7bf516ac06983ab78, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &8839065093546782790
+--- !u!114 &5940000930525792920
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -68,21 +68,20 @@ MonoBehaviour:
   m_GameObject: {fileID: 8523065194936625136}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a115767594c2aa643b4a85719c052d96, type: 3}
+  m_Script: {fileID: 11500000, guid: 29aab9a7c4fc6a04e854dffd2cf68812, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  pastPosition: {x: 0, y: 0, z: 0}
+  currentPosition: {x: 0, y: 0, z: 0}
+  wrapContactables: []
+  radius: 0.1
 --- !u!1001 &8523065195629964848
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     m_TransformParent: {fileID: 8523065194936625137}
     m_Modifications:
-    - target: {fileID: -927199367670048503, guid: abe6dda665f9e2f4bb9fa774c916e053,
-        type: 3}
-      propertyPath: m_Name
-      value: Mesh
-      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: abe6dda665f9e2f4bb9fa774c916e053,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -158,6 +157,11 @@ PrefabInstance:
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: 87c8d427e891ff14c8a9fc1b5571c399, type: 2}
+    - target: {fileID: -927199367670048503, guid: abe6dda665f9e2f4bb9fa774c916e053,
+        type: 3}
+      propertyPath: m_Name
+      value: Mesh
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: abe6dda665f9e2f4bb9fa774c916e053, type: 3}
 --- !u!1 &390106403564140345 stripped

diff --git a/Assets/Prefabs/Nail.prefab b/Assets/Prefabs/Nail.prefab
@@ -10,7 +10,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1293638319414553333}
   - component: {fileID: 1293638319414553339}
-  - component: {fileID: 2956844451186357919}
+  - component: {fileID: 2226853645861646875}
   m_Layer: 0
   m_Name: Nail
   m_TagString: Untagged
@@ -45,7 +45,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1e4e97f2fe5cdf848bd6fe3be8acf8dd, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &2956844451186357919
+--- !u!114 &2226853645861646875
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -54,9 +54,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 1293638319414553334}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a115767594c2aa643b4a85719c052d96, type: 3}
+  m_Script: {fileID: 11500000, guid: 29aab9a7c4fc6a04e854dffd2cf68812, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  pastPosition: {x: 0, y: 0, z: 0}
+  currentPosition: {x: 0, y: 0, z: 0}
+  wrapContactables: []
+  radius: 0.1
 --- !u!136 &7231737498855535285
 CapsuleCollider:
   m_ObjectHideFlags: 0
@@ -92,11 +96,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1293638319414553333}
     m_Modifications:
-    - target: {fileID: -927199367670048503, guid: e7221bb4299f2d9418bc4bf09d1a609f,
-        type: 3}
-      propertyPath: m_Name
-      value: Mesh
-      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: e7221bb4299f2d9418bc4bf09d1a609f,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -172,6 +171,11 @@ PrefabInstance:
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: 1fa75e2ebacf4c243999e3f7628e4373, type: 2}
+    - target: {fileID: -927199367670048503, guid: e7221bb4299f2d9418bc4bf09d1a609f,
+        type: 3}
+      propertyPath: m_Name
+      value: Mesh
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e7221bb4299f2d9418bc4bf09d1a609f, type: 3}
 --- !u!1 &7120754119071130942 stripped

diff --git a/Assets/Prefabs/Needle.prefab b/Assets/Prefabs/Needle.prefab
@@ -38,7 +38,8 @@ GameObject:
   m_Component:
   - component: {fileID: 8515438956722547815}
   - component: {fileID: 8515438956722547808}
-  - component: {fileID: 6464732955907209868}
+  - component: {fileID: 6561178820540645814}
+  - component: {fileID: 7689935896013740308}
   m_Layer: 0
   m_Name: Needle
   m_TagString: Untagged
@@ -73,7 +74,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 98e1c197ea674b5a9a129fd58e6579f2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &6464732955907209868
+--- !u!114 &6561178820540645814
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -82,21 +83,36 @@ MonoBehaviour:
   m_GameObject: {fileID: 8515438956722547814}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a115767594c2aa643b4a85719c052d96, type: 3}
+  m_Script: {fileID: 11500000, guid: 29aab9a7c4fc6a04e854dffd2cf68812, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  pastPosition: {x: 0, y: 0, z: 0}
+  currentPosition: {x: 0, y: 0, z: 0}
+  wrapContactables: []
+  radius: 0.1
+--- !u!114 &7689935896013740308
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8515438956722547814}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cb3afdf96468fd04b95c0148819ca2d6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  pastPosition: {x: 0, y: 0, z: 0}
+  currentPosition: {x: 0, y: 0, z: 0}
+  wrapContactables: []
+  pointOffset: {x: 0, y: 0, z: 0}
 --- !u!1001 &8515438957613842491
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     m_TransformParent: {fileID: 8515438956722547815}
     m_Modifications:
-    - target: {fileID: -927199367670048503, guid: 8ed1fafe755612547a4b526e9c6a946d,
-        type: 3}
-      propertyPath: m_Name
-      value: Mesh
-      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: 8ed1fafe755612547a4b526e9c6a946d,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -162,6 +178,11 @@ PrefabInstance:
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: 1fa75e2ebacf4c243999e3f7628e4373, type: 2}
+    - target: {fileID: -927199367670048503, guid: 8ed1fafe755612547a4b526e9c6a946d,
+        type: 3}
+      propertyPath: m_Name
+      value: Mesh
+      objectReference: {fileID: 0}
     - target: {fileID: 4063835366044962077, guid: 8ed1fafe755612547a4b526e9c6a946d,
         type: 3}
       propertyPath: m_Materials.Array.data[0]

diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
@@ -9,12 +9,13 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 8072518499017028993}
-  - component: {fileID: 8072518499017028992}
   - component: {fileID: 8072518499017028995}
   - component: {fileID: 8072518499017028994}
+  - component: {fileID: 8072518499017028992}
   - component: {fileID: 8072518499017028997}
   - component: {fileID: 8072518499017028996}
   - component: {fileID: 8072518499017028999}
+  - component: {fileID: 2313245474546743258}
   m_Layer: 0
   m_Name: Player
   m_TagString: Player
@@ -37,20 +38,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &8072518499017028992
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8072518499017028998}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0daccf5fb693e6b4b817a62deb9df3db, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  normalMesh: {fileID: 227068772183194632}
-  holdingMesh: {fileID: 227068771119847383}
 --- !u!54 &8072518499017028995
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -81,6 +68,20 @@ CapsuleCollider:
   m_Height: 2
   m_Direction: 1
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &8072518499017028992
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8072518499017028998}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0daccf5fb693e6b4b817a62deb9df3db, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  normalMesh: {fileID: 227068772183194632}
+  holdingMesh: {fileID: 227068771119847383}
 --- !u!114 &8072518499017028997
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -205,6 +206,22 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a79d0552d8ac375449d5c8b767c78682, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &2313245474546743258
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8072518499017028998}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ab040f71654faec4c811af8fee2ae1c4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  pastPosition: {x: 0, y: 0, z: 0}
+  currentPosition: {x: 0, y: 0, z: 0}
+  wrapContactables: []
+  pointOffset: {x: 0, y: 0, z: 0}
 --- !u!1 &8072518499020361757
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Prefabs/Pushpin.prefab b/Assets/Prefabs/Pushpin.prefab
@@ -24,7 +24,8 @@ GameObject:
   m_Component:
   - component: {fileID: 6461784659212241894}
   - component: {fileID: 6461784659212241895}
-  - component: {fileID: 2124173856722540634}
+  - component: {fileID: 4833415352386671245}
+  - component: {fileID: 1545922046492766045}
   m_Layer: 0
   m_Name: Pushpin
   m_TagString: Pushpin
@@ -59,7 +60,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 75ae2d8f4608499fbbfc9f480d1f0a73, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &2124173856722540634
+--- !u!114 &4833415352386671245
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -68,21 +69,41 @@ MonoBehaviour:
   m_GameObject: {fileID: 6461784659212241893}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a115767594c2aa643b4a85719c052d96, type: 3}
+  m_Script: {fileID: 11500000, guid: 29aab9a7c4fc6a04e854dffd2cf68812, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  pastPosition: {x: 0, y: 0, z: 0}
+  currentPosition: {x: 0, y: 0, z: 0}
+  wrapContactables: []
+  radius: 0.1
+--- !u!114 &1545922046492766045
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6461784659212241893}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cb3afdf96468fd04b95c0148819ca2d6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  pastPosition: {x: 0, y: 0, z: 0}
+  currentPosition: {x: 0, y: 0, z: 0}
+  wrapContactables: []
+  pointOffset: {x: 0, y: 0, z: 0}
 --- !u!1001 &6461784659076987962
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     m_TransformParent: {fileID: 6461784659212241894}
     m_Modifications:
-    - target: {fileID: -927199367670048503, guid: e1d1a8f7ba95e0f4f91d68f542216319,
+    - target: {fileID: -6054058774237248251, guid: e1d1a8f7ba95e0f4f91d68f542216319,
         type: 3}
-      propertyPath: m_Name
-      value: Mesh
-      objectReference: {fileID: 0}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: fc883cb8b3fd8fa4a9c4b19e725146c3, type: 2}
     - target: {fileID: -4216859302048453862, guid: e1d1a8f7ba95e0f4f91d68f542216319,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -153,16 +174,16 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 0.7
       objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: e1d1a8f7ba95e0f4f91d68f542216319,
+        type: 3}
+      propertyPath: m_Name
+      value: Mesh
+      objectReference: {fileID: 0}
     - target: {fileID: 4063835366044962077, guid: e1d1a8f7ba95e0f4f91d68f542216319,
         type: 3}
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: 1fa75e2ebacf4c243999e3f7628e4373, type: 2}
-    - target: {fileID: -6054058774237248251, guid: e1d1a8f7ba95e0f4f91d68f542216319,
-        type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: fc883cb8b3fd8fa4a9c4b19e725146c3, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e1d1a8f7ba95e0f4f91d68f542216319, type: 3}
 --- !u!1 &3066164092647859507 stripped

diff --git a/Assets/Scenes/Template.unity b/Assets/Scenes/Template.unity
@@ -1511,7 +1511,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 50, y: 0, z: 0}
 --- !u!114 &963194229
 MonoBehaviour:
@@ -2766,7 +2766,7 @@ PrefabInstance:
     - target: {fileID: 1293638319414553333, guid: 3f7ba35961265c14d95fd3df6e0e7e17,
         type: 3}
       propertyPath: m_RootOrder
-      value: 5
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 1293638319414553333, guid: 3f7ba35961265c14d95fd3df6e0e7e17,
         type: 3}
@@ -2857,6 +2857,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7411008065860400178, guid: eedf6123f261655408fea12ace3e43f3,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: eedf6123f261655408fea12ace3e43f3, type: 3}
 --- !u!1001 &6461784657988510636