From 510d027d6bb034a17894efe8d738d43be9064477 Mon Sep 17 00:00:00 2001 From: HIHIHIHIHIHIzz Date: Thu, 25 Jun 2026 17:37:23 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=A0=9C=ED=8E=98=ED=86=A0=EA=B0=80=20?= =?UTF-8?q?=EC=95=88=EA=BA=BC=EC=A7=80=EA=B3=A0=20=EC=95=88=EC=BC=9C?= =?UTF-8?q?=EC=A7=80=EA=B3=A0=20=EC=95=88=EC=B0=BE=EA=B3=A0=20=EC=95=88?= =?UTF-8?q?=EB=8B=AC=EB=A6=AC=EA=B3=A0=20=EC=95=88=EA=B8=B0=EB=BB=90?= =?UTF-8?q?=ED=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/MazeRoom.unity | 4 +- Assets/02_Scripts/MazeRoom/zepettoTrigger.cs | 2 +- .../zepeto/zepeto Walking.fbx.meta | 556 +++++++++++++++++- .../zepeto/zepeto joy.fbx.meta | 556 +++++++++++++++++- .../MazeRoomEffectModel/zepeto/zepeto1.vfx | 29 +- .../zepeto/zepetoController.controller | 116 ++-- 6 files changed, 1166 insertions(+), 97 deletions(-) diff --git a/Assets/01_Scenes/MazeRoom.unity b/Assets/01_Scenes/MazeRoom.unity index aaeb5d7f..d7e2943c 100644 --- a/Assets/01_Scenes/MazeRoom.unity +++ b/Assets/01_Scenes/MazeRoom.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47ee9d224e1fbe0c09aeb16aa0390ffdef9a0255ece32d7609e80cba6e944dae -size 3343228 +oid sha256:aeb3d59a18b6a33575598f737931085b02561dba8dc1e83a9b77f626b75423e5 +size 3357599 diff --git a/Assets/02_Scripts/MazeRoom/zepettoTrigger.cs b/Assets/02_Scripts/MazeRoom/zepettoTrigger.cs index 0f28d113..4903f8aa 100644 --- a/Assets/02_Scripts/MazeRoom/zepettoTrigger.cs +++ b/Assets/02_Scripts/MazeRoom/zepettoTrigger.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.VFX; -public class zepe : MonoBehaviour +public class ZepettoTrigger : MonoBehaviour { public VisualEffect vfx; public Animator zepettoAnimator; diff --git a/Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepeto Walking.fbx.meta b/Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepeto Walking.fbx.meta index efc5d819..2aa90f1f 100644 --- a/Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepeto Walking.fbx.meta +++ b/Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepeto Walking.fbx.meta @@ -22,14 +22,43 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 3 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Walking + takeName: mixamo.com + internalID: -203655887218126122 + firstFrame: 0 + lastFrame: 31 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 1 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 0 + keepOriginalPositionY: 0 + keepOriginalPositionXZ: 0 + heightFromFeet: 1 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -82,8 +111,521 @@ 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:LeftEye + humanName: LeftEye + 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:RightEye + humanName: RightEye + 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: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: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: zepeto Walking(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: Peasant_Man + parentName: zepeto Walking(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: zepeto Walking(Clone) + position: {x: -0.005309209, y: 0.9131701, z: 0.009204312} + rotation: {x: -7.275429e-10, y: 0.00000006402843, z: -0.0000008205916, w: 1} + scale: {x: 0.99999994, y: 1, z: 1} + - name: mixamorig:Spine + parentName: mixamorig:Hips + position: {x: -0.0011691913, y: 0.106810376, z: 0.0037344168} + rotation: {x: 0.000606123, y: -0.00000006644153, z: 0.0000008204501, w: 0.9999998} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Spine1 + parentName: mixamorig:Spine + position: {x: 1.6009808e-13, y: 0.13893229, z: 8.9061203e-10} + rotation: {x: -0.013103537, y: -0.0000000029253187, z: 0.000000001238632, w: 0.99991417} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Spine2 + parentName: mixamorig:Spine1 + position: {x: 2.8808612e-13, y: 0.14768194, z: -2.1469077e-10} + rotation: {x: 0.012497462, y: 0.000000008740701, z: -7.094149e-10, w: 0.9999219} + scale: {x: 1, y: 0.99999994, z: 1} + - name: mixamorig:Neck + parentName: mixamorig:Spine2 + position: {x: -1.7969442e-12, y: 0.35332292, z: -0.03247365} + rotation: {x: 0.0000000037252903, y: 0.0000000029103786, z: -0.0000000010004444, w: 1} + scale: {x: 1, y: 0.99999994, z: 1} + - name: mixamorig:Head + parentName: mixamorig:Neck + position: {x: 3.1349565e-13, y: 0.16905738, z: 0.011955245} + rotation: {x: -0.000000007450581, y: -0.0000000050931663, z: 0.0000000010459191, w: 1} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:HeadTop_End + parentName: mixamorig:Head + position: {x: -5.48851e-15, y: 0.22166023, z: 0.02225315} + rotation: {x: -0, y: -0, z: -3.7947046e-17, w: 1} + scale: {x: 1, y: 0.99999994, z: 1} + - name: mixamorig:LeftEye + parentName: mixamorig:Head + position: {x: -0.05478759, y: 0.072866336, z: 0.119323} + rotation: {x: -0, y: -0, z: -3.7947046e-17, w: 1} + scale: {x: 1, y: 0.99999994, z: 1} + - name: mixamorig:RightEye + parentName: mixamorig:Head + position: {x: 0.05478764, y: 0.07286465, z: 0.11932254} + rotation: {x: -0, y: -0, z: -3.7947046e-17, w: 1} + scale: {x: 1, y: 0.99999994, z: 1} + - name: mixamorig:LeftShoulder + parentName: mixamorig:Spine2 + position: {x: -0.12896392, y: 0.2661254, z: -0.04508966} + rotation: {x: 0.5387754, y: -0.45795324, z: 0.57644624, w: 0.40952373} + scale: {x: 1.0000001, y: 0.9999999, z: 1.0000001} + - name: mixamorig:LeftArm + parentName: mixamorig:LeftShoulder + position: {x: -0, y: 0.19714853, z: 5.684342e-16} + rotation: {x: -0.12387237, y: 0.0053793336, z: -0.043050166, w: 0.9913493} + scale: {x: 0.99999976, y: 1.0000004, z: 1.0000002} + - name: mixamorig:LeftForeArm + parentName: mixamorig:LeftArm + position: {x: 2.2113093e-11, y: 0.2417811, z: -8.5265126e-16} + rotation: {x: 0.000000029802315, y: 0.000000030267977, z: 0.0000000044237813, w: 1} + scale: {x: 1.0000005, y: 1.0000006, z: 1.0000004} + - name: mixamorig:LeftHand + parentName: mixamorig:LeftForeArm + position: {x: -4.049448e-11, y: 0.27144986, z: 2.842171e-16} + rotation: {x: -0, y: -0.000000051688392, z: -0.00000006327171, w: 1} + scale: {x: 1.0000002, y: 1.0000004, z: 1.0000005} + - name: mixamorig:LeftHandThumb1 + parentName: mixamorig:LeftHand + position: {x: 0.058908515, y: 0.06538308, z: 0.05056809} + rotation: {x: 0.06696561, y: -0.008153076, z: -0.34921232, w: 0.9346122} + scale: {x: 1.0000002, y: 1.0000004, z: 1.0000004} + - name: mixamorig:LeftHandThumb2 + parentName: mixamorig:LeftHandThumb1 + position: {x: -4.9285376e-12, y: 0.049249753, z: -7.608776e-12} + rotation: {x: 0.000000014901159, y: 0.000000029802319, z: -0.00000007823109, w: 1} + scale: {x: 1, y: 1.0000002, z: 1.0000004} + - name: mixamorig:LeftHandThumb3 + parentName: mixamorig:LeftHandThumb2 + position: {x: -4.2048496e-12, y: 0.04203451, z: -6.4918023e-12} + rotation: {x: -0.000000074505806, y: -0.000000007450583, z: 0.00000017043202, w: 1} + scale: {x: 1.0000001, y: 1.0000005, z: 1.0000006} + - name: mixamorig:LeftHandThumb4 + parentName: mixamorig:LeftHandThumb3 + position: {x: -6.8296657e-12, y: 0.06824805, z: -1.05387695e-11} + rotation: {x: -0, y: -0, z: -5.551117e-16, w: 1} + scale: {x: 0.99999994, y: 1.0000006, z: 1.0000004} + - name: mixamorig:LeftHandIndex1 + parentName: mixamorig:LeftHand + position: {x: 4.857892e-12, y: 0.16444632, z: 4.4669093e-10} + rotation: {x: -0, y: -0, z: -0, w: 1} + scale: {x: 1.0000001, y: 1.0000005, z: 1.0000004} + - name: mixamorig:LeftHandIndex2 + parentName: mixamorig:LeftHandIndex1 + position: {x: 2.7555913e-12, y: 0.04820471, z: -5.684342e-16} + rotation: {x: -0, y: -0, z: -0, w: 1} + scale: {x: 1.0000001, y: 1.0000002, z: 1.0000002} + - name: mixamorig:LeftHandIndex3 + parentName: mixamorig:LeftHandIndex2 + position: {x: -1.35331035e-11, y: 0.06383169, z: 1.1368684e-15} + rotation: {x: -0, y: -0, z: -0, w: 1} + scale: {x: 1.0000001, y: 1.0000001, z: 1.0000002} + - name: mixamorig:LeftHandIndex4 + parentName: mixamorig:LeftHandIndex3 + position: {x: -1.09798125e-11, y: 0.051789217, z: 1.7053025e-15} + rotation: {x: -0, y: -0, z: -0, w: 1} + scale: {x: 1.0000001, y: 1.0000001, z: 1.0000002} + - name: mixamorig:RightShoulder + parentName: mixamorig:Spine2 + position: {x: 0.12896344, y: 0.26612493, z: -0.04508966} + rotation: {x: -0.5387768, y: -0.45795155, z: 0.5764474, w: -0.40952215} + scale: {x: 1.0000001, y: 1.0000004, z: 1.0000004} + - name: mixamorig:RightArm + parentName: mixamorig:RightShoulder + position: {x: 2.6645352e-17, y: 0.1971493, z: 2.842171e-16} + rotation: {x: 0.123875245, y: 0.005379364, z: -0.04305002, w: -0.991349} + scale: {x: 1.0000001, y: 1, z: 0.99999994} + - name: mixamorig:RightForeArm + parentName: mixamorig:RightArm + position: {x: -4.5322855e-13, y: 0.241781, z: -5.684342e-16} + rotation: {x: -0, y: -0, z: 0.0000000012805684, w: -1} + scale: {x: 1.0000004, y: 1.0000006, z: 1.0000002} + - name: mixamorig:RightHand + parentName: mixamorig:RightForeArm + position: {x: -1.6544987e-13, y: 0.27145, z: 8.5265126e-16} + rotation: {x: -0, y: 0, z: -0, w: -1} + scale: {x: 1.0000001, y: 1, z: 1} + - name: mixamorig:RightHandThumb1 + parentName: mixamorig:RightHand + position: {x: -0.05890853, y: 0.065383, z: 0.05057} + rotation: {x: 0.06801074, y: 0.0053404146, z: 0.34899706, w: 0.9346374} + scale: {x: 1.0000001, y: 1.0000002, z: 1.0000002} + - name: mixamorig:RightHandThumb2 + parentName: mixamorig:RightHandThumb1 + position: {x: -7.105427e-17, y: 0.049246192, z: 8.5265126e-16} + rotation: {x: 0.00009118018, y: 0.00000014901158, z: 0.0000045141196, w: 1} + scale: {x: 1.0000001, y: 1, z: 1.0000004} + - name: mixamorig:RightHandThumb3 + parentName: mixamorig:RightHandThumb2 + position: {x: -1.4210854e-16, y: 0.042034954, z: 2.842171e-16} + rotation: {x: -0.000013515337, y: -0.00000005247457, z: -0.0000041844287, w: 1} + scale: {x: 0.99999994, y: 0.9999998, z: 0.9999998} + - name: mixamorig:RightHandThumb4 + parentName: mixamorig:RightHandThumb3 + position: {x: -4.405365e-15, y: 0.06824871, z: 1.364242e-14} + rotation: {x: -0, y: -0, z: 2.0028312e-13, w: 1} + scale: {x: 1.0000002, y: 1.0000002, z: 1.0000002} + - name: mixamorig:RightHandIndex1 + parentName: mixamorig:RightHand + position: {x: -9.991119e-14, y: 0.16444598, z: 2.2737367e-15} + rotation: {x: 0, y: -0, z: -0, w: -1} + scale: {x: 1.0000001, y: 1, z: 1.0000001} + - name: mixamorig:RightHandIndex2 + parentName: mixamorig:RightHandIndex1 + position: {x: -2.9212188e-14, y: 0.048201997, z: -5.684342e-16} + rotation: {x: -0, y: -0, z: 0, w: -1} + scale: {x: 1, y: 1, z: 1.0000002} + - name: mixamorig:RightHandIndex3 + parentName: mixamorig:RightHandIndex2 + position: {x: -3.8697933e-14, y: 0.063829996, z: 1.1368684e-15} + rotation: {x: -0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1.0000001, z: 1.0000004} + - name: mixamorig:RightHandIndex4 + parentName: mixamorig:RightHandIndex3 + position: {x: -3.1352698e-14, y: 0.05179, z: -2.842171e-16} + rotation: {x: -0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1.0000001, z: 1.0000002} + - name: mixamorig:LeftUpLeg + parentName: mixamorig:Hips + position: {x: -0.14073023, y: -0.07904136, z: -0.01462963} + rotation: {x: -0.0001254812, y: 0.06519035, z: 0.997871, w: -0.0019206557} + scale: {x: 1.0000006, y: 1.0000007, z: 1.0000002} + - name: mixamorig:LeftLeg + parentName: mixamorig:LeftUpLeg + position: {x: -1.7040555e-11, y: 0.34295353, z: 0.0000000020225621} + rotation: {x: -0.17438509, y: 0.0000012487582, z: -0.000027978653, w: 0.98467755} + scale: {x: 1, y: 0.9999997, z: 1.0000004} + - name: mixamorig:LeftFoot + parentName: mixamorig:LeftLeg + position: {x: -1.0552327e-10, y: 0.3062599, z: 0.0000000010070607} + rotation: {x: 0.51747537, y: 0.021565666, z: -0.026916994, w: 0.8550027} + scale: {x: 1.0000004, y: 1.0000002, z: 1.0000001} + - name: mixamorig:LeftToeBase + parentName: mixamorig:LeftFoot + position: {x: 1.3549162e-12, y: 0.265, z: -6.1533e-14} + rotation: {x: 0.3442037, y: 0.0144514125, z: 0.009241731, w: 0.93873835} + scale: {x: 1, y: 0.9999997, z: 1.0000002} + - name: mixamorig:LeftToe_End + parentName: mixamorig:LeftToeBase + position: {x: 3.0112197e-11, y: 0.1525861, z: -1.2034646e-10} + rotation: {x: -0, y: -0, z: 4.6566123e-10, w: 1} + scale: {x: 1.0000001, y: 1.0000001, z: 0.99999994} + - name: mixamorig:RightUpLeg + parentName: mixamorig:Hips + position: {x: 0.14073054, y: -0.07904046, z: -0.014629596} + rotation: {x: 0.00012532028, y: 0.06519035, z: 0.997871, w: 0.0019184158} + scale: {x: 1.0000002, y: 1, z: 1} + - name: mixamorig:RightLeg + parentName: mixamorig:RightUpLeg + position: {x: -8.8817837e-17, y: 0.34295347, z: 7.105427e-17} + rotation: {x: -0.17438482, y: -0.0000011798257, z: 0.000026182935, w: 0.9846776} + scale: {x: 1.0000001, y: 1.0000005, z: 1} + - name: mixamorig:RightFoot + parentName: mixamorig:RightLeg + position: {x: 2.664535e-16, y: 0.30626073, z: -1.7763567e-16} + rotation: {x: 0.51747376, y: -0.021566214, z: 0.026916957, w: 0.8550038} + scale: {x: 1.0000008, y: 1.0000006, z: 1.0000002} + - name: mixamorig:RightToeBase + parentName: mixamorig:RightFoot + position: {x: -1.9539925e-16, y: 0.265, z: 7.105427e-17} + rotation: {x: 0.34420156, y: -0.014481009, z: -0.009161458, w: 0.9387395} + scale: {x: 1.0000002, y: 1.0000002, z: 1} + - name: mixamorig:RightToe_End + parentName: mixamorig:RightToeBase + position: {x: 1.4210854e-16, y: 0.15258999, z: 1.8145207e-16} + rotation: {x: -0, y: -0, z: 4.6566123e-10, w: 1} + scale: {x: 1.0000004, y: 1.0000002, z: 1.0000002} armTwist: 0.5 foreArmTwist: 0.5 upperLegTwist: 0.5 @@ -94,13 +636,13 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 3 humanoidOversampling: 1 - avatarSetup: 0 + avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 importBlendShapeDeformPercent: 1 remapMaterialsIfMaterialImportModeIsNone: 0 diff --git a/Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepeto joy.fbx.meta b/Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepeto joy.fbx.meta index 34a82d3e..c76567bc 100644 --- a/Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepeto joy.fbx.meta +++ b/Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepeto joy.fbx.meta @@ -22,14 +22,43 @@ ModelImporter: animationDoRetargetingWarnings: 0 importAnimatedCustomProperties: 0 importConstraints: 0 - animationCompression: 1 + animationCompression: 3 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] extraUserProperties: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: Joy + takeName: mixamo.com + internalID: -203655887218126122 + firstFrame: 0 + lastFrame: 311 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 1 + loopBlendPositionY: 0 + loopBlendPositionXZ: 1 + keepOriginalOrientation: 0 + keepOriginalPositionY: 0 + keepOriginalPositionXZ: 0 + heightFromFeet: 1 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 0 meshes: lODScreenPercentages: [] @@ -82,8 +111,521 @@ 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:LeftEye + humanName: LeftEye + 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:RightEye + humanName: RightEye + 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: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: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: zepeto joy(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: Peasant_Man + parentName: zepeto joy(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: zepeto joy(Clone) + position: {x: 0.0030639991, y: 0.91316986, z: 0.014629602} + rotation: {x: 0.000000005820817, y: 0.00000006220944, z: -0.0000008200914, w: 1} + scale: {x: 1, y: 0.99999994, z: 1} + - name: mixamorig:Spine + parentName: mixamorig:Hips + position: {x: -0.0011691913, y: 0.106810376, z: 0.0037344168} + rotation: {x: 0.00060613395, y: -0.00000006316653, z: 0.0000008217669, w: 0.9999998} + scale: {x: 1, y: 1, z: 1} + - name: mixamorig:Spine1 + parentName: mixamorig:Spine + position: {x: 1.6009808e-13, y: 0.13893229, z: 8.9061203e-10} + rotation: {x: -0.013103564, y: 1.5141666e-11, z: -0.000000001273227, w: 0.99991417} + scale: {x: 0.99999994, y: 1, z: 0.99999994} + - name: mixamorig:Spine2 + parentName: mixamorig:Spine1 + position: {x: 2.8808612e-13, y: 0.14768194, z: -2.1469077e-10} + rotation: {x: 0.012497462, y: 0.0000000014641758, z: -7.09336e-10, w: 0.9999219} + scale: {x: 1, y: 1, z: 0.9999999} + - name: mixamorig:Neck + parentName: mixamorig:Spine2 + position: {x: -1.7969442e-12, y: 0.35332292, z: -0.03247365} + rotation: {x: 0.000000023283064, y: 0.000000004365568, z: 0.0000000010913939, w: 1} + scale: {x: 1, y: 1.0000001, z: 0.9999999} + - name: mixamorig:Head + parentName: mixamorig:Neck + position: {x: 3.1349565e-13, y: 0.16905738, z: 0.011955245} + rotation: {x: -0.000000014901161, y: -0.0000000036379775, z: -0.000000002137313, w: 1} + scale: {x: 1, y: 0.99999994, z: 0.99999994} + - name: mixamorig:HeadTop_End + parentName: mixamorig:Head + position: {x: -5.48851e-15, y: 0.22166023, z: 0.02225315} + rotation: {x: -0, y: -0, z: -5.421009e-17, w: 1} + scale: {x: 0.99999994, y: 1, z: 1} + - name: mixamorig:LeftEye + parentName: mixamorig:Head + position: {x: -0.05478759, y: 0.072866336, z: 0.119323} + rotation: {x: -0, y: -0, z: -5.421009e-17, w: 1} + scale: {x: 0.99999994, y: 1, z: 1} + - name: mixamorig:RightEye + parentName: mixamorig:Head + position: {x: 0.05478764, y: 0.07286465, z: 0.11932254} + rotation: {x: -0, y: -0, z: -5.421009e-17, w: 1} + scale: {x: 0.99999994, y: 1, z: 1} + - name: mixamorig:LeftShoulder + parentName: mixamorig:Spine2 + position: {x: -0.12896392, y: 0.2661254, z: -0.04508966} + rotation: {x: 0.5387753, y: -0.45795324, z: 0.57644624, w: 0.4095238} + scale: {x: 1.0000001, y: 1.0000004, z: 1.0000004} + - name: mixamorig:LeftArm + parentName: mixamorig:LeftShoulder + position: {x: -0, y: 0.19714853, z: 5.684342e-16} + rotation: {x: -0.12387231, y: 0.005379274, z: -0.043050196, w: 0.9913493} + scale: {x: 1.0000001, y: 1.0000004, z: 1.0000001} + - name: mixamorig:LeftForeArm + parentName: mixamorig:LeftArm + position: {x: 2.2113093e-11, y: 0.2417811, z: -8.5265126e-16} + rotation: {x: 0.000000059604638, y: -0.00000005634501, z: -0.0000000069267108, w: 1} + scale: {x: 1.0000004, y: 1.0000005, z: 1.0000004} + - name: mixamorig:LeftHand + parentName: mixamorig:LeftForeArm + position: {x: -4.049448e-11, y: 0.27144986, z: 2.842171e-16} + rotation: {x: 0.00000006705522, y: 0.000000036321577, z: -0.000000026077034, w: 1} + scale: {x: 1.0000002, y: 1.0000004, z: 1.0000002} + - name: mixamorig:LeftHandThumb1 + parentName: mixamorig:LeftHand + position: {x: 0.058908515, y: 0.06538308, z: 0.05056809} + rotation: {x: 0.06696468, y: -0.008152521, z: -0.34921223, w: 0.9346122} + scale: {x: 1.0000002, y: 1.0000005, z: 1.0000006} + - name: mixamorig:LeftHandThumb2 + parentName: mixamorig:LeftHandThumb1 + position: {x: -4.9285376e-12, y: 0.049249753, z: -7.608776e-12} + rotation: {x: 0.00000013411045, y: -0.00000008940697, z: -0.000000109896064, w: 1} + scale: {x: 1.0000002, y: 1.0000007, z: 1.0000002} + - name: mixamorig:LeftHandThumb3 + parentName: mixamorig:LeftHandThumb2 + position: {x: -4.2048496e-12, y: 0.04203451, z: -6.4918023e-12} + rotation: {x: -0.000000014901174, y: 0.000000081956415, z: 0.00000015553086, w: 1} + scale: {x: 1.0000004, y: 1.0000001, z: 1} + - name: mixamorig:LeftHandThumb4 + parentName: mixamorig:LeftHandThumb3 + position: {x: -6.8296657e-12, y: 0.06824805, z: -1.05387695e-11} + rotation: {x: -0, y: -0, z: 1.2212468e-15, w: 1} + scale: {x: 0.99999994, y: 1, z: 1.0000002} + - name: mixamorig:LeftHandIndex1 + parentName: mixamorig:LeftHand + position: {x: 4.857892e-12, y: 0.16444632, z: 4.4669093e-10} + rotation: {x: -0, y: -0, z: -6.5919466e-16, w: 1} + scale: {x: 1.0000001, y: 1.0000004, z: 1.0000004} + - name: mixamorig:LeftHandIndex2 + parentName: mixamorig:LeftHandIndex1 + position: {x: 2.7555913e-12, y: 0.04820471, z: -5.684342e-16} + rotation: {x: -0, y: -0, z: -0, w: 1} + scale: {x: 1.0000002, y: 1.0000005, z: 1.0000002} + - name: mixamorig:LeftHandIndex3 + parentName: mixamorig:LeftHandIndex2 + position: {x: -1.35331035e-11, y: 0.06383169, z: 1.1368684e-15} + rotation: {x: -0, y: -0, z: -0, w: 1} + scale: {x: 1.0000001, y: 1.0000005, z: 1.0000004} + - name: mixamorig:LeftHandIndex4 + parentName: mixamorig:LeftHandIndex3 + position: {x: -1.09798125e-11, y: 0.051789217, z: 1.7053025e-15} + rotation: {x: -0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1.0000005, z: 1.0000004} + - name: mixamorig:RightShoulder + parentName: mixamorig:Spine2 + position: {x: 0.12896344, y: 0.26612493, z: -0.04508966} + rotation: {x: -0.5387768, y: -0.45795158, z: 0.57644737, w: -0.40952212} + scale: {x: 1.0000004, y: 1.0000002, z: 1.0000002} + - name: mixamorig:RightArm + parentName: mixamorig:RightShoulder + position: {x: 2.6645352e-17, y: 0.1971493, z: 2.842171e-16} + rotation: {x: 0.123875216, y: 0.0053794235, z: -0.04305002, w: -0.991349} + scale: {x: 0.9999997, y: 0.9999995, z: 0.99999964} + - name: mixamorig:RightForeArm + parentName: mixamorig:RightArm + position: {x: -4.5322855e-13, y: 0.241781, z: -5.684342e-16} + rotation: {x: -0, y: -0, z: -0.0000000010477378, w: 1} + scale: {x: 1, y: 1.0000002, z: 1.0000001} + - name: mixamorig:RightHand + parentName: mixamorig:RightForeArm + position: {x: -1.6544987e-13, y: 0.27145, z: 8.5265126e-16} + rotation: {x: -0, y: -0, z: -0, w: 1} + scale: {x: 1.0000002, y: 1.0000004, z: 1.0000002} + - name: mixamorig:RightHandThumb1 + parentName: mixamorig:RightHand + position: {x: -0.05890853, y: 0.065383, z: 0.05057} + rotation: {x: 0.068013094, y: 0.005341815, z: 0.3489971, w: 0.93463725} + scale: {x: 0.9999999, y: 0.9999999, z: 1} + - name: mixamorig:RightHandThumb2 + parentName: mixamorig:RightHandThumb1 + position: {x: -7.105427e-17, y: 0.049246192, z: 8.5265126e-16} + rotation: {x: 0.00009116528, y: 0.000000052154054, z: 0.000004527158, w: 1} + scale: {x: 0.9999999, y: 0.99999964, z: 0.99999946} + - name: mixamorig:RightHandThumb3 + parentName: mixamorig:RightHandThumb2 + position: {x: -1.4210854e-16, y: 0.042034954, z: 2.842171e-16} + rotation: {x: -0.0000134855345, y: 0.000000059280143, z: -0.000004229141, w: 1} + scale: {x: 1.0000002, y: 1.0000005, z: 1.0000005} + - name: mixamorig:RightHandThumb4 + parentName: mixamorig:RightHandThumb3 + position: {x: -4.405365e-15, y: 0.06824871, z: 1.364242e-14} + rotation: {x: -0, y: -0, z: -1.100702e-13, w: 1} + scale: {x: 1.0000001, y: 1.0000005, z: 1.0000004} + - name: mixamorig:RightHandIndex1 + parentName: mixamorig:RightHand + position: {x: -9.991119e-14, y: 0.16444598, z: 2.2737367e-15} + rotation: {x: -0, y: -0, z: -0, w: 1} + scale: {x: 0.9999999, y: 0.99999964, z: 0.99999976} + - name: mixamorig:RightHandIndex2 + parentName: mixamorig:RightHandIndex1 + position: {x: -2.9212188e-14, y: 0.048201997, z: -5.684342e-16} + rotation: {x: -0, y: -0, z: -0, w: 1} + scale: {x: 1, y: 1.0000002, z: 1.0000002} + - name: mixamorig:RightHandIndex3 + parentName: mixamorig:RightHandIndex2 + position: {x: -3.8697933e-14, y: 0.063829996, z: 1.1368684e-15} + rotation: {x: 0.000000014901159, y: 0.000000021886079, z: 0.000000059604638, w: 1} + scale: {x: 1, y: 1.0000002, z: 1.0000002} + - name: mixamorig:RightHandIndex4 + parentName: mixamorig:RightHandIndex3 + position: {x: -3.1352698e-14, y: 0.05179, z: -2.842171e-16} + rotation: {x: -0, y: -0, z: -3.2612796e-16, w: 1} + scale: {x: 1, y: 1.0000004, z: 1.0000002} + - name: mixamorig:LeftUpLeg + parentName: mixamorig:Hips + position: {x: -0.14073023, y: -0.07904136, z: -0.01462963} + rotation: {x: -0.00012547958, y: 0.065190375, z: 0.997871, w: -0.0019206584} + scale: {x: 1.0000002, y: 1.0000001, z: 1} + - name: mixamorig:LeftLeg + parentName: mixamorig:LeftUpLeg + position: {x: -1.7040555e-11, y: 0.34295353, z: 0.0000000020225621} + rotation: {x: -0.17438515, y: 0.0000012433012, z: -0.000027987908, w: 0.98467755} + scale: {x: 1.0000001, y: 1.0000002, z: 1.0000001} + - name: mixamorig:LeftFoot + parentName: mixamorig:LeftLeg + position: {x: -1.0552327e-10, y: 0.3062599, z: 0.0000000010070607} + rotation: {x: 0.5174755, y: 0.021565674, z: -0.02691699, w: 0.85500264} + scale: {x: 1.0000006, y: 1.0000004, z: 1.0000002} + - name: mixamorig:LeftToeBase + parentName: mixamorig:LeftFoot + position: {x: 1.3549162e-12, y: 0.265, z: -6.1533e-14} + rotation: {x: 0.34420368, y: 0.01445141, z: 0.009241734, w: 0.93873835} + scale: {x: 1.0000006, y: 1.0000002, z: 1.0000004} + - name: mixamorig:LeftToe_End + parentName: mixamorig:LeftToeBase + position: {x: 3.0112197e-11, y: 0.1525861, z: -1.2034646e-10} + rotation: {x: -0, y: -0, z: -0, w: 1} + scale: {x: 1.0000004, y: 1, z: 1} + - name: mixamorig:RightUpLeg + parentName: mixamorig:Hips + position: {x: 0.14073054, y: -0.07904046, z: -0.014629596} + rotation: {x: 0.00012533642, y: 0.06519036, z: 0.997871, w: 0.0019184115} + scale: {x: 1.0000002, y: 1, z: 1} + - name: mixamorig:RightLeg + parentName: mixamorig:RightUpLeg + position: {x: -8.8817837e-17, y: 0.34295347, z: 7.105427e-17} + rotation: {x: -0.1743848, y: -0.0000011738013, z: 0.000026179116, w: 0.9846776} + scale: {x: 1.0000001, y: 1.0000001, z: 0.9999999} + - name: mixamorig:RightFoot + parentName: mixamorig:RightLeg + position: {x: 2.664535e-16, y: 0.30626073, z: -1.7763567e-16} + rotation: {x: 0.5174737, y: -0.021566195, z: 0.026916938, w: 0.8550038} + scale: {x: 1.0000004, y: 1.0000001, z: 1} + - name: mixamorig:RightToeBase + parentName: mixamorig:RightFoot + position: {x: -1.9539925e-16, y: 0.265, z: 7.105427e-17} + rotation: {x: 0.34420162, y: -0.014481019, z: -0.009161405, w: 0.93873936} + scale: {x: 1.0000005, y: 1.0000004, z: 1.0000002} + - name: mixamorig:RightToe_End + parentName: mixamorig:RightToeBase + position: {x: 1.4210854e-16, y: 0.15258999, z: 1.8145207e-16} + rotation: {x: -0.000000029802319, y: -0, z: 0.0000000018626449, w: 1} + scale: {x: 1.0000001, y: 0.99999994, z: 1.0000001} armTwist: 0.5 foreArmTwist: 0.5 upperLegTwist: 0.5 @@ -94,13 +636,13 @@ ModelImporter: globalScale: 1 rootMotionBoneName: hasTranslationDoF: 0 - hasExtraRoot: 0 + hasExtraRoot: 1 skeletonHasParents: 1 lastHumanDescriptionAvatarSource: {instanceID: 0} autoGenerateAvatarMappingIfUnspecified: 1 - animationType: 2 + animationType: 3 humanoidOversampling: 1 - avatarSetup: 0 + avatarSetup: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 importBlendShapeDeformPercent: 1 remapMaterialsIfMaterialImportModeIsNone: 0 diff --git a/Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepeto1.vfx b/Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepeto1.vfx index d41c9a57..b02e6273 100644 --- a/Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepeto1.vfx +++ b/Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepeto1.vfx @@ -220,7 +220,7 @@ MonoBehaviour: categories: [] uiBounds: serializedVersion: 2 - x: 0 + x: -0 y: -492 width: 1154 height: 1892 @@ -1240,8 +1240,7 @@ MonoBehaviour: m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_Direction: 0 - m_LinkedSlots: - - {fileID: 8926484042661614575} + m_LinkedSlots: [] --- !u!114 &8926484042661614552 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1376,8 +1375,7 @@ MonoBehaviour: m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_Direction: 0 - m_LinkedSlots: - - {fileID: 8926484042661614579} + m_LinkedSlots: [] --- !u!114 &8926484042661614556 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1955,18 +1953,7 @@ MonoBehaviour: m_EnumValues: [] m_ValueFilter: 0 m_Tooltip: - m_Nodes: - - m_Id: 0 - linkedSlots: - - outputSlot: {fileID: 8926484042661614575} - inputSlot: {fileID: 8926484042661614551} - - outputSlot: {fileID: 8926484042661614579} - inputSlot: {fileID: 8926484042661614555} - position: {x: 413, y: 377} - expandedSlots: - - {fileID: 8926484042661614574} - expanded: 1 - supecollapsed: 0 + m_Nodes: [] --- !u!114 &8926484042661614574 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2039,8 +2026,7 @@ MonoBehaviour: m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_Direction: 1 - m_LinkedSlots: - - {fileID: 8926484042661614551} + m_LinkedSlots: [] --- !u!114 &8926484042661614576 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2175,8 +2161,7 @@ MonoBehaviour: m_SerializableType: UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null m_Direction: 1 - m_LinkedSlots: - - {fileID: 8926484042661614555} + m_LinkedSlots: [] --- !u!114 &8926484042661614580 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2499,7 +2484,7 @@ MonoBehaviour: m_Type: m_SerializableType: System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - m_SerializableObject: 5 + m_SerializableObject: 0.5 m_Space: -1 m_Property: name: B diff --git a/Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepetoController.controller b/Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepetoController.controller index 4d8929aa..35665a15 100644 --- a/Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepetoController.controller +++ b/Assets/04_Models/MazeRoom3Dmodel/MazeRoomEffectModel/zepeto/zepetoController.controller @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-8732849399143162299 +--- !u!1102 &-7341125991242161764 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -20,13 +20,13 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -203655887218126122, guid: c5f35713abc8f5646954800d7ec085fd, type: 3} + m_Motion: {fileID: -203655887218126122, guid: 6576ed7c5f8809f43abbdfe6a7319b0f, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &-7622370358278079790 +--- !u!1102 &-6554241540062631616 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -37,7 +37,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 1741460660016092104} + - {fileID: 6183112627094011835} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -47,7 +47,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: -203655887218126122, guid: ae56668d6f1234244b3a544da81dca58, type: 3} + m_Motion: {fileID: -203655887218126122, guid: 9869e38cc0b204c419904ddb56fb0923, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -63,14 +63,14 @@ AnimatorStateMachine: m_Name: Base Layer m_ChildStates: - serializedVersion: 1 - m_State: {fileID: -7622370358278079790} - m_Position: {x: 30, y: 210, z: 0} + m_State: {fileID: 7887767389521995422} + m_Position: {x: 40, y: 190, z: 0} - serializedVersion: 1 - m_State: {fileID: 785775716436635782} - m_Position: {x: 30, y: 290, z: 0} + m_State: {fileID: -6554241540062631616} + m_Position: {x: 30, y: 260, z: 0} - serializedVersion: 1 - m_State: {fileID: -8732849399143162299} - m_Position: {x: 30, y: 370, z: 0} + m_State: {fileID: -7341125991242161764} + m_Position: {x: 85.929504, y: 347.35895, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -80,7 +80,7 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -7622370358278079790} + m_DefaultState: {fileID: 7887767389521995422} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -103,7 +103,51 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1102 &785775716436635782 +--- !u!1101 &1572316313317226294 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -6554241540062631616} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.9375 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &6183112627094011835 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7341125991242161764} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7580645 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &7887767389521995422 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -114,7 +158,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 8824387987699168019} + - {fileID: 1572316313317226294} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -130,47 +174,3 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &1741460660016092104 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 785775716436635782} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.7580645 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &8824387987699168019 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -8732849399143162299} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.9375 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 From 7de6e2b3981739f98fd4091f21c6a23179b27d3f Mon Sep 17 00:00:00 2001 From: rainylinjing-reboot Date: Thu, 25 Jun 2026 17:37:27 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=A0=95=EB=A6=AC=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/Cave_Test_2.unity | 4 +- .../01_Scenes/Cave_Test_2/LightingData.asset | 3 + .../Cave_Test_2/LightingData.asset.meta | 8 ++ .../Cave_Test_2/ReflectionProbe-0.exr | 3 + .../Cave_Test_2/ReflectionProbe-0.exr.meta | 130 ++++++++++++++++++ Assets/02_Scripts/Cave/RaftStartManager.cs | 60 ++++++-- Assets/02_Scripts/Cave/RhinoObstacle.cs | 37 +++-- .../DialogGraph/Cave/Fairy_CaveEnd.wdg | 18 +-- .../DialogGraph/Cave/Fairy_CaveStart.wdg | 4 +- .../Fonts/Pretendard-Black SDF.asset | 4 +- ProjectSettings/ProjectSettings.asset | 4 +- 11 files changed, 236 insertions(+), 39 deletions(-) create mode 100644 Assets/01_Scenes/Cave_Test_2/LightingData.asset create mode 100644 Assets/01_Scenes/Cave_Test_2/LightingData.asset.meta create mode 100644 Assets/01_Scenes/Cave_Test_2/ReflectionProbe-0.exr create mode 100644 Assets/01_Scenes/Cave_Test_2/ReflectionProbe-0.exr.meta diff --git a/Assets/01_Scenes/Cave_Test_2.unity b/Assets/01_Scenes/Cave_Test_2.unity index f66b280b..c85282d1 100644 --- a/Assets/01_Scenes/Cave_Test_2.unity +++ b/Assets/01_Scenes/Cave_Test_2.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c0f1af38d7578c9219f8ae64174728e566c1ccd4455a5cd836f8f1b9f557081 -size 1077527 +oid sha256:b69db926aa7e4b8405257b3c71f939c5b153ccae8a4455bdc0f55cc8f1e0e285 +size 1095465 diff --git a/Assets/01_Scenes/Cave_Test_2/LightingData.asset b/Assets/01_Scenes/Cave_Test_2/LightingData.asset new file mode 100644 index 00000000..f88dcf52 --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/LightingData.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77e72e16419b284faf6fc6eea6a144e956f4a1bd9e3c02c3b9ca48087c585a11 +size 17729 diff --git a/Assets/01_Scenes/Cave_Test_2/LightingData.asset.meta b/Assets/01_Scenes/Cave_Test_2/LightingData.asset.meta new file mode 100644 index 00000000..9b1862c4 --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 17248e2bc05120241a44ab242798f420 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/01_Scenes/Cave_Test_2/ReflectionProbe-0.exr b/Assets/01_Scenes/Cave_Test_2/ReflectionProbe-0.exr new file mode 100644 index 00000000..7b17999c --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/ReflectionProbe-0.exr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:851923ee0f3a6b2e79a84d2fab33df0cbb1b83b4f8566da70b84f264eb1d614b +size 226484 diff --git a/Assets/01_Scenes/Cave_Test_2/ReflectionProbe-0.exr.meta b/Assets/01_Scenes/Cave_Test_2/ReflectionProbe-0.exr.meta new file mode 100644 index 00000000..a121247d --- /dev/null +++ b/Assets/01_Scenes/Cave_Test_2/ReflectionProbe-0.exr.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 5db04a33a65f26046bff20864f807211 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02_Scripts/Cave/RaftStartManager.cs b/Assets/02_Scripts/Cave/RaftStartManager.cs index 18091d65..4db4f065 100644 --- a/Assets/02_Scripts/Cave/RaftStartManager.cs +++ b/Assets/02_Scripts/Cave/RaftStartManager.cs @@ -41,6 +41,7 @@ private enum StartState private StartState state = StartState.Ready; private Coroutine startRoutine; + private bool areRhinosRunning; private void Start() { @@ -49,15 +50,19 @@ private void Start() private void Update() { - if (state != StartState.WaitingForKeyGrab) - return; - - if (!waitForKeyGrab) - return; - - if (steeringKey != null && steeringKey.IsGrabbed) + if (state == StartState.WaitingForKeyGrab) { - BeginRaftRide(); + if (waitForKeyGrab && steeringKey != null && steeringKey.IsGrabbed) + { + BeginRaftRide(); + } + + return; + } + + if (state == StartState.Starting || state == StartState.Riding) + { + SyncRhinosWithSteeringKey(); } } @@ -78,7 +83,7 @@ private void SetupStartState() raftHealth.ResetHealth(); } - StopAllRhinos(); + SetRhinosRunning(false, true); if (fairyObject != null) { @@ -135,7 +140,7 @@ private IEnumerator StartRaftSmoothly() raftController.SetSpeedMultiplier(0f); raftController.ResumeRaft(); - StartAllRhinos(); + SyncRhinosWithSteeringKey(true); if (showDebugLog) { @@ -160,6 +165,7 @@ private IEnumerator StartRaftSmoothly() raftController.SetSpeedMultiplier(1f); state = StartState.Riding; + SyncRhinosWithSteeringKey(true); if (showDebugLog) { @@ -179,7 +185,7 @@ public void OnRaftArrived() raftController.SetSpeedMultiplier(0f); } - StopAllRhinos(); + SetRhinosRunning(false, true); if (showDebugLog) { @@ -200,7 +206,7 @@ public void OnRaftFailed() raftController.SetSpeedMultiplier(0f); } - StopAllRhinos(); + SetRhinosRunning(false, true); if (showDebugLog) { @@ -208,6 +214,36 @@ public void OnRaftFailed() } } + private void SyncRhinosWithSteeringKey(bool force = false) + { + SetRhinosRunning(ShouldRhinosRunForCurrentInput(), force); + } + + private bool ShouldRhinosRunForCurrentInput() + { + if (!waitForKeyGrab) + return true; + + return steeringKey != null && steeringKey.IsGrabbed; + } + + private void SetRhinosRunning(bool shouldRun, bool force = false) + { + if (!force && areRhinosRunning == shouldRun) + return; + + if (shouldRun) + { + StartAllRhinos(); + } + else + { + StopAllRhinos(); + } + + areRhinosRunning = shouldRun; + } + private void StartAllRhinos() { if (rhinos == null) diff --git a/Assets/02_Scripts/Cave/RhinoObstacle.cs b/Assets/02_Scripts/Cave/RhinoObstacle.cs index b6a3e417..f23fe42a 100644 --- a/Assets/02_Scripts/Cave/RhinoObstacle.cs +++ b/Assets/02_Scripts/Cave/RhinoObstacle.cs @@ -33,6 +33,8 @@ public class RhinoObstacle : MonoBehaviour [SerializeField] private bool startAutomatically = true; [SerializeField] private bool loop = true; [SerializeField] private bool showDebugLog = true; + [SerializeField] private bool showLifecycleDebugLog = false; + [SerializeField] private bool showRoutineDebugLog = false; private Coroutine routine; private bool isRunning; @@ -82,19 +84,25 @@ private void ResolveReferences() public void StartRhino() { + if (isRunning && routine != null) + return; + if (routine != null) { StopCoroutine(routine); + routine = null; } isRunning = true; routine = StartCoroutine(RhinoRoutine()); - Log("시작"); + Log("Start"); } public void StopRhino() { + bool wasActive = isRunning || routine != null || isSurfaced; + isRunning = false; if (routine != null) @@ -107,7 +115,10 @@ public void StopRhino() ForceIdleAnimation(); MoveImmediatelyToUnderwater(); - Log("정지"); + if (wasActive) + { + Log("Stop"); + } } private IEnumerator RhinoRoutine() @@ -120,7 +131,7 @@ private IEnumerator RhinoRoutine() ForceIdleAnimation(); float hiddenWait = Random.Range(minHiddenTime, maxHiddenTime); - Log($"물속 대기 {hiddenWait:0.0}초"); + LogRoutine($"물속 대기 {hiddenWait:0.0}초"); yield return new WaitForSeconds(hiddenWait); @@ -128,7 +139,7 @@ private IEnumerator RhinoRoutine() break; // 2. 수면 위로 떠오름 - Log("떠오름 시작"); + LogRoutine("떠오름 시작"); yield return MoveToSurface(); if (!isRunning) @@ -139,7 +150,7 @@ private IEnumerator RhinoRoutine() SetDamageActive(true); ForceIdleAnimation(); - Log("수면 위 도착 / 데미지 콜라이더 ON"); + LogRoutine("수면 위 도착 / 데미지 콜라이더 ON"); yield return new WaitForSeconds(surfaceIdleTime); @@ -147,13 +158,13 @@ private IEnumerator RhinoRoutine() break; // 4. 공격 실행 - Log("공격 시작"); + LogRoutine("공격 시작"); PlayHitAnimation(); yield return new WaitForSeconds(attackStayTime); // 5. 공격 종료 후 Idle 복귀 - Log("공격 종료 / Idle 복귀"); + LogRoutine("공격 종료 / Idle 복귀"); ForceIdleAnimation(); if (!isRunning) @@ -163,7 +174,7 @@ private IEnumerator RhinoRoutine() isSurfaced = false; SetDamageActive(false); - Log("잠수 시작 / 데미지 콜라이더 OFF"); + LogRoutine("잠수 시작 / 데미지 콜라이더 OFF"); yield return MoveToUnderwater(); if (!loop) @@ -228,7 +239,7 @@ private IEnumerator MoveToUnderwater() SetDamageActive(false); ForceIdleAnimation(); - Log("잠수 완료"); + LogRoutine("잠수 완료"); } private void PlayHitAnimation() @@ -298,7 +309,13 @@ private float Smooth01(float t) private void Log(string message) { - if (showDebugLog) + if (showDebugLog && showLifecycleDebugLog) + Debug.Log($"[RhinoObstacle] {name} / {message}"); + } + + private void LogRoutine(string message) + { + if (showDebugLog && showRoutineDebugLog) Debug.Log($"[RhinoObstacle] {name} / {message}"); } diff --git a/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveEnd.wdg b/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveEnd.wdg index 78c4111c..f6f4a62a 100644 --- a/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveEnd.wdg +++ b/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveEnd.wdg @@ -51,8 +51,8 @@ MonoBehaviour: serializedVersion: 2 x: 222 y: 76 - width: 1519 - height: 809 + width: 1531 + height: 840 m_GraphElementMetaData: - m_Guid: m_Value0: 14845512388065122572 @@ -387,7 +387,7 @@ MonoBehaviour: serializedVersion: 2 Hash: 445bb420bcd194d5ee0506886951aec8 m_Version: 2 - m_Position: {x: 1402.0514, y: 500.70782} + m_Position: {x: 1413.954, y: 532.4479} m_Title: DialogLineNode m_Tooltip: m_NodePreviewModel: @@ -544,11 +544,11 @@ MonoBehaviour: - rid: 8414246349295583493 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: - m_Value: '{SpaceSceneCode1}' + m_Value: 1 - rid: 8414246349295583494 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: - m_Value: '{SpaceSceneCode2}' + m_Value: 2 - rid: 8414246349295583495 type: {class: DialogLineNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: @@ -584,7 +584,7 @@ MonoBehaviour: - rid: 8414246349295583503 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: - m_Value: 0 + m_Value: 1 - rid: 8414246349295583504 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: @@ -592,7 +592,7 @@ MonoBehaviour: - rid: 8414246349295583505 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: - m_Value: OpenDoor + m_Value: OpenDoor2 - rid: 8414246349295583506 type: {class: DialogLineNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: @@ -628,7 +628,7 @@ MonoBehaviour: - rid: 8414246349295583514 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: - m_Value: 0 + m_Value: 1 - rid: 8414246349295583515 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: @@ -636,7 +636,7 @@ MonoBehaviour: - rid: 8414246349295583516 type: {class: 'Constant`1[[System.String, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: - m_Value: OpenDoor + m_Value: OpenDoor1 - rid: 8414246349295583517 type: {class: DialogLineNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: diff --git a/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveStart.wdg b/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveStart.wdg index 95e27e54..0f6b2cb9 100644 --- a/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveStart.wdg +++ b/Assets/07_Data/Communication/DialogGraph/Cave/Fairy_CaveStart.wdg @@ -50,7 +50,7 @@ MonoBehaviour: x: 222 y: 76 width: 1337 - height: 340 + height: 385 m_GraphElementMetaData: - m_Guid: m_Value0: 14845512388065122572 @@ -499,7 +499,7 @@ MonoBehaviour: - rid: 8414246349295583394 type: {class: 'Constant`1[[System.Boolean, mscorlib]]', ns: Unity.GraphToolkit.Editor, asm: Unity.GraphToolkit.Internal.Editor} data: - m_Value: 0 + m_Value: 1 - rid: 8414246349295583395 type: {class: DialogLineNode, ns: WhaleAdventure.Dialog.GraphTool.Editor, asm: Assembly-CSharp-Editor} data: diff --git a/Assets/My project/Fonts/Pretendard-Black SDF.asset b/Assets/My project/Fonts/Pretendard-Black SDF.asset index afbcf0ab..617368a4 100644 --- a/Assets/My project/Fonts/Pretendard-Black SDF.asset +++ b/Assets/My project/Fonts/Pretendard-Black SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a81a06b57f04031dc553ed2a18857edbf18e5f2ef32f65f713e538f6cebf5da5 -size 7807136 +oid sha256:683f3abcb887175600cc47702f9e566c4c614b8ef41438a4c516a23b997d26c6 +size 41413216 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 03363233..6dc78805 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87718b14f88a5f893b5f109c236d208b8984fa7985c0699ec63dccd6d60386fe -size 28113 +oid sha256:1de27f9e5533c480e264af621d2e189e40fc60ac50408f8dcb37dad696b7ccaf +size 28126