summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryum <yum.food.vr@gmail.com>2023-08-31 17:11:11 -0700
committeryum <yum.food.vr@gmail.com>2023-08-31 17:17:01 -0700
commit3db4f81573d89f6ebefb5ec119c7d66affc1a4a0 (patch)
tree202672af81898cfdf559dcfa3a2d89341584f25c
parent4fcf3e1e3ac8dcf510be96a84b81a688b1092869 (diff)
Bugfixes and tweaks
* Temporarily restore normal process priority. Working on adding a UI option to set STT prio. * Give audio indicator phonemes a 1/3 chance to do nothing. Makes result sound a little better imo. * Quiet down steamVR thread when steamVR isn't running * Fix use of `button_id` and `hand_id` in steamvr.py * Increase amount of silence allowed before transcript from 1 to 5 seconds. You want enough buffer to allow for a few full transcripts, else you risk spuriously dropping audio. * Enable background loading in audio metadata (required by vrc sdk)
-rw-r--r--GUI/GUI/GUI/PythonWrapper.cpp3
-rw-r--r--Scripts/osc_ctrl.py2
-rw-r--r--Scripts/steamvr.py13
-rw-r--r--Scripts/transcribe.py25
-rw-r--r--Sounds/aiueo/a.wav.meta2
-rw-r--r--Sounds/aiueo/e.wav.meta2
-rw-r--r--Sounds/aiueo/i.wav.meta2
-rw-r--r--Sounds/aiueo/o.wav.meta2
-rw-r--r--Sounds/aiueo/u.wav.meta2
-rw-r--r--UnityAssets/World Constraint.prefab210
10 files changed, 131 insertions, 132 deletions
diff --git a/GUI/GUI/GUI/PythonWrapper.cpp b/GUI/GUI/GUI/PythonWrapper.cpp
index c4367e8..71df5c5 100644
--- a/GUI/GUI/GUI/PythonWrapper.cpp
+++ b/GUI/GUI/GUI/PythonWrapper.cpp
@@ -282,6 +282,8 @@ bool PythonWrapper::InvokeCommandWithArgs(const std::string& cmd,
});
// Set spawned process priority to low, to avoid lagging things like OBS.
+ // TODO(yum) make a toggle for this.
+#if 0
if (!SetPriorityClass(pi.hProcess, BELOW_NORMAL_PRIORITY_CLASS)) {
std::ostringstream err_oss;
err_oss << "Error while executing python command \"" << cmd_oss.str()
@@ -289,6 +291,7 @@ bool PythonWrapper::InvokeCommandWithArgs(const std::string& cmd,
out_cb("", err_oss.str());
return false;
}
+#endif
// While the process is running, drain output and send input every 10 ms.
DWORD timeout_ms = 10;
diff --git a/Scripts/osc_ctrl.py b/Scripts/osc_ctrl.py
index 413e2ae..6fc706e 100644
--- a/Scripts/osc_ctrl.py
+++ b/Scripts/osc_ctrl.py
@@ -108,7 +108,7 @@ def pageMessage(osc_state: OscState, msg: str, estate: EmotesState) -> bool:
letter_i += 1
if len(sounds_to_make) > 0:
for i in range(5):
- if i+1 in sounds_to_make:
+ if i+1 in sounds_to_make and random.randint(1,3) != 1:
playAudio(osc_state, i+1, True)
else:
playAudio(osc_state, i+1, False)
diff --git a/Scripts/steamvr.py b/Scripts/steamvr.py
index e0b59e3..da07134 100644
--- a/Scripts/steamvr.py
+++ b/Scripts/steamvr.py
@@ -30,19 +30,22 @@ def pollButtonPress(
buttons["thumbstick"] = vr.k_EButton_Axis0
system = None
+ first = True
while not system:
try:
system = vr.init(vr.VRApplication_Background)
except Exception as e:
- print(f"Failed to start steamVR input thread: {repr(e)}", file=sys.stderr)
- time.sleep(5)
+ if first:
+ print(f"Failed to start steamVR input thread: {repr(e)}", file=sys.stderr)
+ first = False
+ time.sleep(1)
last_packet = 0
event_high = False
while True:
time.sleep(0.01)
- lh_idx = system.getTrackedDeviceIndexForControllerRole(hand_id)
+ lh_idx = system.getTrackedDeviceIndexForControllerRole(hands[hand])
#print("left hand device idx: {}".format(lh_idx))
got_state, state = system.getControllerState(lh_idx)
@@ -58,7 +61,7 @@ def pollButtonPress(
# click, not movement.
dead_zone_radius = 0.7
- button_mask = (1 << button_id)
+ button_mask = (1 << buttons[button])
ret = EVENT_NONE
if (state.ulButtonPressed & button_mask) != 0 and\
(state.rAxis[0].x**2 + state.rAxis[0].y**2 < dead_zone_radius**2):
@@ -77,7 +80,7 @@ if __name__ == "__main__":
while True:
time.sleep(0.1)
- event = pollButtonPress(session_state, hand_id = hands["left"], button_id = buttons["joystick"])
+ event = pollButtonPress(session_state)
if event == EVENT_RISING_EDGE:
print("rising edge")
elif event == EVENT_FALLING_EDGE:
diff --git a/Scripts/transcribe.py b/Scripts/transcribe.py
index cea2da0..c718f73 100644
--- a/Scripts/transcribe.py
+++ b/Scripts/transcribe.py
@@ -170,10 +170,6 @@ def onAudioFramesAvailable(
else:
audio_state.commit_fuzz_threshold = 1
- max_frames = int(input_rate * audio_state.MAX_LENGTH_S /
- audio_state.CHUNK)
- if len(audio_state.frames) > max_frames:
- audio_state.frames = audio_state.frames[-1 * max_frames:]
if audio_state.drop_samples_till_i > 0:
# Caller wants us to keep this many *whisper* samples, assuming that
# we're getting one full frame every (1024 / 16KHz) seconds.
@@ -198,6 +194,11 @@ def onAudioFramesAvailable(
audio_state.frames[0] = b'00' * n_samples_to_drop + audio_state.frames[0][n_samples_to_drop * bytes_per_sample:]
audio_state.drop_samples_till_i = -1
+ max_frames = int(input_rate * audio_state.MAX_LENGTH_S /
+ audio_state.CHUNK)
+ if len(audio_state.frames) > max_frames:
+ audio_state.frames = audio_state.frames[-1 * max_frames:]
+
# Now enforce a minimum duration on frames. This reduces cases where the
# STT hallucinates random things. In the Whisper paper, they enforce a
# minimum audio buffer duration of 5.0 seconds, so I do the same here.
@@ -393,9 +394,9 @@ def transcribeAudio(audio_state,
if audio_state.enable_debug_mode:
print("no transcription, spin ({} seconds)".format(time.time() - last_transcribe_time))
last_transcribe_time = time.time()
- # Prevent audio buffer from holding more than 1 second of silence
+ # Prevent audio buffer from holding more than a few seconds of silence
# before real speech.
- audio_state.MAX_LENGTH_S = 1
+ audio_state.MAX_LENGTH_S = 5
continue
else:
audio_state.MAX_LENGTH_S = 300
@@ -731,14 +732,12 @@ def transcribeLoop(mic: str,
window_duration_s: int,
gpu_idx: int,
keyboard_hotkey: str,
- reset_on_toggle: bool,
- commit_fuzz_threshold: int):
+ reset_on_toggle: bool):
audio_state = getMicStream(mic)
audio_state.whisper_language = language
audio_state.language = langcodes.find(language).language
audio_state.MAX_LENGTH_S = window_duration_s
audio_state.reset_on_toggle = reset_on_toggle
- #audio_state.commit_fuzz_threshold = commit_fuzz_threshold
audio_state.enable_debug_mode = enable_debug_mode
audio_state.enable_profanity_filter = enable_profanity_filter
@@ -905,7 +904,6 @@ if __name__ == "__main__":
parser.add_argument("--gpu_idx", type=str, help="The index of the GPU device to use. On single GPU systems, use 0.")
parser.add_argument("--keybind", type=str, help="The keyboard hotkey to use to toggle transcription. For example, ctrl+shift+s")
parser.add_argument("--reset_on_toggle", type=int, help="Whether to reset (clear) the transcript every time that transcription is toggled on.")
- parser.add_argument("--commit_fuzz_threshold", type=int, help="The edit distance under which two consecutive transcripts are considered to match.")
parser.add_argument("--enable_debug_mode", type=int, help="If set to 1, print additional information to stdout while transcribing.")
args = parser.parse_args()
@@ -945,10 +943,6 @@ if __name__ == "__main__":
print("--gpu_idx required", file=sys.stderr)
sys.exit(1)
- if not args.commit_fuzz_threshold:
- print("--commit_fuzz_threshold required", file=sys.stderr)
- sys.exit(1)
-
args.gpu_idx = int(args.gpu_idx)
window_duration_s = 120
@@ -1027,6 +1021,5 @@ if __name__ == "__main__":
estate, window_duration_s,
args.gpu_idx,
args.keybind,
- args.reset_on_toggle,
- args.commit_fuzz_threshold)
+ args.reset_on_toggle)
diff --git a/Sounds/aiueo/a.wav.meta b/Sounds/aiueo/a.wav.meta
index 96c9ca0..40c1ea3 100644
--- a/Sounds/aiueo/a.wav.meta
+++ b/Sounds/aiueo/a.wav.meta
@@ -14,7 +14,7 @@ AudioImporter:
forceToMono: 0
normalize: 1
preloadAudioData: 1
- loadInBackground: 0
+ loadInBackground: 1
ambisonic: 0
3D: 1
userData:
diff --git a/Sounds/aiueo/e.wav.meta b/Sounds/aiueo/e.wav.meta
index e317634..b0e06ae 100644
--- a/Sounds/aiueo/e.wav.meta
+++ b/Sounds/aiueo/e.wav.meta
@@ -14,7 +14,7 @@ AudioImporter:
forceToMono: 0
normalize: 1
preloadAudioData: 1
- loadInBackground: 0
+ loadInBackground: 1
ambisonic: 0
3D: 1
userData:
diff --git a/Sounds/aiueo/i.wav.meta b/Sounds/aiueo/i.wav.meta
index 73e6f64..6a6f5d3 100644
--- a/Sounds/aiueo/i.wav.meta
+++ b/Sounds/aiueo/i.wav.meta
@@ -14,7 +14,7 @@ AudioImporter:
forceToMono: 0
normalize: 1
preloadAudioData: 1
- loadInBackground: 0
+ loadInBackground: 1
ambisonic: 0
3D: 1
userData:
diff --git a/Sounds/aiueo/o.wav.meta b/Sounds/aiueo/o.wav.meta
index 0bfb890..49f59a3 100644
--- a/Sounds/aiueo/o.wav.meta
+++ b/Sounds/aiueo/o.wav.meta
@@ -14,7 +14,7 @@ AudioImporter:
forceToMono: 0
normalize: 1
preloadAudioData: 1
- loadInBackground: 0
+ loadInBackground: 1
ambisonic: 0
3D: 1
userData:
diff --git a/Sounds/aiueo/u.wav.meta b/Sounds/aiueo/u.wav.meta
index dcc988c..8b67768 100644
--- a/Sounds/aiueo/u.wav.meta
+++ b/Sounds/aiueo/u.wav.meta
@@ -14,7 +14,7 @@ AudioImporter:
forceToMono: 0
normalize: 1
preloadAudioData: 1
- loadInBackground: 0
+ loadInBackground: 1
ambisonic: 0
3D: 1
userData:
diff --git a/UnityAssets/World Constraint.prefab b/UnityAssets/World Constraint.prefab
index e35b62b..b492c7c 100644
--- a/UnityAssets/World Constraint.prefab
+++ b/UnityAssets/World Constraint.prefab
@@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1 &59845033047403163
+--- !u!1 &1285908867758314142
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -8,37 +8,38 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 62178752985844127}
- - component: {fileID: 59845033047403160}
+ - component: {fileID: 1282676635465832690}
+ - component: {fileID: 7830153666400993347}
m_Layer: 0
- m_Name: Container
+ m_Name: World Constraint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &62178752985844127
+--- !u!4 &1282676635465832690
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 59845033047403163}
+ m_GameObject: {fileID: 1285908867758314142}
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:
- - {fileID: 6776837118619840393}
- m_Father: {fileID: 54804600186116711}
+ - {fileID: 1284274506076556042}
+ - {fileID: 3825042190120287176}
+ m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1773428102 &59845033047403160
+--- !u!1773428102 &7830153666400993347
ParentConstraint:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 59845033047403163}
+ m_GameObject: {fileID: 1285908867758314142}
m_Enabled: 1
m_Weight: 1
m_TranslationAtRest: {x: 0, y: 0, z: 0}
@@ -56,9 +57,10 @@ ParentConstraint:
m_IsContraintActive: 1
m_IsLocked: 1
m_Sources:
- - sourceTransform: {fileID: 2601682554872707421}
+ - sourceTransform: {fileID: 1720321125886419532, guid: e86e0e4bebce5834ab8ed64ac5f3b3cc,
+ type: 3}
weight: 1
---- !u!1 &60297946348294155
+--- !u!1 &1286573024465152014
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -66,38 +68,37 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 54804600186116711}
- - component: {fileID: 9053366248947647190}
+ - component: {fileID: 1284274506076556042}
+ - component: {fileID: 1286573024465152013}
m_Layer: 0
- m_Name: World Constraint
+ m_Name: Container
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &54804600186116711
+--- !u!4 &1284274506076556042
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 60297946348294155}
+ m_GameObject: {fileID: 1286573024465152014}
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:
- - {fileID: 62178752985844127}
- - {fileID: 2601682554872707421}
- m_Father: {fileID: 0}
+ - {fileID: 5693225650572274972}
+ m_Father: {fileID: 1282676635465832690}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1773428102 &9053366248947647190
+--- !u!1773428102 &1286573024465152013
ParentConstraint:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 60297946348294155}
+ m_GameObject: {fileID: 1286573024465152014}
m_Enabled: 1
m_Weight: 1
m_TranslationAtRest: {x: 0, y: 0, z: 0}
@@ -115,10 +116,9 @@ ParentConstraint:
m_IsContraintActive: 1
m_IsLocked: 1
m_Sources:
- - sourceTransform: {fileID: 1720321125886419532, guid: e86e0e4bebce5834ab8ed64ac5f3b3cc,
- type: 3}
+ - sourceTransform: {fileID: 3825042190120287176}
weight: 1
---- !u!1 &2601682554872707422
+--- !u!1 &3825042190120287179
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -126,7 +126,7 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 2601682554872707421}
+ - component: {fileID: 3825042190120287176}
m_Layer: 0
m_Name: Reset Target
m_TagString: Untagged
@@ -134,21 +134,21 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &2601682554872707421
+--- !u!4 &3825042190120287176
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2601682554872707422}
+ m_GameObject: {fileID: 3825042190120287179}
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: 54804600186116711}
+ m_Father: {fileID: 1282676635465832690}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &6145154926414935347
+--- !u!1 &4920664437401122726
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -156,9 +156,9 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 6776837118619840393}
- - component: {fileID: 7612194843402133548}
- - component: {fileID: 5640483281311601894}
+ - component: {fileID: 5693225650572274972}
+ - component: {fileID: 8695814288831390393}
+ - component: {fileID: 6866100797661206131}
m_Layer: 0
m_Name: TaSTT
m_TagString: Untagged
@@ -166,40 +166,40 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!4 &6776837118619840393
+--- !u!4 &5693225650572274972
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6145154926414935347}
+ m_GameObject: {fileID: 4920664437401122726}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 5, y: 5, z: 5}
m_Children:
- - {fileID: 8677976622111891895}
- - {fileID: 8677976622277615744}
- - {fileID: 8677976623497942872}
- - {fileID: 8677976622407100563}
- - {fileID: 8677976622034699145}
- m_Father: {fileID: 62178752985844127}
+ - {fileID: 7593088928288826146}
+ - {fileID: 7593088927784018453}
+ - {fileID: 7593088926839592397}
+ - {fileID: 7593088928030976518}
+ - {fileID: 7593088928060604700}
+ m_Father: {fileID: 1284274506076556042}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &7612194843402133548
+--- !u!33 &8695814288831390393
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6145154926414935347}
+ m_GameObject: {fileID: 4920664437401122726}
m_Mesh: {fileID: -5495902117074765545, guid: 1c2aa3d76900de6409aaeaa1b238ae8a, type: 3}
---- !u!23 &5640483281311601894
+--- !u!23 &6866100797661206131
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6145154926414935347}
+ m_GameObject: {fileID: 4920664437401122726}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
@@ -232,7 +232,7 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
---- !u!1 &8677976622034699146
+--- !u!1 &7593088926839592396
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -240,40 +240,40 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 8677976622034699145}
- - component: {fileID: 8677976622034699144}
+ - component: {fileID: 7593088926839592397}
+ - component: {fileID: 7593088926839592402}
m_Layer: 0
- m_Name: Audio 1
+ m_Name: Audio 3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
---- !u!4 &8677976622034699145
+--- !u!4 &7593088926839592397
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8677976622034699146}
+ m_GameObject: {fileID: 7593088926839592396}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.2, y: 0.19999999, z: 0.20000003}
m_Children: []
- m_Father: {fileID: 6776837118619840393}
- m_RootOrder: 4
+ m_Father: {fileID: 5693225650572274972}
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!82 &8677976622034699144
+--- !u!82 &7593088926839592402
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8677976622034699146}
+ m_GameObject: {fileID: 7593088926839592396}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
- m_audioClip: {fileID: 8300000, guid: 7d9f44f7fb873f949b851388b56330d0, type: 3}
+ m_audioClip: {fileID: 8300000, guid: a945b645e3830ef41955ca3af6dba8d3, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
@@ -319,7 +319,7 @@ AudioSource:
m_Curve:
- serializedVersion: 3
time: 0
- value: 0
+ value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
@@ -359,7 +359,7 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
---- !u!1 &8677976622111891912
+--- !u!1 &7593088927784018452
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -367,40 +367,40 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 8677976622111891895}
- - component: {fileID: 8677976622111891894}
+ - component: {fileID: 7593088927784018453}
+ - component: {fileID: 7593088927784018458}
m_Layer: 0
- m_Name: Audio 5
+ m_Name: Audio 4
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
---- !u!4 &8677976622111891895
+--- !u!4 &7593088927784018453
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8677976622111891912}
+ m_GameObject: {fileID: 7593088927784018452}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.2, y: 0.19999999, z: 0.20000003}
m_Children: []
- m_Father: {fileID: 6776837118619840393}
- m_RootOrder: 0
+ m_Father: {fileID: 5693225650572274972}
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!82 &8677976622111891894
+--- !u!82 &7593088927784018458
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8677976622111891912}
+ m_GameObject: {fileID: 7593088927784018452}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
- m_audioClip: {fileID: 8300000, guid: 19c542485b32f114ba70c9092ccb658f, type: 3}
+ m_audioClip: {fileID: 8300000, guid: 4803d8be07ade7a4bb93f231dd60980b, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
@@ -446,7 +446,7 @@ AudioSource:
m_Curve:
- serializedVersion: 3
time: 0
- value: 0
+ value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
@@ -486,7 +486,7 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
---- !u!1 &8677976622277615745
+--- !u!1 &7593088928030976513
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -494,40 +494,40 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 8677976622277615744}
- - component: {fileID: 8677976622277615759}
+ - component: {fileID: 7593088928030976518}
+ - component: {fileID: 7593088928030976519}
m_Layer: 0
- m_Name: Audio 4
+ m_Name: Audio 2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
---- !u!4 &8677976622277615744
+--- !u!4 &7593088928030976518
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8677976622277615745}
+ m_GameObject: {fileID: 7593088928030976513}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.2, y: 0.19999999, z: 0.20000003}
m_Children: []
- m_Father: {fileID: 6776837118619840393}
- m_RootOrder: 1
+ m_Father: {fileID: 5693225650572274972}
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!82 &8677976622277615759
+--- !u!82 &7593088928030976519
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8677976622277615745}
+ m_GameObject: {fileID: 7593088928030976513}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
- m_audioClip: {fileID: 8300000, guid: 4803d8be07ade7a4bb93f231dd60980b, type: 3}
+ m_audioClip: {fileID: 8300000, guid: f43790411c411124d9cf1ea2e72acf9b, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
@@ -573,7 +573,7 @@ AudioSource:
m_Curve:
- serializedVersion: 3
time: 0
- value: 0
+ value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
@@ -613,7 +613,7 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
---- !u!1 &8677976622407100564
+--- !u!1 &7593088928060604703
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -621,40 +621,40 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 8677976622407100563}
- - component: {fileID: 8677976622407100562}
+ - component: {fileID: 7593088928060604700}
+ - component: {fileID: 7593088928060604701}
m_Layer: 0
- m_Name: Audio 2
+ m_Name: Audio 1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
---- !u!4 &8677976622407100563
+--- !u!4 &7593088928060604700
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8677976622407100564}
+ m_GameObject: {fileID: 7593088928060604703}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.2, y: 0.19999999, z: 0.20000003}
m_Children: []
- m_Father: {fileID: 6776837118619840393}
- m_RootOrder: 3
+ m_Father: {fileID: 5693225650572274972}
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!82 &8677976622407100562
+--- !u!82 &7593088928060604701
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8677976622407100564}
+ m_GameObject: {fileID: 7593088928060604703}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
- m_audioClip: {fileID: 8300000, guid: f43790411c411124d9cf1ea2e72acf9b, type: 3}
+ m_audioClip: {fileID: 8300000, guid: 7d9f44f7fb873f949b851388b56330d0, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
@@ -700,7 +700,7 @@ AudioSource:
m_Curve:
- serializedVersion: 3
time: 0
- value: 0
+ value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
@@ -740,7 +740,7 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
---- !u!1 &8677976623497942873
+--- !u!1 &7593088928288826205
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -748,40 +748,40 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- - component: {fileID: 8677976623497942872}
- - component: {fileID: 8677976623497942855}
+ - component: {fileID: 7593088928288826146}
+ - component: {fileID: 7593088928288826147}
m_Layer: 0
- m_Name: Audio 3
+ m_Name: Audio 5
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
---- !u!4 &8677976623497942872
+--- !u!4 &7593088928288826146
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8677976623497942873}
+ m_GameObject: {fileID: 7593088928288826205}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.2, y: 0.19999999, z: 0.20000003}
m_Children: []
- m_Father: {fileID: 6776837118619840393}
- m_RootOrder: 2
+ m_Father: {fileID: 5693225650572274972}
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!82 &8677976623497942855
+--- !u!82 &7593088928288826147
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8677976623497942873}
+ m_GameObject: {fileID: 7593088928288826205}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
- m_audioClip: {fileID: 8300000, guid: a945b645e3830ef41955ca3af6dba8d3, type: 3}
+ m_audioClip: {fileID: 8300000, guid: 19c542485b32f114ba70c9092ccb658f, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
@@ -827,7 +827,7 @@ AudioSource:
m_Curve:
- serializedVersion: 3
time: 0
- value: 0
+ value: 1
inSlope: 0
outSlope: 0
tangentMode: 0