Merge branch 'master' of https://github.com/audio-game-crew/legend-of…

…-iris

Assets/Prefabs/Bird.prefab

@@ -23,6 +23,7 @@ GameObject:
   serializedVersion: 4
   m_Component:
   - 4: {fileID: 463398}
+  - 114: {fileID: 11447064}
   m_Layer: 0
   m_Name: Bird
   m_TagString: Untagged
@@ -46,6 +47,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &163582
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 463582}
+  - 33: {fileID: 3363582}
+  - 23: {fileID: 2363582}
+  m_Layer: 0
+  m_Name: Sphere
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!4 &463396
 Transform:
   m_ObjectHideFlags: 1
@@ -65,11 +83,12 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 163398}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 200.600006, y: 0, z: -467.579987}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 463400}
   - {fileID: 463396}
+  - {fileID: 463582}
   m_Father: {fileID: 0}
   m_RootOrder: 0
 --- !u!4 &463400
@@ -84,6 +103,62 @@ Transform:
   m_Children: []
   m_Father: {fileID: 463398}
   m_RootOrder: 0
+--- !u!4 &463582
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 163582}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 2, z: 0}
+  m_LocalScale: {x: 1.37585783, y: 1.37585819, z: 1.37585819}
+  m_Children: []
+  m_Father: {fileID: 463398}
+  m_RootOrder: 2
+--- !u!23 &2363582
+Renderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 163582}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_LightmapIndex: 255
+  m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
+  m_Materials:
+  - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
+  m_SubsetIndices: 
+  m_StaticBatchRoot: {fileID: 0}
+  m_UseLightProbes: 0
+  m_LightProbeAnchor: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+--- !u!33 &3363582
+MeshFilter:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 163582}
+  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &11447064
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 163398}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 19261e24149204a4ea65922ad82f8795, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  follow: 0
+  followee: {fileID: 0}
+  minDistance: 3
+  lockY: 1
+  convergeSpeed: 2
+  offset: {x: 0, y: -2, z: 0}
 --- !u!114 &11463400
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/Prefabs/Birds/Crow Bird.prefab

@@ -117,7 +117,7 @@ AudioSource:
   serializedVersion: 3
   m_audioClip: {fileID: 0}
   m_PlayOnAwake: 1
-  m_Volume: .899999976
+  m_Volume: .666000009
   m_Pitch: 1
   Loop: 0
   Mute: 0

Assets/Prefabs/Birds/Peace Bird.prefab

@@ -117,7 +117,7 @@ AudioSource:
   serializedVersion: 3
   m_audioClip: {fileID: 0}
   m_PlayOnAwake: 1
-  m_Volume: 1
+  m_Volume: .653999984
   m_Pitch: 1
   Loop: 0
   Mute: 0

Assets/Prefabs/Birds/Science Bird.prefab

@@ -117,7 +117,7 @@ AudioSource:
   serializedVersion: 3
   m_audioClip: {fileID: 0}
   m_PlayOnAwake: 1
-  m_Volume: 1
+  m_Volume: .833000004
   m_Pitch: 1
   Loop: 0
   Mute: 0

Assets/Prefabs/Birds/Tropical Bird.prefab

@@ -117,7 +117,7 @@ AudioSource:
   serializedVersion: 3
   m_audioClip: {fileID: 0}
   m_PlayOnAwake: 1
-  m_Volume: 1
+  m_Volume: .660000026
   m_Pitch: 1
   Loop: 0
   Mute: 0

Assets/Prefabs/Giant.prefab

@@ -9,8 +9,8 @@ GameObject:
   m_Component:
   - 4: {fileID: 496516}
   - 33: {fileID: 3396518}
-  - 136: {fileID: 13696518}
   - 23: {fileID: 2396518}
+  - 114: {fileID: 11427784}
   m_Layer: 0
   m_Name: Giant
   m_TagString: Untagged
@@ -41,8 +41,8 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 196516}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 178.093735, y: -.663156986, z: -169.67395}
-  m_LocalScale: {x: 1, y: 2.5, z: 1}
+  m_LocalPosition: {x: 178.100006, y: 4.5999999, z: -169.699997}
+  m_LocalScale: {x: 2.30223417, y: 2.96999884, z: 2.30223489}
   m_Children:
   - {fileID: 496518}
   m_Father: {fileID: 0}
@@ -86,30 +86,34 @@ MeshFilter:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 196516}
   m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
---- !u!114 &11496518
+--- !u!114 &11427784
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 196518}
+  m_GameObject: {fileID: 196516}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a569ea3800c66174394bdcc277378704, type: 3}
+  m_Script: {fileID: 11500000, guid: 19261e24149204a4ea65922ad82f8795, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!136 &13696518
-CapsuleCollider:
+  follow: 0
+  followee: {fileID: 0}
+  minDistance: 3
+  lockY: 1
+  convergeSpeed: 2
+  offset: {x: 0, y: -2, z: 0}
+--- !u!114 &11496518
+MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 196516}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_GameObject: {fileID: 196518}
   m_Enabled: 1
-  m_Radius: .5
-  m_Height: 2
-  m_Direction: 1
-  m_Center: {x: 0, y: 0, z: 0}
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a569ea3800c66174394bdcc277378704, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &100100000
 Prefab:
   m_ObjectHideFlags: 1