Blocks are all acting correctly, bomb is acting correctly

2018-04-21 14:41:24 +10:00
parent 0001a875a6
commit ed67e81098
25 changed files with 957 additions and 193 deletions
@@ -113,6 +113,95 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
+--- !u!1001 &377649863
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4102967640087092, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4102967640087092, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4102967640087092, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4102967640087092, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4102967640087092, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4102967640087092, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4102967640087092, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4102967640087092, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 7f7220d1cb75b7f4f8eac561a76ac977, type: 2}
+  m_IsPrefabParent: 0
+--- !u!1001 &1069598685
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4059329389201350, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4059329389201350, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0.167
+      objectReference: {fileID: 0}
+    - target: {fileID: 4059329389201350, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4059329389201350, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4059329389201350, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4059329389201350, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4059329389201350, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4059329389201350, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 114937917394596370, guid: 37dd8e63a4accd043b621e3886a2e847,
+        type: 2}
+      propertyPath: timer
+      value: 10
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 37dd8e63a4accd043b621e3886a2e847, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1089679577
 GameObject:
  m_ObjectHideFlags: 0
@@ -225,6 +314,12 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c9a7a743ce869904ca255dc7e2ecd693, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  firePelletPrefab: {fileID: 1924244257779608, guid: 58d70ad16ebe6124491841cb23c8c298,
+    type: 2}
+  icePelletPrefab: {fileID: 1640966317816230, guid: 0608694d641daa2438d681a6ba301fa3,
+    type: 2}
+  windPelletPrefab: {fileID: 1389927462137108, guid: 407acfcef7e27af47a3df873b629b4a4,
+    type: 2}
 --- !u!61 &1602044330
 BoxCollider2D:
  m_ObjectHideFlags: 0
@@ -269,7 +364,7 @@ Rigidbody2D:
  m_Interpolate: 0
  m_SleepingMode: 1
  m_CollisionDetection: 0
-  m_Constraints: 0
+  m_Constraints: 4
 --- !u!95 &1602044332
 Animator:
  serializedVersion: 3
@@ -338,9 +433,93 @@ Transform:
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1602044328}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0.355, y: 0.175, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1630315066
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0.325
+      objectReference: {fileID: 0}
+    - target: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: -0.079
+      objectReference: {fileID: 0}
+    - target: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4890223527033060, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 55b556ac6e46dbb4abdebeb341e45cce, type: 2}
+  m_IsPrefabParent: 0
+--- !u!1001 &2004955173
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0.662
+      objectReference: {fileID: 0}
+    - target: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0.112
+      objectReference: {fileID: 0}
+    - target: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0.09375
+      objectReference: {fileID: 0}
+    - target: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4564474961553612, guid: c4d410a301c013a468dc133a094e5478, type: 2}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: c4d410a301c013a468dc133a094e5478, type: 2}
+  m_IsPrefabParent: 0