diff --git a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto first.unity b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto first.unity index bb6167e7..7d290bd2 100644 --- a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto first.unity +++ b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto first.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df3547b34290f5075760581922dbe37e195330e003ffece2b0a206d93322ab9b -size 50348 +oid sha256:1cb631d855df4c240e0661f81f4e8516edf8d8bf999512d1d19ff51d6b90aba9 +size 45598 diff --git a/Assets/01_Scenes/blackjack.unity b/Assets/01_Scenes/blackjack.unity index 6fea2fc7..7a97dd29 100644 --- a/Assets/01_Scenes/blackjack.unity +++ b/Assets/01_Scenes/blackjack.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f39ac55a1d93f297206e86d1f91ba89b0acfbfc9ec28a2b722da923bb5c91ccd -size 2306089 +oid sha256:b5006eee2dd72bb0344d001f395405d77c95cda23a3d6e932687232a6728bf4f +size 2308027 diff --git a/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs b/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs index 8557751f..66f0f007 100644 --- a/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs +++ b/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs @@ -1,7 +1,7 @@ using System.Collections; using UnityEngine; using UnityEngine.SceneManagement; -using UnityEngine.UI; +using UnityEngine.Rendering; public class GeppettoRunTriggerZone : MonoBehaviour { @@ -11,39 +11,56 @@ public class GeppettoRunTriggerZone : MonoBehaviour [Header("Geppetto")] public Transform geppetto; public Animator geppettoAnimator; - public string runBoolName = "isRunning"; + + [Header("Animation")] + public string runStateName = "Running"; + public bool playRunAnimationOnTrigger = true; [Header("Move")] public float runSpeed = 5f; - public float rotateSpeed = 8f; - public float fadeDistance = 2f; + public float rotateSpeed = 12f; + public bool keepStartY = true; - [Header("Fade")] - public Image blackFadeImage; - public float fadeDuration = 1f; + [Header("Player Lock")] + public bool lockPlayerOnTrigger = true; + public Transform playerRootToLock; // 비워두면 감지된 VRPlayer root 자동 사용 + public bool lockPlayerRotation = true; + public Behaviour[] disableWhileEvent; // 이동/회전 관련 컴포넌트 넣고 싶으면 여기에 + + [Header("VR Black Fade")] + public Camera vrCamera; + public float fadeDuration = 5f; + public float quadDistance = 0.45f; + public float quadScale = 3f; [Header("Scene")] public string nextSceneName; private Transform targetPlayer; + private Transform lockedPlayerRoot; + private Vector3 lockedPlayerPosition; + private Quaternion lockedPlayerRotation; + private bool started = false; - private bool fading = false; + private bool sceneChanging = false; + private float startY; + + private GameObject blackQuad; + private Material blackMat; private void Start() { - if (blackFadeImage != null) - { - blackFadeImage.gameObject.SetActive(true); + if (geppetto != null) + startY = geppetto.position.y; - Color c = blackFadeImage.color; - c.a = 0f; - blackFadeImage.color = c; - } + if (geppettoAnimator != null) + geppettoAnimator.applyRootMotion = false; - if (geppettoAnimator != null && !string.IsNullOrEmpty(runBoolName)) - { - geppettoAnimator.SetBool(runBoolName, false); - } + CreateBlackQuad(); + SetBlackAlpha(0f); + + if (blackQuad != null) + blackQuad.SetActive(false); } private void OnTriggerEnter(Collider other) @@ -56,24 +73,37 @@ private void OnTriggerEnter(Collider other) Debug.Log("제페토 이벤트 구역 진입: " + other.name); - targetPlayer = other.transform; + lockedPlayerRoot = playerRootToLock != null ? playerRootToLock : other.transform.root; + targetPlayer = lockedPlayerRoot; + + if (lockPlayerOnTrigger && lockedPlayerRoot != null) + { + lockedPlayerPosition = lockedPlayerRoot.position; + lockedPlayerRotation = lockedPlayerRoot.rotation; + + foreach (Behaviour b in disableWhileEvent) + { + if (b != null) + b.enabled = false; + } + + Debug.Log("플레이어 위치 고정: " + lockedPlayerRoot.name); + } + started = true; - if (geppettoAnimator != null && !string.IsNullOrEmpty(runBoolName)) - { - geppettoAnimator.SetBool(runBoolName, true); - } + PlayRunAnimation(); - Collider triggerCollider = GetComponent(); - if (triggerCollider != null) - { - triggerCollider.enabled = false; - } + Collider col = GetComponent(); + if (col != null) + col.enabled = false; + + StartCoroutine(FadeWhileRunning()); } private void Update() { - if (!started || fading) + if (!started || sceneChanging) return; if (geppetto == null || targetPlayer == null) @@ -82,34 +112,70 @@ private void Update() Vector3 dir = targetPlayer.position - geppetto.position; dir.y = 0f; - float distance = dir.magnitude; - if (dir.sqrMagnitude > 0.001f) { - Quaternion targetRotation = Quaternion.LookRotation(dir); + Quaternion targetRot = Quaternion.LookRotation(dir); geppetto.rotation = Quaternion.Slerp( geppetto.rotation, - targetRotation, + targetRot, Time.deltaTime * rotateSpeed ); - geppetto.position += dir.normalized * runSpeed * Time.deltaTime; - } + Vector3 nextPos = geppetto.position + dir.normalized * runSpeed * Time.deltaTime; - if (distance <= fadeDistance) - { - StartCoroutine(FadeOutAndLoadScene()); + if (keepStartY) + nextPos.y = startY; + + geppetto.position = nextPos; } } - private IEnumerator FadeOutAndLoadScene() + private void LateUpdate() { - fading = true; + if (!started || sceneChanging) + return; - if (geppettoAnimator != null && !string.IsNullOrEmpty(runBoolName)) + if (!lockPlayerOnTrigger || lockedPlayerRoot == null) + return; + + lockedPlayerRoot.position = lockedPlayerPosition; + + if (lockPlayerRotation) { - geppettoAnimator.SetBool(runBoolName, false); + lockedPlayerRoot.rotation = lockedPlayerRotation; } + } + + private void PlayRunAnimation() + { + if (!playRunAnimationOnTrigger) + return; + + if (geppettoAnimator == null) + { + Debug.LogWarning("Geppetto Animator가 연결되지 않았습니다."); + return; + } + + if (string.IsNullOrWhiteSpace(runStateName)) + { + Debug.LogWarning("Run State Name이 비어있습니다."); + return; + } + + geppettoAnimator.applyRootMotion = false; + geppettoAnimator.Play(runStateName, 0, 0f); + geppettoAnimator.Update(0f); + + Debug.Log("달리기 애니메이션 즉시 실행: " + runStateName); + } + + private IEnumerator FadeWhileRunning() + { + if (blackQuad != null) + blackQuad.SetActive(true); + + SetBlackAlpha(0f); float t = 0f; @@ -117,17 +183,14 @@ private IEnumerator FadeOutAndLoadScene() { t += Time.deltaTime; float alpha = Mathf.Clamp01(t / fadeDuration); - - if (blackFadeImage != null) - { - Color c = blackFadeImage.color; - c.a = alpha; - blackFadeImage.color = c; - } + SetBlackAlpha(alpha); yield return null; } + SetBlackAlpha(1f); + sceneChanging = true; + if (!string.IsNullOrWhiteSpace(nextSceneName)) { SceneManager.LoadScene(nextSceneName); @@ -138,6 +201,88 @@ private IEnumerator FadeOutAndLoadScene() } } + private void CreateBlackQuad() + { + Camera cam = vrCamera != null ? vrCamera : Camera.main; + + if (cam == null) + { + Debug.LogError("VR Camera가 없습니다. Inspector에 Main Camera를 넣어주세요."); + return; + } + + blackQuad = GameObject.CreatePrimitive(PrimitiveType.Quad); + blackQuad.name = "VR_Black_Fade_Quad"; + + Collider col = blackQuad.GetComponent(); + if (col != null) + Destroy(col); + + blackQuad.transform.SetParent(cam.transform); + blackQuad.transform.localPosition = new Vector3(0f, 0f, quadDistance); + blackQuad.transform.localRotation = Quaternion.identity; + blackQuad.transform.localScale = new Vector3(quadScale, quadScale, 1f); + + MeshRenderer renderer = blackQuad.GetComponent(); + blackMat = CreateTransparentBlackMaterial(); + renderer.material = blackMat; + + renderer.shadowCastingMode = ShadowCastingMode.Off; + renderer.receiveShadows = false; + } + + private Material CreateTransparentBlackMaterial() + { + Shader shader = + Shader.Find("Universal Render Pipeline/Unlit") ?? + Shader.Find("Unlit/Transparent") ?? + Shader.Find("Sprites/Default") ?? + Shader.Find("Standard"); + + Material mat = new Material(shader); + mat.renderQueue = 5000; + + if (mat.HasProperty("_BaseColor")) + mat.SetColor("_BaseColor", new Color(0f, 0f, 0f, 0f)); + + if (mat.HasProperty("_Color")) + mat.SetColor("_Color", new Color(0f, 0f, 0f, 0f)); + + if (mat.HasProperty("_Surface")) + mat.SetFloat("_Surface", 1f); + + if (mat.HasProperty("_Blend")) + mat.SetFloat("_Blend", 0f); + + if (mat.HasProperty("_SrcBlend")) + mat.SetFloat("_SrcBlend", (float)BlendMode.SrcAlpha); + + if (mat.HasProperty("_DstBlend")) + mat.SetFloat("_DstBlend", (float)BlendMode.OneMinusSrcAlpha); + + if (mat.HasProperty("_ZWrite")) + mat.SetFloat("_ZWrite", 0f); + + mat.EnableKeyword("_SURFACE_TYPE_TRANSPARENT"); + mat.EnableKeyword("_ALPHABLEND_ON"); + + return mat; + } + + private void SetBlackAlpha(float alpha) + { + if (blackMat == null) + return; + + Color c = new Color(0f, 0f, 0f, alpha); + + if (blackMat.HasProperty("_BaseColor")) + blackMat.SetColor("_BaseColor", c); + + if (blackMat.HasProperty("_Color")) + blackMat.SetColor("_Color", c); + } + private bool IsPlayer(Collider other) { if (other.CompareTag(playerTag)) diff --git a/Assets/04_Models/Characters/gepto/1@Running (1).fbx.meta b/Assets/04_Models/Characters/gepto/1@Running (1).fbx.meta index fa71a319..795c5b7a 100644 --- a/Assets/04_Models/Characters/gepto/1@Running (1).fbx.meta +++ b/Assets/04_Models/Characters/gepto/1@Running (1).fbx.meta @@ -29,7 +29,36 @@ ModelImporter: animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Running + takeName: mixamo.com + internalID: -203655887218126122 + firstFrame: 0 + lastFrame: 33 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 1 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -82,8 +111,583 @@ ModelImporter: importAnimation: 1 humanDescription: serializedVersion: 3 - human: [] - skeleton: [] + human: + - boneName: mixamorig:Hips + humanName: Hips + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftUpLeg + humanName: LeftUpperLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightUpLeg + humanName: RightUpperLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftLeg + humanName: LeftLowerLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightLeg + humanName: RightLowerLeg + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftFoot + humanName: LeftFoot + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightFoot + humanName: RightFoot + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine + humanName: Spine + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine1 + humanName: Chest + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Neck + humanName: Neck + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Head + humanName: Head + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftShoulder + humanName: LeftShoulder + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightShoulder + humanName: RightShoulder + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftArm + humanName: LeftUpperArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightArm + humanName: RightUpperArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftForeArm + humanName: LeftLowerArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightForeArm + humanName: RightLowerArm + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHand + humanName: LeftHand + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHand + humanName: RightHand + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftToeBase + humanName: LeftToes + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightToeBase + humanName: RightToes + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandThumb1 + humanName: Left Thumb Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandThumb2 + humanName: Left Thumb Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandThumb3 + humanName: Left Thumb Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandIndex1 + humanName: Left Index Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandIndex2 + humanName: Left Index Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandIndex3 + humanName: Left Index Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandMiddle1 + humanName: Left Middle Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandMiddle2 + humanName: Left Middle Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:LeftHandMiddle3 + humanName: Left Middle Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandThumb1 + humanName: Right Thumb Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandThumb2 + humanName: Right Thumb Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandThumb3 + humanName: Right Thumb Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandIndex1 + humanName: Right Index Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandIndex2 + humanName: Right Index Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandIndex3 + humanName: Right Index Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandMiddle1 + humanName: Right Middle Proximal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandMiddle2 + humanName: Right Middle Intermediate + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:RightHandMiddle3 + humanName: Right Middle Distal + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + - boneName: mixamorig:Spine2 + humanName: UpperChest + limit: + min: {x: 0, y: 0, z: 0} + max: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0, z: 0} + length: 0 + modified: 0 + skeleton: + - name: 1@Running (1)(Clone) + parentName: + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: Geppetto_mesh + parentName: 1@Running (1)(Clone) + position: {x: -0, y: 0, z: 0} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Hips + parentName: 1@Running (1)(Clone) + position: {x: -0.030214842, y: 9.613887, z: 0.033661004} + rotation: {x: 0.000000005820766, y: -7.2759576e-10, z: -8.1854523e-10, w: 1} + scale: {x: 1, y: 1.0000001, z: 0.99999994} + - name: mixamorig:RightUpLeg + parentName: mixamorig:Hips + position: {x: 0.86377776, y: -0.5258697, z: 0.03184458} + rotation: {x: 0.0008428678, y: 0.04442268, z: 0.9988327, w: -0.018951666} + scale: {x: 1.0000004, y: 1.0000001, z: 1.0000002} + - name: mixamorig:RightLeg + parentName: mixamorig:RightUpLeg + position: {x: -0.0000000045332746, y: 3.8138907, z: -0.000000006385255} + rotation: {x: -0.11643675, y: 0.0012765735, z: -0.010888432, w: 0.99313766} + scale: {x: 1.000001, y: 1.0000007, z: 1} + - name: mixamorig:RightFoot + parentName: mixamorig:RightLeg + position: {x: 9.1619967e-10, y: 3.9095972, z: 0.000000027820777} + rotation: {x: 0.5785469, y: -0.03564042, z: 0.025316436, w: 0.8144768} + scale: {x: 0.9999998, y: 1, z: 0.9999998} + - name: mixamorig:RightToeBase + parentName: mixamorig:RightFoot + position: {x: 0.000000016500982, y: 2.5196154, z: 0.000000012334458} + rotation: {x: 0.26153183, y: -0.022060953, z: 0.0059793675, w: 0.96492416} + scale: {x: 1.0000002, y: 1.0000005, z: 0.99999994} + - name: mixamorig:RightToe_End + parentName: mixamorig:RightToeBase + position: {x: 0.0000000025725797, y: 1.059159, z: 2.420281e-10} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftUpLeg + parentName: mixamorig:Hips + position: {x: -0.86377776, y: -0.5258697, z: 0.03279238} + rotation: {x: -0.00080828136, y: 0.042586353, z: 0.9989126, w: 0.018959256} + scale: {x: 1.0000001, y: 0.9999999, z: 1.0000001} + - name: mixamorig:LeftLeg + parentName: mixamorig:LeftUpLeg + position: {x: -0.0000000013177436, y: 3.8126686, z: -0.000000009556986} + rotation: {x: -0.11730545, y: -0.0012871623, z: 0.0108964, w: 0.9930353} + scale: {x: 1.0000001, y: 1, z: 1.0000001} + - name: mixamorig:LeftFoot + parentName: mixamorig:LeftLeg + position: {x: 2.2832751e-10, y: 3.912741, z: -0.000000013769222} + rotation: {x: 0.57762784, y: 0.03625042, z: -0.02568947, w: 0.8150902} + scale: {x: 1.0000008, y: 1.0000006, z: 1.0000002} + - name: mixamorig:LeftToeBase + parentName: mixamorig:LeftFoot + position: {x: -0.000000016622003, y: 2.483412, z: -0.000000005412902} + rotation: {x: 0.26612854, y: 0.02452073, z: -0.0067721643, w: 0.9636019} + scale: {x: 1.0000006, y: 1.0000001, z: 1.000001} + - name: mixamorig:LeftToe_End + parentName: mixamorig:LeftToeBase + position: {x: -0.0000000012579154, y: 1.0201212, z: 0.0000000013370115} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Spine + parentName: mixamorig:Hips + position: {x: -0, y: 0.94642514, z: -0.11396488} + rotation: {x: -0.059883676, y: 0.00000000223878, z: -8.6793533e-10, w: 0.99820536} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Spine1 + parentName: mixamorig:Spine + position: {x: -0, y: 1.1121402, z: 0.0000000042307784} + rotation: {x: -0.00000012293458, y: -0.000000009982804, z: -0.000000002301369, w: 1} + scale: {x: 1, y: 1.0000002, z: 0.99999994} + - name: mixamorig:Spine2 + parentName: mixamorig:Spine1 + position: {x: -0, y: 1.2710153, z: 0.0000000037716896} + rotation: {x: -0, y: 0.000000014447545, z: 0.0000000017397205, w: 1} + scale: {x: 1, y: 0.9999998, z: 1} + - name: mixamorig:RightShoulder + parentName: mixamorig:Spine2 + position: {x: 0.587027, y: 1.1695782, z: -0.02382909} + rotation: {x: -0.56501335, y: -0.41715288, z: 0.5843339, w: -0.40656784} + scale: {x: 1, y: 1.0000002, z: 1.0000001} + - name: mixamorig:RightArm + parentName: mixamorig:RightShoulder + position: {x: 0.000000001021107, y: 1.2854745, z: 0.0000000015989053} + rotation: {x: -0.13382243, y: -0.0007522106, z: 0.013344884, w: 0.99091524} + scale: {x: 1.0000002, y: 1.0000002, z: 1.0000002} + - name: mixamorig:RightForeArm + parentName: mixamorig:RightArm + position: {x: 9.324673e-10, y: 2.3851924, z: 0.000000005545687} + rotation: {x: -0.06364562, y: -0.003164384, z: 0.026417874, w: 0.99761784} + scale: {x: 1.0000004, y: 0.99999994, z: 0.99999994} + - name: mixamorig:RightHand + parentName: mixamorig:RightForeArm + position: {x: 0.000000004738908, y: 3.0080159, z: 0.000000055346344} + rotation: {x: -0.067934774, y: -0.0348216, z: -0.040557962, w: -0.99625677} + scale: {x: 1, y: 0.99999994, z: 1.0000001} + - name: mixamorig:RightHandThumb1 + parentName: mixamorig:RightHand + position: {x: -0.26702812, y: 0.53483486, z: 0.21510929} + rotation: {x: 0.08519437, y: 0.021488301, z: 0.29378456, w: 0.951825} + scale: {x: 1.0000001, y: 1.0000006, z: 1.0000004} + - name: mixamorig:RightHandThumb2 + parentName: mixamorig:RightHandThumb1 + position: {x: 0.029688267, y: 0.50738335, z: 0.0000000061815877} + rotation: {x: 0.026333958, y: -0.00006866451, z: -0.03136189, w: 0.9991612} + scale: {x: 1.0000001, y: 0.99999994, z: 1.0000001} + - name: mixamorig:RightHandThumb3 + parentName: mixamorig:RightHandThumb2 + position: {x: -0.036286533, y: 0.57210004, z: 0.000000031503433} + rotation: {x: -0.035105176, y: 0.0009930204, z: 0.020473158, w: 0.9991734} + scale: {x: 1, y: 1.0000002, z: 1.0000004} + - name: mixamorig:RightHandThumb4 + parentName: mixamorig:RightHandThumb3 + position: {x: 0.0065982896, y: 0.48430243, z: -0.000000019955639} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandMiddle1 + parentName: mixamorig:RightHand + position: {x: 0.29314137, y: 1.5905759, z: -0.020043315} + rotation: {x: -0.032110326, y: 0.00026139978, z: 0.01605561, w: -0.9993554} + scale: {x: 1.0000001, y: 1.0000002, z: 1.0000002} + - name: mixamorig:RightHandMiddle2 + parentName: mixamorig:RightHandMiddle1 + position: {x: 0.0018035868, y: 0.6107534, z: 0.000000036632162} + rotation: {x: -0.03608344, y: 0.0005319045, z: -0.0057896515, w: 0.99933195} + scale: {x: 1, y: 0.9999998, z: 0.9999996} + - name: mixamorig:RightHandMiddle3 + parentName: mixamorig:RightHandMiddle2 + position: {x: -0.0064200545, y: 0.52151316, z: -0.000000009006512} + rotation: {x: -0.0288229, y: -0.000027482665, z: -0.0112062935, w: -0.99952173} + scale: {x: 0.99999994, y: 1.0000006, z: 1.0000002} + - name: mixamorig:RightHandMiddle4 + parentName: mixamorig:RightHandMiddle3 + position: {x: 0.0046164757, y: 0.3688754, z: 0.000000008729244} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:RightHandIndex1 + parentName: mixamorig:RightHand + position: {x: -0.29314137, y: 1.7345332, z: 0.017763387} + rotation: {x: 0.04880713, y: -0.0026483715, z: 0.054117788, w: -0.9973375} + scale: {x: 1, y: 1.0000001, z: 0.99999994} + - name: mixamorig:RightHandIndex2 + parentName: mixamorig:RightHandIndex1 + position: {x: -0.0013596636, y: 0.4506455, z: -0.000000009314105} + rotation: {x: 0.026564548, y: -0.000000006053596, z: 0.000000027961502, w: 0.99964714} + scale: {x: 1, y: 1.0000004, z: 1.0000002} + - name: mixamorig:RightHandIndex3 + parentName: mixamorig:RightHandIndex2 + position: {x: -0.00035510957, y: 0.44876263, z: 4.89315e-10} + rotation: {x: 0.03950771, y: 0.000099875164, z: 0.0016289314, w: 0.999218} + scale: {x: 1.0000001, y: 1.0000002, z: 1.0000005} + - name: mixamorig:RightHandIndex4 + parentName: mixamorig:RightHandIndex3 + position: {x: 0.0017147724, y: 0.3108094, z: -0.000000012082171} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Neck + parentName: mixamorig:Spine2 + position: {x: -0, y: 1.4298929, z: 0.00000014585778} + rotation: {x: 0.059883792, y: -0.000000005984603, z: 0.00000000255659, w: 0.99820536} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Head + parentName: mixamorig:Neck + position: {x: -0, y: 0.8053076, z: 0.16258927} + rotation: {x: -0, y: 0.0000000029103828, z: -7.275957e-10, w: 1} + scale: {x: 1, y: 1.0000001, z: 1.0000001} + - name: mixamorig:HeadTop_End + parentName: mixamorig:Head + position: {x: -0, y: 3.640393, z: 0.7349846} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftShoulder + parentName: mixamorig:Spine2 + position: {x: -0.587027, y: 1.1713626, z: -0.038647998} + rotation: {x: 0.5576744, y: -0.422178, z: 0.59027547, w: 0.40291435} + scale: {x: 0.99999994, y: 1.0000001, z: 1.0000001} + - name: mixamorig:LeftArm + parentName: mixamorig:LeftShoulder + position: {x: 5.720281e-10, y: 1.2854745, z: 0.0000000018088507} + rotation: {x: -0.13283518, y: 0.0020416675, z: -0.020236252, w: 0.9909294} + scale: {x: 1.0000006, y: 1.0000006, z: 1.0000004} + - name: mixamorig:LeftForeArm + parentName: mixamorig:LeftArm + position: {x: 0.0000000044714685, y: 2.3845274, z: -0.000000029509076} + rotation: {x: -0.06548629, y: 0.0026390043, z: -0.022353197, w: 0.9975996} + scale: {x: 1.0000002, y: 0.99999994, z: 1.0000004} + - name: mixamorig:LeftHand + parentName: mixamorig:LeftForeArm + position: {x: 0.0000000033268575, y: 3.0081873, z: 0.000000008459108} + rotation: {x: 0.031258434, y: 0.1187388, z: -0.08973473, w: 0.98836815} + scale: {x: 1.0000001, y: 0.9999998, z: 0.99999994} + - name: mixamorig:LeftHandMiddle1 + parentName: mixamorig:LeftHand + position: {x: -0.07823192, y: 0.52654785, z: 0.05281324} + rotation: {x: -0.030609356, y: -0.0031791846, z: 0.08832582, w: 0.9956162} + scale: {x: 1.0000001, y: 1.0000002, z: 1} + - name: mixamorig:LeftHandMiddle2 + parentName: mixamorig:LeftHandMiddle1 + position: {x: -0.0023782456, y: 1.3361262, z: 0.00000004665283} + rotation: {x: -0.009518965, y: -0.00000019185242, z: -0.00000003064633, w: 0.9999547} + scale: {x: 1, y: 1.0000001, z: 1.0000001} + - name: mixamorig:LeftHandMiddle3 + parentName: mixamorig:LeftHandMiddle2 + position: {x: 0.0032234038, y: 0.59199274, z: -3.2290245e-10} + rotation: {x: 0.008998337, y: 0.00000009340913, z: -4.8921217e-10, w: 0.9999595} + scale: {x: 1, y: 1.0000001, z: 1.0000002} + - name: mixamorig:LeftHandMiddle4 + parentName: mixamorig:LeftHandMiddle3 + position: {x: -0.00084515585, y: 0.6730149, z: 0.0000000247462} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandThumb1 + parentName: mixamorig:LeftHand + position: {x: 0.13990453, y: 0.5441334, z: 0.28414315} + rotation: {x: 0.19799559, y: -0.009531243, z: -0.24916264, w: 0.94795823} + scale: {x: 0.99999994, y: 1.0000005, z: 1.0000002} + - name: mixamorig:LeftHandThumb2 + parentName: mixamorig:LeftHandThumb1 + position: {x: -0.027707927, y: 0.50291383, z: 0.000000008939973} + rotation: {x: 0.035434958, y: -0.000000052154057, z: 0.00000001117587, w: 0.99937195} + scale: {x: 1, y: 0.99999994, z: 1} + - name: mixamorig:LeftHandThumb3 + parentName: mixamorig:LeftHandThumb2 + position: {x: -0.012625121, y: 0.57871366, z: -0.000000017303298} + rotation: {x: -0.010462573, y: -0.0000972583, z: 0.012249584, w: 0.9998703} + scale: {x: 1.0000001, y: 1.0000006, z: 1.0000005} + - name: mixamorig:LeftHandThumb4 + parentName: mixamorig:LeftHandThumb3 + position: {x: 0.040333092, y: 0.49141943, z: -0.000000015440474} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:LeftHandIndex1 + parentName: mixamorig:LeftHand + position: {x: 0.07823186, y: 1.9446152, z: 0.018172108} + rotation: {x: -0.03229588, y: -0.0029266179, z: 0.079415515, w: 0.996314} + scale: {x: 0.99999994, y: 1.0000002, z: 0.99999994} + - name: mixamorig:LeftHandIndex2 + parentName: mixamorig:LeftHandIndex1 + position: {x: 0.0061918637, y: 0.39209697, z: -0.0000000059397736} + rotation: {x: 0.024974814, y: 0.000000053085373, z: 0.0000000353757, w: 0.99968815} + scale: {x: 1.0000001, y: 1, z: 1.0000001} + - name: mixamorig:LeftHandIndex3 + parentName: mixamorig:LeftHandIndex2 + position: {x: -0.0015052023, y: 0.38157284, z: 0.000000018463192} + rotation: {x: 0.021164883, y: -0.00000003741624, z: -0.0000000884418, w: 0.99977607} + scale: {x: 1, y: 1.0000001, z: 1} + - name: mixamorig:LeftHandIndex4 + parentName: mixamorig:LeftHandIndex3 + position: {x: -0.0046866676, y: 0.23628014, z: 0.0000000017981687} + rotation: {x: 0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1, z: 1} armTwist: 0.5 foreArmTwist: 0.5 upperLegTwist: 0.5 diff --git a/Assets/04_Models/Characters/gepto/gepto.controller b/Assets/04_Models/Characters/gepto/gepto.controller index 434f7b0a..dcd19372 100644 --- a/Assets/04_Models/Characters/gepto/gepto.controller +++ b/Assets/04_Models/Characters/gepto/gepto.controller @@ -50,8 +50,7 @@ AnimatorState: m_Name: mixamo_com m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: -173278789067975719} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -67,31 +66,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-173278789067975719 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: isRunning - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 6143119609231041675} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.90625 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -100,13 +74,7 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: gepto serializedVersion: 5 - m_AnimatorParameters: - - m_Name: isRunning - m_Type: 4 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_AnimatorParameters: [] m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -127,7 +95,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Running (1) + m_Name: Running m_Speed: 1 m_CycleOffset: 0 m_Transitions: []