diff --git a/Assets/03_Models/_Characters/Blue2/Animations/AnimController_Blue2.controller b/Assets/03_Models/_Characters/Blue2/Animations/AnimController_Blue2.controller index 2570bd85..e27bc154 100644 --- a/Assets/03_Models/_Characters/Blue2/Animations/AnimController_Blue2.controller +++ b/Assets/03_Models/_Characters/Blue2/Animations/AnimController_Blue2.controller @@ -144,6 +144,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &5479710833563612485 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Gesture_FeMale_Speak1 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: becb558e9a1d83e4596ebe4c37969d1b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &6170660395283963564 AnimatorStateMachine: serializedVersion: 6 @@ -242,6 +268,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -2654873047871796514} m_Position: {x: 500, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5479710833563612485} + m_Position: {x: 500, y: 190, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/08_Data/Communication/DialogNodes/Blue/DialogNode_Blue_1_100.asset b/Assets/08_Data/Communication/DialogNodes/Blue/DialogNode_Blue_1_100.asset index c4a3d6e9..950d8f69 100644 --- a/Assets/08_Data/Communication/DialogNodes/Blue/DialogNode_Blue_1_100.asset +++ b/Assets/08_Data/Communication/DialogNodes/Blue/DialogNode_Blue_1_100.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:09183662e7af1062ec0070de194688ebf637d240c72fca1208f3f1d9e9369a87 -size 1138 +oid sha256:0ec026d0a9b1e5554bd5e5354cc502964cc01c8e8c2326be673f29e6eb3abfa5 +size 1250 diff --git a/Assets/08_Data/Communication/DialogNodes/Blue/DialogNode_Blue_1_101.asset b/Assets/08_Data/Communication/DialogNodes/Blue/DialogNode_Blue_1_101.asset new file mode 100644 index 00000000..f94a1554 --- /dev/null +++ b/Assets/08_Data/Communication/DialogNodes/Blue/DialogNode_Blue_1_101.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b94fa637747fc676663e503a12bff7a2cd27ac7218dedc929831484f7150a789 +size 1024 diff --git a/Assets/08_Data/Communication/DialogNodes/Blue/DialogNode_Blue_1_101.asset.meta b/Assets/08_Data/Communication/DialogNodes/Blue/DialogNode_Blue_1_101.asset.meta new file mode 100644 index 00000000..b03190a4 --- /dev/null +++ b/Assets/08_Data/Communication/DialogNodes/Blue/DialogNode_Blue_1_101.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6d9b96703053bbc4caf45a2c8f57c026 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication/DialogNodes/Blue/DialogNode_Blue_1_151.asset b/Assets/08_Data/Communication/DialogNodes/Blue/DialogNode_Blue_1_151.asset new file mode 100644 index 00000000..6e6cc436 --- /dev/null +++ b/Assets/08_Data/Communication/DialogNodes/Blue/DialogNode_Blue_1_151.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee1211418315f280bd6184fdf7f8aa103146ddc8fb5c4bbe94b00981ceeeb002 +size 1054 diff --git a/Assets/08_Data/Communication/DialogNodes/Blue/DialogNode_Blue_1_151.asset.meta b/Assets/08_Data/Communication/DialogNodes/Blue/DialogNode_Blue_1_151.asset.meta new file mode 100644 index 00000000..e53d8ce0 --- /dev/null +++ b/Assets/08_Data/Communication/DialogNodes/Blue/DialogNode_Blue_1_151.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b7eb3dee9449cd845bb2e422f9558792 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication/Voices/Blue/Voice_Blue_1_100.asset b/Assets/08_Data/Communication/Voices/Blue/Voice_Blue_1_100.asset index ef87e904..600c1f5d 100644 --- a/Assets/08_Data/Communication/Voices/Blue/Voice_Blue_1_100.asset +++ b/Assets/08_Data/Communication/Voices/Blue/Voice_Blue_1_100.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5439caf862e1c96580bdbbc4077bc0853e88e8df00fd68075caf23fa1fa4277 +oid sha256:40dbd2b4048f532ba155b71a4b4742dbff6839cebe63fce2ab5cddc2617f7dd7 size 538 diff --git a/Assets/08_Data/Communication/Voices/Blue/Voice_Blue_1_101.asset b/Assets/08_Data/Communication/Voices/Blue/Voice_Blue_1_101.asset new file mode 100644 index 00000000..b8864e03 --- /dev/null +++ b/Assets/08_Data/Communication/Voices/Blue/Voice_Blue_1_101.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e60191693924d62bd12231d255709c37fc4e8bb8052a5b8ef7e9e0f212c69ec8 +size 538 diff --git a/Assets/08_Data/Communication/Voices/Blue/Voice_Blue_1_101.asset.meta b/Assets/08_Data/Communication/Voices/Blue/Voice_Blue_1_101.asset.meta new file mode 100644 index 00000000..8fb34e59 --- /dev/null +++ b/Assets/08_Data/Communication/Voices/Blue/Voice_Blue_1_101.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d711f1be6cfeab242928db70ad007dc2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication/Voices/Blue/Voice_Blue_1_151.asset b/Assets/08_Data/Communication/Voices/Blue/Voice_Blue_1_151.asset new file mode 100644 index 00000000..de8030d9 --- /dev/null +++ b/Assets/08_Data/Communication/Voices/Blue/Voice_Blue_1_151.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f378eaef865de826266719f5905393413cf5c3fb49b263847bf3adca4e5ef05a +size 538 diff --git a/Assets/08_Data/Communication/Voices/Blue/Voice_Blue_1_151.asset.meta b/Assets/08_Data/Communication/Voices/Blue/Voice_Blue_1_151.asset.meta new file mode 100644 index 00000000..83701139 --- /dev/null +++ b/Assets/08_Data/Communication/Voices/Blue/Voice_Blue_1_151.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc315f1cba0a6ef4fb0b085a7112c273 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_100.wav b/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_100.wav index 13ee67dd..f5894a6e 100644 --- a/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_100.wav +++ b/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_100.wav @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5854bbf13867b8fae1008861333478fa2efa2cf0164d9bde72a0ba389dbef351 -size 221426 +oid sha256:756c9dece0010727acec676111278d524e2a0bdafa682600a76d55b457fde064 +size 225836 diff --git a/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_100.wav.meta b/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_100.wav.meta index 66a7f206..1b05b2bc 100644 --- a/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_100.wav.meta +++ b/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_100.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e0c60ad910314dd43b633460b5811724 +guid: a340010e899610e4f919589a9474ef50 AudioImporter: externalObjects: {} serializedVersion: 8 diff --git a/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_101.wav b/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_101.wav new file mode 100644 index 00000000..58838e51 --- /dev/null +++ b/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_101.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5f96ccf1f01fe6f2ce93f62f5c3586a8cfb7a3b870157f957392cf5920f4c31 +size 261998 diff --git a/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_101.wav.meta b/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_101.wav.meta new file mode 100644 index 00000000..14ec9d96 --- /dev/null +++ b/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_101.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b66fa91a76e02fe4e92760c16f5fc9b2 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_151.wav b/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_151.wav new file mode 100644 index 00000000..7a226232 --- /dev/null +++ b/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_151.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5390f6b869dad2035cacc5acc18248c20b0c4b48089981ae2b4c9f8f0bfaea84 +size 349316 diff --git a/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_151.wav.meta b/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_151.wav.meta new file mode 100644 index 00000000..4e23044e --- /dev/null +++ b/Assets/10_Audio/CharacterVoices/Blue/Voice_Blue_1_151.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 34cc11da3c9d10b4499f627cfe8d552b +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: