From 305a911524b661ec22d77f1321635ffdf03b444d Mon Sep 17 00:00:00 2001 From: "DESKTOP-VVOCIJO\\PC" Date: Fri, 24 Apr 2026 16:23:55 +0900 Subject: [PATCH] =?UTF-8?q?2026-04-24=20NPC=20=EC=9D=8C=EC=84=B1=20?= =?UTF-8?q?=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C=EA=B7=B8=20=EC=8B=9C?= =?UTF-8?q?=EC=8A=A4=ED=85=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/MyProject/GameScene.unity | 4 +- .../Communication/Dialog/DialogPlayer.cs | 87 ++- .../Voice/CharacterVoiceObject.cs | 9 + .../Data/Communication/ExpressionData.cs | 2 +- .../Data/Communication/GestureData.cs | 2 +- .../Base/Animations/Expressions.meta | 8 + .../Animations/Expressions/BMAC_Angry.anim | 3 + .../Expressions/BMAC_Angry.anim.meta | 8 + .../Animations/Expressions/BMAC_Blink.anim | 3 + .../Expressions/BMAC_Blink.anim.meta | 8 + .../Animations/Expressions/BMAC_Devious.anim | 3 + .../Expressions/BMAC_Devious.anim.meta | 8 + .../Animations/Expressions/BMAC_Evil.anim | 3 + .../Expressions/BMAC_Evil.anim.meta | 8 + .../Animations/Expressions/BMAC_Happy.anim | 3 + .../Expressions/BMAC_Happy.anim.meta | 8 + .../Expressions/BMAC_HeeledFeet.anim | 3 + .../Expressions/BMAC_HeeledFeet.anim.meta | 8 + .../Animations/Expressions/BMAC_Neutral.anim | 3 + .../Expressions/BMAC_Neutral.anim.meta | 8 + .../Base/Animations/Expressions/BMAC_Sad.anim | 3 + .../Animations/Expressions/BMAC_Sad.anim.meta | 8 + .../Animations/Expressions/BMAC_Smile.anim | 3 + .../Expressions/BMAC_Smile.anim.meta | 8 + .../Expressions/BMAC_Surprised.anim | 3 + .../Expressions/BMAC_Surprised.anim.meta | 8 + .../Base/Animations/Expressions/Blink.anim | 3 + .../Animations/Expressions/Blink.anim.meta | 8 + ..._Speak04_Calm_Loop.FBX => FeMale@Calm.FBX} | 0 ...alm_Loop.FBX.meta => FeMale@Calm.FBX.meta} | 55 +- ...GIA_Idle_think_01.fbx => FeMale@Think.fbx} | 0 ...hink_01.fbx.meta => FeMale@Think.fbx.meta} | 615 +++++++++++++----- .../Base/Animations/FeMale_Calm.anim | 3 + .../Base/Animations/FeMale_Calm.anim.meta | 8 + .../Base/Animations/FeMale_Think.anim | 3 + .../Base/Animations/FeMale_Think.anim.meta | 8 + .../AnimController_Black.controller | 60 +- Assets/08_Data/Characters.meta | 8 + .../Characters/CharacterData_Black.asset | 3 + .../Characters/CharacterData_Black.asset.meta | 8 + Assets/08_Data/Communication.meta | 8 + .../08_Data/Communication/DialogGroups.meta | 8 + .../DialogGroups/DialogGroup_Black_1.asset | 3 + .../DialogGroup_Black_1.asset.meta | 8 + Assets/08_Data/Communication/DialogNodes.meta | 8 + .../DialogNodes/DialogNode_Black_1_100.asset | 3 + .../DialogNode_Black_1_100.asset.meta | 8 + .../DialogNodes/DialogNode_Black_1_200.asset | 3 + .../DialogNode_Black_1_200.asset.meta | 8 + Assets/08_Data/Communication/Expressions.meta | 8 + .../Expressions/ExpressionData_Sad.asset | 3 + .../Expressions/ExpressionData_Sad.asset.meta | 8 + Assets/08_Data/Communication/Gestures.meta | 8 + .../Gestures/GestureData_FeMale_Ask.asset | 3 + .../GestureData_FeMale_Ask.asset.meta | 8 + .../Gestures/GestureData_FeMale_Think.asset | 3 + .../GestureData_FeMale_Think.asset.meta | 8 + Assets/08_Data/Communication/Voices.meta | 8 + .../Voices/Voice_Black_1_100.asset | 3 + .../Voices/Voice_Black_1_100.asset.meta | 8 + .../Voices/Voice_Black_1_200.asset | 3 + .../Voices/Voice_Black_1_200.asset.meta | 8 + Assets/10_Audio/CharacterVoices.meta | 8 + Assets/10_Audio/CharacterVoices/Black.meta | 8 + .../Black/Voice_Black_1_100.wav | 3 + .../Black/Voice_Black_1_100.wav.meta | 23 + .../Black/Voice_Black_1_200.wav | 3 + .../Black/Voice_Black_1_200.wav.meta | 23 + Assets/10_Audio/MainMixer.mixer | 37 ++ 69 files changed, 1064 insertions(+), 181 deletions(-) create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions.meta create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Angry.anim create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Angry.anim.meta create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Blink.anim create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Blink.anim.meta create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Devious.anim create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Devious.anim.meta create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Evil.anim create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Evil.anim.meta create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Happy.anim create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Happy.anim.meta create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_HeeledFeet.anim create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_HeeledFeet.anim.meta create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Neutral.anim create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Neutral.anim.meta create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Sad.anim create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Sad.anim.meta create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Smile.anim create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Smile.anim.meta create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Surprised.anim create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Surprised.anim.meta create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/Blink.anim create mode 100644 Assets/03_Models/_Characters/Base/Animations/Expressions/Blink.anim.meta rename Assets/03_Models/_Characters/Base/Animations/{@KA_Speak04_Calm_Loop.FBX => FeMale@Calm.FBX} (100%) rename Assets/03_Models/_Characters/Base/Animations/{@KA_Speak04_Calm_Loop.FBX.meta => FeMale@Calm.FBX.meta} (96%) rename Assets/03_Models/_Characters/Base/Animations/{AGIA_Idle_think_01.fbx => FeMale@Think.fbx} (100%) rename Assets/03_Models/_Characters/Base/Animations/{AGIA_Idle_think_01.fbx.meta => FeMale@Think.fbx.meta} (78%) create mode 100644 Assets/03_Models/_Characters/Base/Animations/FeMale_Calm.anim create mode 100644 Assets/03_Models/_Characters/Base/Animations/FeMale_Calm.anim.meta create mode 100644 Assets/03_Models/_Characters/Base/Animations/FeMale_Think.anim create mode 100644 Assets/03_Models/_Characters/Base/Animations/FeMale_Think.anim.meta create mode 100644 Assets/08_Data/Characters.meta create mode 100644 Assets/08_Data/Characters/CharacterData_Black.asset create mode 100644 Assets/08_Data/Characters/CharacterData_Black.asset.meta create mode 100644 Assets/08_Data/Communication.meta create mode 100644 Assets/08_Data/Communication/DialogGroups.meta create mode 100644 Assets/08_Data/Communication/DialogGroups/DialogGroup_Black_1.asset create mode 100644 Assets/08_Data/Communication/DialogGroups/DialogGroup_Black_1.asset.meta create mode 100644 Assets/08_Data/Communication/DialogNodes.meta create mode 100644 Assets/08_Data/Communication/DialogNodes/DialogNode_Black_1_100.asset create mode 100644 Assets/08_Data/Communication/DialogNodes/DialogNode_Black_1_100.asset.meta create mode 100644 Assets/08_Data/Communication/DialogNodes/DialogNode_Black_1_200.asset create mode 100644 Assets/08_Data/Communication/DialogNodes/DialogNode_Black_1_200.asset.meta create mode 100644 Assets/08_Data/Communication/Expressions.meta create mode 100644 Assets/08_Data/Communication/Expressions/ExpressionData_Sad.asset create mode 100644 Assets/08_Data/Communication/Expressions/ExpressionData_Sad.asset.meta create mode 100644 Assets/08_Data/Communication/Gestures.meta create mode 100644 Assets/08_Data/Communication/Gestures/GestureData_FeMale_Ask.asset create mode 100644 Assets/08_Data/Communication/Gestures/GestureData_FeMale_Ask.asset.meta create mode 100644 Assets/08_Data/Communication/Gestures/GestureData_FeMale_Think.asset create mode 100644 Assets/08_Data/Communication/Gestures/GestureData_FeMale_Think.asset.meta create mode 100644 Assets/08_Data/Communication/Voices.meta create mode 100644 Assets/08_Data/Communication/Voices/Voice_Black_1_100.asset create mode 100644 Assets/08_Data/Communication/Voices/Voice_Black_1_100.asset.meta create mode 100644 Assets/08_Data/Communication/Voices/Voice_Black_1_200.asset create mode 100644 Assets/08_Data/Communication/Voices/Voice_Black_1_200.asset.meta create mode 100644 Assets/10_Audio/CharacterVoices.meta create mode 100644 Assets/10_Audio/CharacterVoices/Black.meta create mode 100644 Assets/10_Audio/CharacterVoices/Black/Voice_Black_1_100.wav create mode 100644 Assets/10_Audio/CharacterVoices/Black/Voice_Black_1_100.wav.meta create mode 100644 Assets/10_Audio/CharacterVoices/Black/Voice_Black_1_200.wav create mode 100644 Assets/10_Audio/CharacterVoices/Black/Voice_Black_1_200.wav.meta diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index c66f8a13..016b4c1d 100644 --- a/Assets/01_Scenes/MyProject/GameScene.unity +++ b/Assets/01_Scenes/MyProject/GameScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c2cab76a174a9123b70022efcfcd5aa6949fb64016b2c66478baf6c53e7053c -size 13296831 +oid sha256:cd9cf3a0f140d5658c4f3d1ff7f8d4b2e9659aae13386bc9b232d4378b0dd816 +size 13300705 diff --git a/Assets/02_Scripts/Communication/Dialog/DialogPlayer.cs b/Assets/02_Scripts/Communication/Dialog/DialogPlayer.cs index 562e89b3..73b01ca2 100644 --- a/Assets/02_Scripts/Communication/Dialog/DialogPlayer.cs +++ b/Assets/02_Scripts/Communication/Dialog/DialogPlayer.cs @@ -1,24 +1,99 @@ using System.Collections.Generic; +using UnityEngine.InputSystem; using UnityEngine; +[RequireComponent(typeof(CharacterVoiceObject))] public class DialogPlayer : MonoBehaviour { [SerializeField] private List _dialogGroups; private Dictionary _dialogGroupMap; + private Animator _animator; private void Awake() { _dialogGroupMap = new Dictionary(); foreach (var g in _dialogGroups) - { _dialogGroupMap[g.DialogGroupName] = g; - } + + _animator = GetComponentInChildren(); } - public void VoicePlay(DialogNode node) + // 임시 테스트용 + private void Update() { - - //CharacterVoiceObject speakerVoiceObject = FindSpeakerVoiceObject(node.Speaker); - //speakerVoiceObject.Play(node.Voice.Clip); + if (Keyboard.current != null && Keyboard.current.tKey.wasPressedThisFrame) + _ = Play("BlackDialogGroup1"); + } + + public async Awaitable Play(string groupName) + { + if (!_dialogGroupMap.TryGetValue(groupName, out var group)) + { + Debug.LogWarning($"[DialogPlayer] 그룹 없음: {groupName}"); + return; + } + + var node = group.StartNode; + while (node != null) + { + await PlayNode(node); + + if (node.Choices != null && node.Choices.Count > 0) + { + int picked = await WaitForChoice(node); + node = node.Choices[picked].DestinationNode; + } + else + { + node = node.Next; + } + } + + Debug.Log("[DialogPlayer] 대화 종료"); + } + + private async Awaitable PlayNode(DialogNode node) + { + var speakerName = node.Speaker != null ? node.Speaker.Name : "(누구?)"; + Debug.Log($"[{speakerName}] {node.TalkText}"); + + // 보이스 재생 + if (node.Voice != null && node.Speaker != null) + { + var voiceObj = CharacterVoiceObject.Find(node.Speaker); + if (voiceObj != null && node.Voice.Clip != null) + voiceObj.Play(node.Voice.Clip); + } + + if (node.Gesture != null) + _animator.CrossFade(node.Gesture.StateName, node.Gesture.CrossFadeDuration, node.Gesture.AnimationLayer); + if (node.Expression != null) + _animator.CrossFade(node.Expression.StateName, node.Expression.CrossFadeDuration, node.Expression.AnimationLayer); + + // 대기 시간 결정 + float wait = 0f; + if (node.Voice != null && node.Voice.Clip != null) + wait = node.Voice.Clip.length; + else + wait = node.LineDuration; + + if (wait > 0f) + await Awaitable.WaitForSecondsAsync(wait); + else + await WaitForAdvanceInput(); // 수동 진행 + } + + private async Awaitable WaitForChoice(DialogNode node) + { + // TODO: 선택지 UI 띄우기. 일단은 첫 번째 선택지 자동 선택 (테스트용) + Debug.Log("[DialogPlayer] 선택지 대기 — 일단 0번 자동 선택"); + await Awaitable.WaitForSecondsAsync(0.5f); + return 0; + } + + private async Awaitable WaitForAdvanceInput() + { + // TODO: VR 컨트롤러 버튼 입력 대기. 일단은 1초 대기 + await Awaitable.WaitForSecondsAsync(1f); } } diff --git a/Assets/02_Scripts/Communication/Voice/CharacterVoiceObject.cs b/Assets/02_Scripts/Communication/Voice/CharacterVoiceObject.cs index 088cc01f..e07abd73 100644 --- a/Assets/02_Scripts/Communication/Voice/CharacterVoiceObject.cs +++ b/Assets/02_Scripts/Communication/Voice/CharacterVoiceObject.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using UnityEngine; public class CharacterVoiceObject : MonoBehaviour @@ -5,5 +6,13 @@ public class CharacterVoiceObject : MonoBehaviour public CharacterData Character; public AudioSource VoiceSource; + private static readonly Dictionary _registry = new(); + + private void OnEnable() => _registry[Character] = this; + private void OnDisable() => _registry.Remove(Character); + + public static CharacterVoiceObject Find(CharacterData data) + => _registry.TryGetValue(data, out var obj) ? obj : null; + public void Play(AudioClip clip) => VoiceSource.PlayOneShot(clip); } diff --git a/Assets/02_Scripts/Data/Communication/ExpressionData.cs b/Assets/02_Scripts/Data/Communication/ExpressionData.cs index bd2c7c9e..7b6868f2 100644 --- a/Assets/02_Scripts/Data/Communication/ExpressionData.cs +++ b/Assets/02_Scripts/Data/Communication/ExpressionData.cs @@ -6,5 +6,5 @@ public class ExpressionData : ScriptableObject [HideInInspector] public int AnimationLayer = 1; public string StateName; public float CrossFadeDuration = 0.2f; - public AnimationClip PreviewClip; + public AnimationClip AnimClip; } \ No newline at end of file diff --git a/Assets/02_Scripts/Data/Communication/GestureData.cs b/Assets/02_Scripts/Data/Communication/GestureData.cs index d83c08b7..98421feb 100644 --- a/Assets/02_Scripts/Data/Communication/GestureData.cs +++ b/Assets/02_Scripts/Data/Communication/GestureData.cs @@ -6,5 +6,5 @@ public class GestureData : ScriptableObject [HideInInspector] public int AnimationLayer = 0; public string StateName; public float CrossFadeDuration = 0.2f; - public AnimationClip PreviewClip; + public AnimationClip AnimClip; } diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions.meta b/Assets/03_Models/_Characters/Base/Animations/Expressions.meta new file mode 100644 index 00000000..fd624ffa --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d7a38cf83d4e7c4478ebaf68186286bf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Angry.anim b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Angry.anim new file mode 100644 index 00000000..73e49408 --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Angry.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1c43f54a494bc4eb611d1d3ae891beb1c41e08b9ddfc727c1d30d1024bce6c0 +size 9043 diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Angry.anim.meta b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Angry.anim.meta new file mode 100644 index 00000000..056a1250 --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Angry.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50b420ac79ce0ca41a44c7b25d91960d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Blink.anim b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Blink.anim new file mode 100644 index 00000000..457840f2 --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Blink.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:230a5a0cb5cbf3c3df3e417152c4d1bcdab09e6d42441363076972c08260c12d +size 8373 diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Blink.anim.meta b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Blink.anim.meta new file mode 100644 index 00000000..0624b5e7 --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Blink.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e3398ec3e1f50d94fafae1d36c1aceba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Devious.anim b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Devious.anim new file mode 100644 index 00000000..d60cb2fe --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Devious.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2381936029b7d20bc5bccb7f986f62025aed3baf9ff83ee6457bcb82d0ae6e60 +size 17640 diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Devious.anim.meta b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Devious.anim.meta new file mode 100644 index 00000000..e6c68a9c --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Devious.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5834cf5a5d505a945b17050a98d48a34 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Evil.anim b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Evil.anim new file mode 100644 index 00000000..08b7b824 --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Evil.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42bace84b5d5f88a0567612e2a4a791454035fa8117d72ef37ea5cb37e693ec6 +size 36817 diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Evil.anim.meta b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Evil.anim.meta new file mode 100644 index 00000000..ac53d978 --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Evil.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d2d8f8151509cc4793062583318fc9a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Happy.anim b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Happy.anim new file mode 100644 index 00000000..6db7ff24 --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Happy.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11df518f997042eb86aafcf8e92aa4bbe404a8c211a7be439404befe6b3ca735 +size 10277 diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Happy.anim.meta b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Happy.anim.meta new file mode 100644 index 00000000..724a7df4 --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Happy.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 438dca033cef70140b31ac6489d91f6a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_HeeledFeet.anim b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_HeeledFeet.anim new file mode 100644 index 00000000..1c1e2587 --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_HeeledFeet.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df778f404db238517d9b20568dfc8e7df2aa452ec2c42fcb0a255c25accb350f +size 2826 diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_HeeledFeet.anim.meta b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_HeeledFeet.anim.meta new file mode 100644 index 00000000..c1236ed7 --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_HeeledFeet.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 414bdd4516106e549890d2b2445322b2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Neutral.anim b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Neutral.anim new file mode 100644 index 00000000..37f1b47e --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Neutral.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:773af52437247b3e324f0f7904b14465393349757727e03e5682131fed8be500 +size 1694 diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Neutral.anim.meta b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Neutral.anim.meta new file mode 100644 index 00000000..98a29839 --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Neutral.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4f45afc975f2bf14f96e9db9d82aeae2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Sad.anim b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Sad.anim new file mode 100644 index 00000000..686ec02c --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Sad.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:746f2ba34f027f1762642da006210b0a6cbaeae9bd74ea35d08490f09ea04e96 +size 10248 diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Sad.anim.meta b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Sad.anim.meta new file mode 100644 index 00000000..640a9ffa --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Sad.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d4a80f7d815a5c84b9298cd5065dfa8a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Smile.anim b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Smile.anim new file mode 100644 index 00000000..c9dda5a0 --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Smile.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6c63879e52944c7786ecc337524464a5da8416ee2c18cc8378b6e2307ce883c +size 11506 diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Smile.anim.meta b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Smile.anim.meta new file mode 100644 index 00000000..45b1d37a --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Smile.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57bc236eb99ee73409211f0e6f13955d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Surprised.anim b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Surprised.anim new file mode 100644 index 00000000..6db4fff6 --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Surprised.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:adcd59f578068c4ceb5be774dfea9b3ca4861cb8a5af02f7b09dd944c6c44ceb +size 17651 diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Surprised.anim.meta b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Surprised.anim.meta new file mode 100644 index 00000000..a31f1a4a --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/BMAC_Surprised.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f2544ab2fde8944ea6900fbfd843780 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/Blink.anim b/Assets/03_Models/_Characters/Base/Animations/Expressions/Blink.anim new file mode 100644 index 00000000..eee49ff0 --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/Blink.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:500d38ecfa3c4ac04d89cc52f334d4951c76d33fe315089e49f51763552cbb7e +size 1346 diff --git a/Assets/03_Models/_Characters/Base/Animations/Expressions/Blink.anim.meta b/Assets/03_Models/_Characters/Base/Animations/Expressions/Blink.anim.meta new file mode 100644 index 00000000..e611a93c --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/Expressions/Blink.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7e0091ac4dc477c46b16e53a1ad810c0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Base/Animations/@KA_Speak04_Calm_Loop.FBX b/Assets/03_Models/_Characters/Base/Animations/FeMale@Calm.FBX similarity index 100% rename from Assets/03_Models/_Characters/Base/Animations/@KA_Speak04_Calm_Loop.FBX rename to Assets/03_Models/_Characters/Base/Animations/FeMale@Calm.FBX diff --git a/Assets/03_Models/_Characters/Base/Animations/@KA_Speak04_Calm_Loop.FBX.meta b/Assets/03_Models/_Characters/Base/Animations/FeMale@Calm.FBX.meta similarity index 96% rename from Assets/03_Models/_Characters/Base/Animations/@KA_Speak04_Calm_Loop.FBX.meta rename to Assets/03_Models/_Characters/Base/Animations/FeMale@Calm.FBX.meta index 7fbaa5d6..c53f4b0f 100644 --- a/Assets/03_Models/_Characters/Base/Animations/@KA_Speak04_Calm_Loop.FBX.meta +++ b/Assets/03_Models/_Characters/Base/Animations/FeMale@Calm.FBX.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 guid: 4e72096e3b128df4e90c57ea0102872a +AssetOrigin: + serializedVersion: 1 + productId: 277585 + packageName: KAWAII ANIMATIONS 100 + packageVersion: 1.10.3 + assetPath: Assets/KAWAII_ANIMATIOMS_100/Assets/Animations/Speak/@KA_Speak04_Calm_Loop.FBX + uploadId: 903416 ModelImporter: - serializedVersion: 22200 + serializedVersion: 24200 internalIDToNameTable: [] externalObjects: {} materials: @@ -16,8 +23,6 @@ ModelImporter: optimizeGameObjects: 0 removeConstantScaleCurves: 0 motionNodeName: - rigImportErrors: - rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: @@ -31,7 +36,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: FeMale_Calm + takeName: Unreal Take + internalID: 8993902097722301239 + firstFrame: 0 + lastFrame: 150 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 1 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -58,6 +92,9 @@ ModelImporter: maxBonesPerVertex: 4 minBoneWeight: 0.001 optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 @@ -786,8 +823,7 @@ ModelImporter: hasTranslationDoF: 1 hasExtraRoot: 1 skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d5317c42c7d79dd41b326383ba7a0871, - type: 3} + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: d5317c42c7d79dd41b326383ba7a0871, type: 3} autoGenerateAvatarMappingIfUnspecified: 1 animationType: 3 humanoidOversampling: 1 @@ -799,10 +835,3 @@ ModelImporter: userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 277585 - packageName: KAWAII ANIMATIONS 100 - packageVersion: 1.10.3 - assetPath: Assets/KAWAII_ANIMATIOMS_100/Assets/Animations/Speak/@KA_Speak04_Calm_Loop.FBX - uploadId: 903416 diff --git a/Assets/03_Models/_Characters/Base/Animations/AGIA_Idle_think_01.fbx b/Assets/03_Models/_Characters/Base/Animations/FeMale@Think.fbx similarity index 100% rename from Assets/03_Models/_Characters/Base/Animations/AGIA_Idle_think_01.fbx rename to Assets/03_Models/_Characters/Base/Animations/FeMale@Think.fbx diff --git a/Assets/03_Models/_Characters/Base/Animations/AGIA_Idle_think_01.fbx.meta b/Assets/03_Models/_Characters/Base/Animations/FeMale@Think.fbx.meta similarity index 78% rename from Assets/03_Models/_Characters/Base/Animations/AGIA_Idle_think_01.fbx.meta rename to Assets/03_Models/_Characters/Base/Animations/FeMale@Think.fbx.meta index 6339a79c..cb8fc26e 100644 --- a/Assets/03_Models/_Characters/Base/Animations/AGIA_Idle_think_01.fbx.meta +++ b/Assets/03_Models/_Characters/Base/Animations/FeMale@Think.fbx.meta @@ -1,149 +1,432 @@ fileFormatVersion: 2 guid: d7b8fde6ee17eda44951fddcaa6434a5 +AssetOrigin: + serializedVersion: 1 + productId: 150397 + packageName: Anime Girl Idle Animations + packageVersion: 1.2.1 + assetPath: Assets/AnimeGirlIdleAnimations/Animations/01_Idles/AGIA_Idle_think_01.fbx + uploadId: 440789 ModelImporter: - serializedVersion: 22 - fileIDToRecycleName: - 100000: //RootNode - 100002: Ankle_L - 100004: Ankle_R - 100006: Chest_M - 100008: Cup_L - 100010: Cup_R - 100012: Elbow_L - 100014: Elbow_R - 100016: Head_M - 100018: HeadEnd_M - 100020: Hip_L - 100022: Hip_R - 100024: IndexFinger1_L - 100026: IndexFinger1_R - 100028: IndexFinger2_L - 100030: IndexFinger2_R - 100032: IndexFinger3_L - 100034: IndexFinger3_R - 100036: IndexFinger4_L - 100038: IndexFinger4_R - 100040: Knee_L - 100042: Knee_R - 100044: MiddleFinger1_L - 100046: MiddleFinger1_R - 100048: MiddleFinger2_L - 100050: MiddleFinger2_R - 100052: MiddleFinger3_L - 100054: MiddleFinger3_R - 100056: MiddleFinger4_L - 100058: MiddleFinger4_R - 100060: Neck_M - 100062: PinkyFinger1_L - 100064: PinkyFinger1_R - 100066: PinkyFinger2_L - 100068: PinkyFinger2_R - 100070: PinkyFinger3_L - 100072: PinkyFinger3_R - 100074: PinkyFinger4_L - 100076: PinkyFinger4_R - 100078: RingFinger1_L - 100080: RingFinger1_R - 100082: RingFinger2_L - 100084: RingFinger2_R - 100086: RingFinger3_L - 100088: RingFinger3_R - 100090: RingFinger4_L - 100092: RingFinger4_R - 100094: Root - 100096: Root_M - 100098: Scapula_L - 100100: Scapula_R - 100102: Shoulder_L - 100104: Shoulder_R - 100106: Spine1_M - 100108: ThumbFinger1_L - 100110: ThumbFinger1_R - 100112: ThumbFinger2_L - 100114: ThumbFinger2_R - 100116: ThumbFinger3_L - 100118: ThumbFinger3_R - 100120: ThumbFinger4_L - 100122: ThumbFinger4_R - 100124: Toes_L - 100126: Toes_R - 100128: ToesEnd_L - 100130: ToesEnd_R - 100132: Wrist_L - 100134: Wrist_R - 400000: //RootNode - 400002: Ankle_L - 400004: Ankle_R - 400006: Chest_M - 400008: Cup_L - 400010: Cup_R - 400012: Elbow_L - 400014: Elbow_R - 400016: Head_M - 400018: HeadEnd_M - 400020: Hip_L - 400022: Hip_R - 400024: IndexFinger1_L - 400026: IndexFinger1_R - 400028: IndexFinger2_L - 400030: IndexFinger2_R - 400032: IndexFinger3_L - 400034: IndexFinger3_R - 400036: IndexFinger4_L - 400038: IndexFinger4_R - 400040: Knee_L - 400042: Knee_R - 400044: MiddleFinger1_L - 400046: MiddleFinger1_R - 400048: MiddleFinger2_L - 400050: MiddleFinger2_R - 400052: MiddleFinger3_L - 400054: MiddleFinger3_R - 400056: MiddleFinger4_L - 400058: MiddleFinger4_R - 400060: Neck_M - 400062: PinkyFinger1_L - 400064: PinkyFinger1_R - 400066: PinkyFinger2_L - 400068: PinkyFinger2_R - 400070: PinkyFinger3_L - 400072: PinkyFinger3_R - 400074: PinkyFinger4_L - 400076: PinkyFinger4_R - 400078: RingFinger1_L - 400080: RingFinger1_R - 400082: RingFinger2_L - 400084: RingFinger2_R - 400086: RingFinger3_L - 400088: RingFinger3_R - 400090: RingFinger4_L - 400092: RingFinger4_R - 400094: Root - 400096: Root_M - 400098: Scapula_L - 400100: Scapula_R - 400102: Shoulder_L - 400104: Shoulder_R - 400106: Spine1_M - 400108: ThumbFinger1_L - 400110: ThumbFinger1_R - 400112: ThumbFinger2_L - 400114: ThumbFinger2_R - 400116: ThumbFinger3_L - 400118: ThumbFinger3_R - 400120: ThumbFinger4_L - 400122: ThumbFinger4_R - 400124: Toes_L - 400126: Toes_R - 400128: ToesEnd_L - 400130: ToesEnd_R - 400132: Wrist_L - 400134: Wrist_R - 7400000: AGIA_Idle_think_01 - 9500000: //RootNode + serializedVersion: 24200 + internalIDToNameTable: + - first: + 1: 100000 + second: //RootNode + - first: + 1: 100002 + second: Ankle_L + - first: + 1: 100004 + second: Ankle_R + - first: + 1: 100006 + second: Chest_M + - first: + 1: 100008 + second: Cup_L + - first: + 1: 100010 + second: Cup_R + - first: + 1: 100012 + second: Elbow_L + - first: + 1: 100014 + second: Elbow_R + - first: + 1: 100016 + second: Head_M + - first: + 1: 100018 + second: HeadEnd_M + - first: + 1: 100020 + second: Hip_L + - first: + 1: 100022 + second: Hip_R + - first: + 1: 100024 + second: IndexFinger1_L + - first: + 1: 100026 + second: IndexFinger1_R + - first: + 1: 100028 + second: IndexFinger2_L + - first: + 1: 100030 + second: IndexFinger2_R + - first: + 1: 100032 + second: IndexFinger3_L + - first: + 1: 100034 + second: IndexFinger3_R + - first: + 1: 100036 + second: IndexFinger4_L + - first: + 1: 100038 + second: IndexFinger4_R + - first: + 1: 100040 + second: Knee_L + - first: + 1: 100042 + second: Knee_R + - first: + 1: 100044 + second: MiddleFinger1_L + - first: + 1: 100046 + second: MiddleFinger1_R + - first: + 1: 100048 + second: MiddleFinger2_L + - first: + 1: 100050 + second: MiddleFinger2_R + - first: + 1: 100052 + second: MiddleFinger3_L + - first: + 1: 100054 + second: MiddleFinger3_R + - first: + 1: 100056 + second: MiddleFinger4_L + - first: + 1: 100058 + second: MiddleFinger4_R + - first: + 1: 100060 + second: Neck_M + - first: + 1: 100062 + second: PinkyFinger1_L + - first: + 1: 100064 + second: PinkyFinger1_R + - first: + 1: 100066 + second: PinkyFinger2_L + - first: + 1: 100068 + second: PinkyFinger2_R + - first: + 1: 100070 + second: PinkyFinger3_L + - first: + 1: 100072 + second: PinkyFinger3_R + - first: + 1: 100074 + second: PinkyFinger4_L + - first: + 1: 100076 + second: PinkyFinger4_R + - first: + 1: 100078 + second: RingFinger1_L + - first: + 1: 100080 + second: RingFinger1_R + - first: + 1: 100082 + second: RingFinger2_L + - first: + 1: 100084 + second: RingFinger2_R + - first: + 1: 100086 + second: RingFinger3_L + - first: + 1: 100088 + second: RingFinger3_R + - first: + 1: 100090 + second: RingFinger4_L + - first: + 1: 100092 + second: RingFinger4_R + - first: + 1: 100094 + second: Root + - first: + 1: 100096 + second: Root_M + - first: + 1: 100098 + second: Scapula_L + - first: + 1: 100100 + second: Scapula_R + - first: + 1: 100102 + second: Shoulder_L + - first: + 1: 100104 + second: Shoulder_R + - first: + 1: 100106 + second: Spine1_M + - first: + 1: 100108 + second: ThumbFinger1_L + - first: + 1: 100110 + second: ThumbFinger1_R + - first: + 1: 100112 + second: ThumbFinger2_L + - first: + 1: 100114 + second: ThumbFinger2_R + - first: + 1: 100116 + second: ThumbFinger3_L + - first: + 1: 100118 + second: ThumbFinger3_R + - first: + 1: 100120 + second: ThumbFinger4_L + - first: + 1: 100122 + second: ThumbFinger4_R + - first: + 1: 100124 + second: Toes_L + - first: + 1: 100126 + second: Toes_R + - first: + 1: 100128 + second: ToesEnd_L + - first: + 1: 100130 + second: ToesEnd_R + - first: + 1: 100132 + second: Wrist_L + - first: + 1: 100134 + second: Wrist_R + - first: + 4: 400000 + second: //RootNode + - first: + 4: 400002 + second: Ankle_L + - first: + 4: 400004 + second: Ankle_R + - first: + 4: 400006 + second: Chest_M + - first: + 4: 400008 + second: Cup_L + - first: + 4: 400010 + second: Cup_R + - first: + 4: 400012 + second: Elbow_L + - first: + 4: 400014 + second: Elbow_R + - first: + 4: 400016 + second: Head_M + - first: + 4: 400018 + second: HeadEnd_M + - first: + 4: 400020 + second: Hip_L + - first: + 4: 400022 + second: Hip_R + - first: + 4: 400024 + second: IndexFinger1_L + - first: + 4: 400026 + second: IndexFinger1_R + - first: + 4: 400028 + second: IndexFinger2_L + - first: + 4: 400030 + second: IndexFinger2_R + - first: + 4: 400032 + second: IndexFinger3_L + - first: + 4: 400034 + second: IndexFinger3_R + - first: + 4: 400036 + second: IndexFinger4_L + - first: + 4: 400038 + second: IndexFinger4_R + - first: + 4: 400040 + second: Knee_L + - first: + 4: 400042 + second: Knee_R + - first: + 4: 400044 + second: MiddleFinger1_L + - first: + 4: 400046 + second: MiddleFinger1_R + - first: + 4: 400048 + second: MiddleFinger2_L + - first: + 4: 400050 + second: MiddleFinger2_R + - first: + 4: 400052 + second: MiddleFinger3_L + - first: + 4: 400054 + second: MiddleFinger3_R + - first: + 4: 400056 + second: MiddleFinger4_L + - first: + 4: 400058 + second: MiddleFinger4_R + - first: + 4: 400060 + second: Neck_M + - first: + 4: 400062 + second: PinkyFinger1_L + - first: + 4: 400064 + second: PinkyFinger1_R + - first: + 4: 400066 + second: PinkyFinger2_L + - first: + 4: 400068 + second: PinkyFinger2_R + - first: + 4: 400070 + second: PinkyFinger3_L + - first: + 4: 400072 + second: PinkyFinger3_R + - first: + 4: 400074 + second: PinkyFinger4_L + - first: + 4: 400076 + second: PinkyFinger4_R + - first: + 4: 400078 + second: RingFinger1_L + - first: + 4: 400080 + second: RingFinger1_R + - first: + 4: 400082 + second: RingFinger2_L + - first: + 4: 400084 + second: RingFinger2_R + - first: + 4: 400086 + second: RingFinger3_L + - first: + 4: 400088 + second: RingFinger3_R + - first: + 4: 400090 + second: RingFinger4_L + - first: + 4: 400092 + second: RingFinger4_R + - first: + 4: 400094 + second: Root + - first: + 4: 400096 + second: Root_M + - first: + 4: 400098 + second: Scapula_L + - first: + 4: 400100 + second: Scapula_R + - first: + 4: 400102 + second: Shoulder_L + - first: + 4: 400104 + second: Shoulder_R + - first: + 4: 400106 + second: Spine1_M + - first: + 4: 400108 + second: ThumbFinger1_L + - first: + 4: 400110 + second: ThumbFinger1_R + - first: + 4: 400112 + second: ThumbFinger2_L + - first: + 4: 400114 + second: ThumbFinger2_R + - first: + 4: 400116 + second: ThumbFinger3_L + - first: + 4: 400118 + second: ThumbFinger3_R + - first: + 4: 400120 + second: ThumbFinger4_L + - first: + 4: 400122 + second: ThumbFinger4_R + - first: + 4: 400124 + second: Toes_L + - first: + 4: 400126 + second: Toes_R + - first: + 4: 400128 + second: ToesEnd_L + - first: + 4: 400130 + second: ToesEnd_R + - first: + 4: 400132 + second: Wrist_L + - first: + 4: 400134 + second: Wrist_R + - first: + 74: 7400000 + second: FeMale_Think + - first: + 95: 9500000 + second: //RootNode externalObjects: {} materials: - importMaterials: 1 + materialImportMode: 1 materialName: 0 materialSearch: 1 materialLocation: 1 @@ -152,14 +435,14 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: - rigImportErrors: - rigImportWarnings: animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 0 animationRotationError: 0.5 animationPositionError: 0.5 @@ -169,8 +452,9 @@ ModelImporter: extraUserProperties: [] clipAnimations: - serializedVersion: 16 - name: AGIA_Idle_think_01 + name: FeMale_Think takeName: Take 001 + internalID: 0 firstFrame: 0 lastFrame: 204 wrapMode: 0 @@ -202,32 +486,52 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 0 importVisibility: 1 importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 0 + fileIdsGeneration: 1 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 + bakeAxisConversion: 0 preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + generateMeshLods: 0 + meshLodGenerationFlags: 0 + maximumMeshLod: -1 + meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 0 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 + strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] importAnimation: 1 - copyAvatar: 1 humanDescription: - serializedVersion: 2 + serializedVersion: 3 human: - boneName: Root_M humanName: Hips @@ -990,23 +1294,20 @@ ModelImporter: armStretch: 0.02 legStretch: 0.02 feetSpacing: 0 + globalScale: 1 rootMotionBoneName: - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} hasTranslationDoF: 0 hasExtraRoot: 1 skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 9088f5532f81dbc498f53c047c65e3a0, - type: 3} + lastHumanDescriptionAvatarSource: {fileID: 9000000, guid: 9088f5532f81dbc498f53c047c65e3a0, type: 3} + autoGenerateAvatarMappingIfUnspecified: 1 animationType: 3 humanoidOversampling: 1 + avatarSetup: 2 + addHumanoidExtraRootOnlyWhenUsingAvatar: 0 + importBlendShapeDeformPercent: 0 + remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: assetBundleName: assetBundleVariant: -AssetOrigin: - serializedVersion: 1 - productId: 150397 - packageName: Anime Girl Idle Animations - packageVersion: 1.2.1 - assetPath: Assets/AnimeGirlIdleAnimations/Animations/01_Idles/AGIA_Idle_think_01.fbx - uploadId: 440789 diff --git a/Assets/03_Models/_Characters/Base/Animations/FeMale_Calm.anim b/Assets/03_Models/_Characters/Base/Animations/FeMale_Calm.anim new file mode 100644 index 00000000..6fb48e33 --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/FeMale_Calm.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2436362e011a1a39b549a3a58bb5dc678f98357249617f426a01de8b6623844c +size 5439617 diff --git a/Assets/03_Models/_Characters/Base/Animations/FeMale_Calm.anim.meta b/Assets/03_Models/_Characters/Base/Animations/FeMale_Calm.anim.meta new file mode 100644 index 00000000..e6f2058a --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/FeMale_Calm.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 41895f0457701ae4e882920cac24774b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Base/Animations/FeMale_Think.anim b/Assets/03_Models/_Characters/Base/Animations/FeMale_Think.anim new file mode 100644 index 00000000..f799cf1c --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/FeMale_Think.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8971657acd72a793a4616522831fa60ffffb16223af87d61f5d385b3b61e43b +size 6521607 diff --git a/Assets/03_Models/_Characters/Base/Animations/FeMale_Think.anim.meta b/Assets/03_Models/_Characters/Base/Animations/FeMale_Think.anim.meta new file mode 100644 index 00000000..2aa309d2 --- /dev/null +++ b/Assets/03_Models/_Characters/Base/Animations/FeMale_Think.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3d1e01a00f6eb794694361bdec061ede +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03_Models/_Characters/Black/Animations/AnimController_Black.controller b/Assets/03_Models/_Characters/Black/Animations/AnimController_Black.controller index 05a9cebf..39f42e36 100644 --- a/Assets/03_Models/_Characters/Black/Animations/AnimController_Black.controller +++ b/Assets/03_Models/_Characters/Black/Animations/AnimController_Black.controller @@ -289,10 +289,13 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -7836363615124988089} - m_Position: {x: 20, y: 260, z: 0} + m_Position: {x: 30, y: 270, z: 0} - serializedVersion: 1 m_State: {fileID: 6909750651427599640} m_Position: {x: 30, y: 190, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8649009563605619873} + m_Position: {x: 330, y: 20, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -342,6 +345,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 1761552763063545065} m_Position: {x: 30, y: 230, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8148812922343360233} + m_Position: {x: 310, y: 110, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -352,3 +358,55 @@ AnimatorStateMachine: m_ExitPosition: {x: 40, y: 360, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 1761552763063545065} +--- !u!1102 &8148812922343360233 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FeMale_Think + 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: 3d1e01a00f6eb794694361bdec061ede, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &8649009563605619873 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Expression_Sad + 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: d4a80f7d815a5c84b9298cd5065dfa8a, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/08_Data/Characters.meta b/Assets/08_Data/Characters.meta new file mode 100644 index 00000000..12a8675d --- /dev/null +++ b/Assets/08_Data/Characters.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6bc4fb4860940c546a9b19ac512217ce +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Characters/CharacterData_Black.asset b/Assets/08_Data/Characters/CharacterData_Black.asset new file mode 100644 index 00000000..568830f6 --- /dev/null +++ b/Assets/08_Data/Characters/CharacterData_Black.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29f4a348c78bcdff6916166adcf1344998d2c22386f1141800089a003eb3dab0 +size 528 diff --git a/Assets/08_Data/Characters/CharacterData_Black.asset.meta b/Assets/08_Data/Characters/CharacterData_Black.asset.meta new file mode 100644 index 00000000..fe2ebf57 --- /dev/null +++ b/Assets/08_Data/Characters/CharacterData_Black.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9a7c7cd0167a1cb4c95044b6c9506d30 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication.meta b/Assets/08_Data/Communication.meta new file mode 100644 index 00000000..648d0c13 --- /dev/null +++ b/Assets/08_Data/Communication.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb2366e81a2fe24469a5e33f3ea48b87 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication/DialogGroups.meta b/Assets/08_Data/Communication/DialogGroups.meta new file mode 100644 index 00000000..9ba15e6f --- /dev/null +++ b/Assets/08_Data/Communication/DialogGroups.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3778ad656a2354d4f80f3bd8375ab3dd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication/DialogGroups/DialogGroup_Black_1.asset b/Assets/08_Data/Communication/DialogGroups/DialogGroup_Black_1.asset new file mode 100644 index 00000000..e9512622 --- /dev/null +++ b/Assets/08_Data/Communication/DialogGroups/DialogGroup_Black_1.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c72193fd6ee836203a9119d7753a6bdab2adb1b81c629658db55ff6f81f9d97 +size 554 diff --git a/Assets/08_Data/Communication/DialogGroups/DialogGroup_Black_1.asset.meta b/Assets/08_Data/Communication/DialogGroups/DialogGroup_Black_1.asset.meta new file mode 100644 index 00000000..e599b353 --- /dev/null +++ b/Assets/08_Data/Communication/DialogGroups/DialogGroup_Black_1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 866fe262ce7303c4e81f7451a8f33e2c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication/DialogNodes.meta b/Assets/08_Data/Communication/DialogNodes.meta new file mode 100644 index 00000000..ebade821 --- /dev/null +++ b/Assets/08_Data/Communication/DialogNodes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 22be3a7183136044b88d3ec6185020b7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication/DialogNodes/DialogNode_Black_1_100.asset b/Assets/08_Data/Communication/DialogNodes/DialogNode_Black_1_100.asset new file mode 100644 index 00000000..ee25b003 --- /dev/null +++ b/Assets/08_Data/Communication/DialogNodes/DialogNode_Black_1_100.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68c7cd4a4bd8323b044ba1268cab88780292083a8b0056a46b074c8eb2439cc3 +size 1207 diff --git a/Assets/08_Data/Communication/DialogNodes/DialogNode_Black_1_100.asset.meta b/Assets/08_Data/Communication/DialogNodes/DialogNode_Black_1_100.asset.meta new file mode 100644 index 00000000..671eb394 --- /dev/null +++ b/Assets/08_Data/Communication/DialogNodes/DialogNode_Black_1_100.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 966cddc5b300b7a43a5a35e1b79d4261 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication/DialogNodes/DialogNode_Black_1_200.asset b/Assets/08_Data/Communication/DialogNodes/DialogNode_Black_1_200.asset new file mode 100644 index 00000000..62db97be --- /dev/null +++ b/Assets/08_Data/Communication/DialogNodes/DialogNode_Black_1_200.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4a90e1d3d22620fd41a28d6c977435b167b1580d62991c37a2e7d5e88e3e3d6 +size 1138 diff --git a/Assets/08_Data/Communication/DialogNodes/DialogNode_Black_1_200.asset.meta b/Assets/08_Data/Communication/DialogNodes/DialogNode_Black_1_200.asset.meta new file mode 100644 index 00000000..2b3634ac --- /dev/null +++ b/Assets/08_Data/Communication/DialogNodes/DialogNode_Black_1_200.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ae707d6886a28fe40ac600f1e0b1a293 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication/Expressions.meta b/Assets/08_Data/Communication/Expressions.meta new file mode 100644 index 00000000..28bf30cc --- /dev/null +++ b/Assets/08_Data/Communication/Expressions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fdc792339ad04aa40a4077d59c178565 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication/Expressions/ExpressionData_Sad.asset b/Assets/08_Data/Communication/Expressions/ExpressionData_Sad.asset new file mode 100644 index 00000000..41c34bc1 --- /dev/null +++ b/Assets/08_Data/Communication/Expressions/ExpressionData_Sad.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fea8cebd671cc0998595ec3080dc9301c06397d8808f3d4370b246ff7dc7980e +size 590 diff --git a/Assets/08_Data/Communication/Expressions/ExpressionData_Sad.asset.meta b/Assets/08_Data/Communication/Expressions/ExpressionData_Sad.asset.meta new file mode 100644 index 00000000..37dc65b7 --- /dev/null +++ b/Assets/08_Data/Communication/Expressions/ExpressionData_Sad.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f767f7fbc174fcb4b8a8c926c6b3bfad +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication/Gestures.meta b/Assets/08_Data/Communication/Gestures.meta new file mode 100644 index 00000000..56fbf640 --- /dev/null +++ b/Assets/08_Data/Communication/Gestures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 965d81c6f432f974e839f6eb927680d1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication/Gestures/GestureData_FeMale_Ask.asset b/Assets/08_Data/Communication/Gestures/GestureData_FeMale_Ask.asset new file mode 100644 index 00000000..5d3b55fd --- /dev/null +++ b/Assets/08_Data/Communication/Gestures/GestureData_FeMale_Ask.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb3bf8268f9dc7eab91dac2ed3e42c9e85274c6e76fb61b217b9b5c870d8d14b +size 595 diff --git a/Assets/08_Data/Communication/Gestures/GestureData_FeMale_Ask.asset.meta b/Assets/08_Data/Communication/Gestures/GestureData_FeMale_Ask.asset.meta new file mode 100644 index 00000000..f5d1f538 --- /dev/null +++ b/Assets/08_Data/Communication/Gestures/GestureData_FeMale_Ask.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8f8f3435d45894f4a9a3eddeefa78403 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication/Gestures/GestureData_FeMale_Think.asset b/Assets/08_Data/Communication/Gestures/GestureData_FeMale_Think.asset new file mode 100644 index 00000000..66494c4d --- /dev/null +++ b/Assets/08_Data/Communication/Gestures/GestureData_FeMale_Think.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:824a015e2f13cd7274d2b768c6ea3b98e44062957c45c68f2d6af6990e13ab02 +size 599 diff --git a/Assets/08_Data/Communication/Gestures/GestureData_FeMale_Think.asset.meta b/Assets/08_Data/Communication/Gestures/GestureData_FeMale_Think.asset.meta new file mode 100644 index 00000000..74ce2d10 --- /dev/null +++ b/Assets/08_Data/Communication/Gestures/GestureData_FeMale_Think.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85679c772e42efb4e99097531ebc09a2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication/Voices.meta b/Assets/08_Data/Communication/Voices.meta new file mode 100644 index 00000000..019e6193 --- /dev/null +++ b/Assets/08_Data/Communication/Voices.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc77386cf0067b54989f365bafde71e4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication/Voices/Voice_Black_1_100.asset b/Assets/08_Data/Communication/Voices/Voice_Black_1_100.asset new file mode 100644 index 00000000..94ec6edc --- /dev/null +++ b/Assets/08_Data/Communication/Voices/Voice_Black_1_100.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e83cb182e98fa888d2d3da538789bf63d371e26807c2d93140df23df29da106 +size 539 diff --git a/Assets/08_Data/Communication/Voices/Voice_Black_1_100.asset.meta b/Assets/08_Data/Communication/Voices/Voice_Black_1_100.asset.meta new file mode 100644 index 00000000..aa718e43 --- /dev/null +++ b/Assets/08_Data/Communication/Voices/Voice_Black_1_100.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 56e0eac4b5267ea4cb5689f51732cbe2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Communication/Voices/Voice_Black_1_200.asset b/Assets/08_Data/Communication/Voices/Voice_Black_1_200.asset new file mode 100644 index 00000000..b76252d6 --- /dev/null +++ b/Assets/08_Data/Communication/Voices/Voice_Black_1_200.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f41f756fb1b5d360f8fbcb7a99c2fff9f9bb88559a35408cc3ea9e493c7db4d +size 539 diff --git a/Assets/08_Data/Communication/Voices/Voice_Black_1_200.asset.meta b/Assets/08_Data/Communication/Voices/Voice_Black_1_200.asset.meta new file mode 100644 index 00000000..464f942e --- /dev/null +++ b/Assets/08_Data/Communication/Voices/Voice_Black_1_200.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 90aaab6ff692a5c44a1ac403af9d9699 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/10_Audio/CharacterVoices.meta b/Assets/10_Audio/CharacterVoices.meta new file mode 100644 index 00000000..76e06ef9 --- /dev/null +++ b/Assets/10_Audio/CharacterVoices.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 32a942573d65c034a8d77d78103d4a6e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/10_Audio/CharacterVoices/Black.meta b/Assets/10_Audio/CharacterVoices/Black.meta new file mode 100644 index 00000000..7feec0e5 --- /dev/null +++ b/Assets/10_Audio/CharacterVoices/Black.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 99623465312830447b371244180d6c5c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/10_Audio/CharacterVoices/Black/Voice_Black_1_100.wav b/Assets/10_Audio/CharacterVoices/Black/Voice_Black_1_100.wav new file mode 100644 index 00000000..465b1aaf --- /dev/null +++ b/Assets/10_Audio/CharacterVoices/Black/Voice_Black_1_100.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a198ed71e993394b6dc5ff84e12b6a95993f04d219a87a5873b6d9ad8071be2f +size 1303086 diff --git a/Assets/10_Audio/CharacterVoices/Black/Voice_Black_1_100.wav.meta b/Assets/10_Audio/CharacterVoices/Black/Voice_Black_1_100.wav.meta new file mode 100644 index 00000000..afa0da92 --- /dev/null +++ b/Assets/10_Audio/CharacterVoices/Black/Voice_Black_1_100.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: cd7e939d21d24e546a3ae6f9cb4e4ef3 +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/Black/Voice_Black_1_200.wav b/Assets/10_Audio/CharacterVoices/Black/Voice_Black_1_200.wav new file mode 100644 index 00000000..8ee794c8 --- /dev/null +++ b/Assets/10_Audio/CharacterVoices/Black/Voice_Black_1_200.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6bcd093de075c2268cd4ac8ed5fb0223b109450f016f42df349f4e4ed05cba2a +size 374012 diff --git a/Assets/10_Audio/CharacterVoices/Black/Voice_Black_1_200.wav.meta b/Assets/10_Audio/CharacterVoices/Black/Voice_Black_1_200.wav.meta new file mode 100644 index 00000000..4befcab8 --- /dev/null +++ b/Assets/10_Audio/CharacterVoices/Black/Voice_Black_1_200.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: c02fadf74479d1e40b6fd1f9525ca822 +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/MainMixer.mixer b/Assets/10_Audio/MainMixer.mixer index 82c693a6..f69c64e7 100644 --- a/Assets/10_Audio/MainMixer.mixer +++ b/Assets/10_Audio/MainMixer.mixer @@ -33,6 +33,20 @@ AudioMixerEffectController: m_SendTarget: {fileID: 0} m_EnableWetMix: 0 m_Bypass: 0 +--- !u!244 &-3488732669823623728 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: a025dd51e9b039247826d2eeb3b41e55 + m_EffectName: Attenuation + m_MixLevel: 91c4187335150e743a8dd8a016586dd8 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 --- !u!241 &24100000 AudioMixerController: m_ObjectHideFlags: 0 @@ -53,11 +67,14 @@ AudioMixerController: name: BGMVolume - guid: a5d0c469bd35ff94ca00b3135bb684dc name: SFXVolume + - guid: ba018e28170e108488d70eb228687256 + name: VoiceVolume m_AudioMixerGroupViews: - guids: - 76cbedbf9831d62489bc8ec0aeee8bc0 - 633b2b5b033e2644a9611ac6616ac2b8 - e2601fab349e03c4dbb7268fc82d28cc + - 94ca16a23f5d4e148b184fb77f1c68e8 name: View m_CurrentViewIndex: 0 m_TargetSnapshot: {fileID: 24500006} @@ -73,6 +90,7 @@ AudioMixerGroupController: m_Children: - {fileID: 2947709149713364024} - {fileID: -9017758440831936497} + - {fileID: 4425733990456606510} m_Volume: deddcfb1a56f5d242acae971cdf41a2a m_Pitch: 2dfaf866b54007249b4ba3cc6add285d m_Send: 00000000000000000000000000000000 @@ -140,3 +158,22 @@ AudioMixerGroupController: m_Mute: 0 m_Solo: 0 m_BypassEffects: 0 +--- !u!243 &4425733990456606510 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Voice + m_AudioMixer: {fileID: 24100000} + m_GroupID: 94ca16a23f5d4e148b184fb77f1c68e8 + m_Children: [] + m_Volume: ba018e28170e108488d70eb228687256 + m_Pitch: acc4e86dc36c837449b39396b11e9940 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: -3488732669823623728} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0