Merge remote-tracking branch 'origin/master'

Rittergit · May 5, 2019 · 1fdc19b · 1fdc19b
2 parents 8c897a5 + 0be06dc
commit 1fdc19b
Show file tree

Hide file tree

Showing 6 changed files with 329 additions and 95 deletions.
diff --git a/Assets/Prefabs/Landlord.prefab b/Assets/Prefabs/Landlord.prefab
@@ -1032,7 +1032,7 @@ Transform:
   - {fileID: 4649900872309762446}
   - {fileID: 4649900872597949317}
   - {fileID: 1462104868071416393}
-  - {fileID: 7372029203473046310}
+  - {fileID: 3412085571379042873}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1334,80 +1334,80 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
---- !u!1001 &5544999480993253523
+--- !u!1001 &425405006796917132
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
     m_TransformParent: {fileID: 4649900874151234297}
     m_Modifications:
-    - target: {fileID: 3079756422981161912, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
+    - target: {fileID: 3079756422981161912, guid: ff2aaee048f31f6479f9f5c9a4c93815,
         type: 3}
       propertyPath: m_Name
-      value: VoiceController
+      value: VoiceController_LL
       objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
+    - target: {fileID: 3079756422981161909, guid: ff2aaee048f31f6479f9f5c9a4c93815,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: 2.4510875
       objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
+    - target: {fileID: 3079756422981161909, guid: ff2aaee048f31f6479f9f5c9a4c93815,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0
+      value: 0.85897326
       objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
+    - target: {fileID: 3079756422981161909, guid: ff2aaee048f31f6479f9f5c9a4c93815,
         type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0
+      value: -5.9334483
       objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
+    - target: {fileID: 3079756422981161909, guid: ff2aaee048f31f6479f9f5c9a4c93815,
         type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
+    - target: {fileID: 3079756422981161909, guid: ff2aaee048f31f6479f9f5c9a4c93815,
         type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
+    - target: {fileID: 3079756422981161909, guid: ff2aaee048f31f6479f9f5c9a4c93815,
         type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
+    - target: {fileID: 3079756422981161909, guid: ff2aaee048f31f6479f9f5c9a4c93815,
         type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
+    - target: {fileID: 3079756422981161909, guid: ff2aaee048f31f6479f9f5c9a4c93815,
         type: 3}
       propertyPath: m_RootOrder
       value: 3
       objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
+    - target: {fileID: 3079756422981161909, guid: ff2aaee048f31f6479f9f5c9a4c93815,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
+    - target: {fileID: 3079756422981161909, guid: ff2aaee048f31f6479f9f5c9a4c93815,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
+    - target: {fileID: 3079756422981161909, guid: ff2aaee048f31f6479f9f5c9a4c93815,
         type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d4cb36db2a3b3654d9d0d4901a08b0b0, type: 3}
---- !u!4 &7372029203473046310 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: ff2aaee048f31f6479f9f5c9a4c93815, type: 3}
+--- !u!4 &3412085571379042873 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
+  m_CorrespondingSourceObject: {fileID: 3079756422981161909, guid: ff2aaee048f31f6479f9f5c9a4c93815,
     type: 3}
-  m_PrefabInstance: {fileID: 5544999480993253523}
+  m_PrefabInstance: {fileID: 425405006796917132}
   m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8532985658554279753
 PrefabInstance:

diff --git a/Assets/Prefabs/Slave.prefab b/Assets/Prefabs/Slave.prefab
@@ -584,7 +584,7 @@ Transform:
   m_Children:
   - {fileID: 1223161745}
   - {fileID: 364367242}
-  - {fileID: 7363745984668938116}
+  - {fileID: 3558491637864083049}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1456,78 +1456,153 @@ Transform:
   m_Father: {fileID: 1565414595}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &5515847222339812401
-PrefabInstance:
+--- !u!1 &3558491637864083044
+GameObject:
   m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1299236797}
-    m_Modifications:
-    - target: {fileID: 3079756422981161912, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
-        type: 3}
-      propertyPath: m_Name
-      value: VoiceController
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 2.4510875
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.85897326
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -5.9334483
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
-        type: 3}
-      propertyPath: m_LocalRotation.w
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3558491637864083049}
+  - component: {fileID: 3558491637864083050}
+  - component: {fileID: 3558491637864083051}
+  m_Layer: 0
+  m_Name: VoiceController_SK
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3558491637864083049
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3558491637864083044}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 2.4510875, y: 0.85897326, z: -5.9334483}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1299236797}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!82 &3558491637864083050
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3558491637864083044}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 0}
+  m_PlayOnAwake: 0
+  m_Volume: 0.5
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
       value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
       value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
       value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
       value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: d4cb36db2a3b3654d9d0d4901a08b0b0, type: 3}
---- !u!4 &7363745984668938116 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 3079756422981161909, guid: d4cb36db2a3b3654d9d0d4901a08b0b0,
-    type: 3}
-  m_PrefabInstance: {fileID: 5515847222339812401}
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+--- !u!114 &3558491637864083051
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3558491637864083044}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 37aca0045c461c54b850c5133eb00a53, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  voices:
+  - {fileID: 8300000, guid: 8dd60f400f30f124c8b954109da4575e, type: 3}
+  - {fileID: 8300000, guid: 5cc55c38820e0a849b13594e5233a165, type: 3}
+  - {fileID: 8300000, guid: 90dbd59072aca884fab91c40b31ccea7, type: 3}
+  - {fileID: 8300000, guid: 8140ae18d7a34cc4da73094b835a22b3, type: 3}
+  - {fileID: 8300000, guid: 9836645ff01e30546a5d8a8ba1d4b10c, type: 3}
+  - {fileID: 8300000, guid: fe00056bdd791154f9dd3447effce04f, type: 3}
+  - {fileID: 8300000, guid: 4a7e40492de02f647a433b2e1eeb6eb1, type: 3}
+  minDelay: 5.5
+  maxDelay: 10.5