Added marixil's work, v1.1

2018-04-13 10:40:35 +10:00
parent 28c6f8cac2
commit 35617b5bf0
33 changed files with 1630 additions and 13 deletions
@@ -333,8 +333,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: -1946130261
-  m_SortingLayer: 2
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
  m_SortingOrder: 6
  m_Sprite: {fileID: 21300000, guid: 6252e08fd52e8f94cbdde75947556a19, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -440,11 +440,11 @@ Prefab:
    m_Modifications:
    - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
      propertyPath: m_LocalPosition.x
-      value: 10.61
+      value: 2.12
      objectReference: {fileID: 0}
    - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
      propertyPath: m_LocalPosition.y
-      value: -7.01
+      value: -7.09
      objectReference: {fileID: 0}
    - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
      propertyPath: m_LocalPosition.z
@@ -488,7 +488,7 @@ Prefab:
        type: 2}
      propertyPath: monsterPrefab
      value: 
-      objectReference: {fileID: 1876593924556066, guid: a3a482c56d8487d4182da0e0cb895726,
+      objectReference: {fileID: 1751285235253616, guid: 5a55e7e45f315f141860f4f2b913d47f,
        type: 2}
    - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
        type: 2}
@@ -500,6 +500,24 @@ Prefab:
      propertyPath: lifespan
      value: 4
      objectReference: {fileID: 0}
+    - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
+        type: 2}
+      propertyPath: monsterPrefab2
+      value: 
+      objectReference: {fileID: 1604319251641546, guid: 9305254795f18f84db445addb5e66900,
+        type: 2}
+    - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
+        type: 2}
+      propertyPath: monsterPrefab4
+      value: 
+      objectReference: {fileID: 1604319251641546, guid: 9305254795f18f84db445addb5e66900,
+        type: 2}
+    - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
+        type: 2}
+      propertyPath: monsterPrefab3
+      value: 
+      objectReference: {fileID: 1751285235253616, guid: 5a55e7e45f315f141860f4f2b913d47f,
+        type: 2}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
  m_IsPrefabParent: 0
@@ -927,6 +945,29 @@ Prefab:
      propertyPath: delay
      value: 5
      objectReference: {fileID: 0}
+    - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
+        type: 2}
+      propertyPath: lifespan
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
+        type: 2}
+      propertyPath: monsterPrefab2
+      value: 
+      objectReference: {fileID: 1268474550065916, guid: 10751a940dc1fe448abcfa3f5cfb9f6f,
+        type: 2}
+    - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
+        type: 2}
+      propertyPath: monsterPrefab3
+      value: 
+      objectReference: {fileID: 1565483088663456, guid: d63fd10b2b3fd214da1efb31eab0a8bd,
+        type: 2}
+    - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
+        type: 2}
+      propertyPath: monsterPrefab4
+      value: 
+      objectReference: {fileID: 1268474550065916, guid: 10751a940dc1fe448abcfa3f5cfb9f6f,
+        type: 2}
    m_RemovedComponents: []
  m_ParentPrefab: {fileID: 100100000, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
  m_IsPrefabParent: 0
@@ -990,8 +1031,85 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 9
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1179929212
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0.57
+      objectReference: {fileID: 0}
+    - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
+      propertyPath: m_RootOrder
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 1049810975271280, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
+      propertyPath: m_Name
+      value: MonsterSpawner (4)
+      objectReference: {fileID: 0}
+    - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
+        type: 2}
+      propertyPath: motion.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
+        type: 2}
+      propertyPath: delay
+      value: 40
+      objectReference: {fileID: 0}
+    - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
+        type: 2}
+      propertyPath: monsterPrefab
+      value: 
+      objectReference: {fileID: 1946663001272364, guid: 3c83b7bd123ed0d4ebb574ba9d95d7de,
+        type: 2}
+    - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
+        type: 2}
+      propertyPath: motion.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
+        type: 2}
+      propertyPath: waterSoundOnly
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374,
+        type: 2}
+      propertyPath: lifespan
+      value: 30
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: b16589ec086fe774ba4170ead0d42374, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1 &1188024903
 GameObject:
  m_ObjectHideFlags: 0
@@ -1629,7 +1747,7 @@ RectTransform:
  - {fileID: 316885955}
  - {fileID: 181175713}
  m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@@ -1721,6 +1839,91 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 72cfcd727b69cf543893b4d457e109e1, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!1 &1874730881
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 1874730884}
+  - component: {fileID: 1874730883}
+  - component: {fileID: 1874730882}
+  m_Layer: 0
+  m_Name: Arrows
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1874730882
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1874730881}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8afcae652a543cc43b32dac1312803f4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!212 &1874730883
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1874730881}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: -1946130261
+  m_SortingLayer: 2
+  m_SortingOrder: 9
+  m_Sprite: {fileID: 21300000, guid: 228391c267f6f2c47bcd31d842f05a0b, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 11.76, y: 6.54}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+--- !u!4 &1874730884
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1874730881}
+  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: 0}
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1955953756
 GameObject:
  m_ObjectHideFlags: 0