diff --git a/Assets/01_Scenes/Cave_Test_2.unity b/Assets/01_Scenes/Cave_Test_2.unity index f66b280b..0d724475 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:4357a4db1e7e703d342a30f30db0d928d880f762f42ee654c7095e404d91ab68 +size 1075629 diff --git a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity index 9eb0c629..1b0105c8 100644 --- a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity +++ b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/CatsRoom.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce4d73a14aac38dbf339c2dc94f9d445893998cd7bdb20a78bdcd52cb9ef4bb7 -size 2940781 +oid sha256:2383d609077f84049d7a789798d6b1454e399f95a268447b2d9a2c514ea3b6e2 +size 2942559 diff --git a/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto first.unity b/Assets/01_Scenes/WhaleAdventure_VR/Rooms/Gepto first.unity index a6de7ad0..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:8c37380f04c686f839ba83fff030f4d95cce62067f04d94da7cf3a9f919fbb6c -size 11725 +oid sha256:1cb631d855df4c240e0661f81f4e8516edf8d8bf999512d1d19ff51d6b90aba9 +size 45598 diff --git a/Assets/01_Scenes/blackjack.unity b/Assets/01_Scenes/blackjack.unity index 45be1fae..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:2ad4ca520489b3cd3e1b2c1244112afdfdfcaab23247d69edfec969ef5dfebf6 -size 2312189 +oid sha256:b5006eee2dd72bb0344d001f395405d77c95cda23a3d6e932687232a6728bf4f +size 2308027 diff --git a/Assets/02_Scripts/Managers/CollectionManager.cs b/Assets/02_Scripts/Managers/CollectionManager.cs index dc587dd7..7b6850c1 100644 --- a/Assets/02_Scripts/Managers/CollectionManager.cs +++ b/Assets/02_Scripts/Managers/CollectionManager.cs @@ -1,6 +1,6 @@ using UnityEngine; -public class CollectionManager : MonoBehaviour +public class CollectionManager : MonoBehaviour, ISceneInitializable { public static CollectionManager Instance; @@ -28,6 +28,22 @@ void Start() UpdateUI(); } + // SceneLoadManager가 씬 로드마다 호출. 새 씬의 StarPieceHud를 다시 찾아 연결한다. + public void OnSceneLoaded() + { + FindStarPieceHud(); + UpdateUI(); + } + + private void FindStarPieceHud() + { + // 비활성(토글로 꺼진) HUD도 찾을 수 있도록 Include + _starPieceHud = FindFirstObjectByType(FindObjectsInactive.Include); + + if (_starPieceHud == null) + Debug.LogWarning("[CollectionManager] 현재 씬에서 StarPieceHud를 찾지 못했습니다.", this); + } + public void AddStar(int amount) { _currentStars += amount; diff --git a/Assets/02_Scripts/Managers/change room manager/gapato.meta b/Assets/02_Scripts/Managers/change room manager/gapato.meta new file mode 100644 index 00000000..53cf0798 --- /dev/null +++ b/Assets/02_Scripts/Managers/change room manager/gapato.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 47ef309091683cf409e48c93663f025b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs b/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs new file mode 100644 index 00000000..66f0f007 --- /dev/null +++ b/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs @@ -0,0 +1,296 @@ +using System.Collections; +using UnityEngine; +using UnityEngine.SceneManagement; +using UnityEngine.Rendering; + +public class GeppettoRunTriggerZone : MonoBehaviour +{ + [Header("Trigger")] + public string playerTag = "Player"; + + [Header("Geppetto")] + public Transform geppetto; + public Animator geppettoAnimator; + + [Header("Animation")] + public string runStateName = "Running"; + public bool playRunAnimationOnTrigger = true; + + [Header("Move")] + public float runSpeed = 5f; + public float rotateSpeed = 12f; + public bool keepStartY = true; + + [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 sceneChanging = false; + private float startY; + + private GameObject blackQuad; + private Material blackMat; + + private void Start() + { + if (geppetto != null) + startY = geppetto.position.y; + + if (geppettoAnimator != null) + geppettoAnimator.applyRootMotion = false; + + CreateBlackQuad(); + SetBlackAlpha(0f); + + if (blackQuad != null) + blackQuad.SetActive(false); + } + + private void OnTriggerEnter(Collider other) + { + if (started) + return; + + if (!IsPlayer(other)) + return; + + Debug.Log(" ̺Ʈ : " + other.name); + + 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; + + PlayRunAnimation(); + + Collider col = GetComponent(); + if (col != null) + col.enabled = false; + + StartCoroutine(FadeWhileRunning()); + } + + private void Update() + { + if (!started || sceneChanging) + return; + + if (geppetto == null || targetPlayer == null) + return; + + Vector3 dir = targetPlayer.position - geppetto.position; + dir.y = 0f; + + if (dir.sqrMagnitude > 0.001f) + { + Quaternion targetRot = Quaternion.LookRotation(dir); + geppetto.rotation = Quaternion.Slerp( + geppetto.rotation, + targetRot, + Time.deltaTime * rotateSpeed + ); + + Vector3 nextPos = geppetto.position + dir.normalized * runSpeed * Time.deltaTime; + + if (keepStartY) + nextPos.y = startY; + + geppetto.position = nextPos; + } + } + + private void LateUpdate() + { + if (!started || sceneChanging) + return; + + if (!lockPlayerOnTrigger || lockedPlayerRoot == null) + return; + + lockedPlayerRoot.position = lockedPlayerPosition; + + if (lockPlayerRotation) + { + 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; + + while (t < fadeDuration) + { + t += Time.deltaTime; + float alpha = Mathf.Clamp01(t / fadeDuration); + SetBlackAlpha(alpha); + + yield return null; + } + + SetBlackAlpha(1f); + sceneChanging = true; + + if (!string.IsNullOrWhiteSpace(nextSceneName)) + { + SceneManager.LoadScene(nextSceneName); + } + else + { + Debug.LogWarning("Next Scene Name ֽϴ."); + } + } + + 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)) + return true; + + if (other.transform.root.CompareTag(playerTag)) + return true; + + return false; + } +} \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs.meta b/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs.meta new file mode 100644 index 00000000..1eb822b1 --- /dev/null +++ b/Assets/02_Scripts/Managers/change room manager/gapato/GeppettoRunTriggerZone.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 9147beba2b87e4d4b9644fb0647ef6b2 \ No newline at end of file diff --git a/Assets/02_Scripts/UI/CollisionButton.cs b/Assets/02_Scripts/UI/CollisionButton.cs new file mode 100644 index 00000000..8aafde10 --- /dev/null +++ b/Assets/02_Scripts/UI/CollisionButton.cs @@ -0,0 +1,95 @@ +using UnityEngine; +using UnityEngine.Events; + +/// +/// VR 손이 콜라이더에 닿을(OnTriggerEnter) 때마다 작동하는 버튼. +/// XR UI 포인터/포크 상호작용이 불안정할 때, 트리거 콜라이더로 직접 눌리도록 한다. +/// +[RequireComponent(typeof(Collider))] +public class CollisionButton : MonoBehaviour +{ + [Header("Hand Detection")] + [Tooltip("이 태그를 가진 콜라이더를 손으로 인식합니다.")] + [SerializeField] private string handTag = "PlayerHand"; + + [Tooltip("태그가 달라도 XRHandMarker가 붙어 있으면 손으로 인식합니다.")] + [SerializeField] private bool detectByHandMarker = true; + + [Header("Press Behavior")] + [Tooltip("한 번 눌린 뒤 다시 눌리기까지의 최소 간격(초). 중복/연타 입력을 막습니다.")] + [SerializeField] private float cooldown = 0.4f; + + [Tooltip("꺼두면 손이 닿아도 반응하지 않습니다.")] + [SerializeField] private bool interactable = true; + + [Header("Events")] + [Tooltip("손이 닿아 눌릴 때마다 발생합니다.")] + public UnityEvent onPressed; + + [Header("Debug")] + [SerializeField] private bool showDebugLog = false; + + // timeScale=0(일시정지)에서도 동작하도록 unscaled 시간 사용 + private float _lastPressTime = -999f; + + // 에디터에서 컴포넌트를 처음 추가할 때 콜라이더를 트리거로 자동 설정 + private void Reset() + { + Collider col = GetComponent(); + if (col != null) + col.isTrigger = true; + } + + private void Awake() + { + Collider col = GetComponent(); + if (col != null && !col.isTrigger) + { + col.isTrigger = true; + if (showDebugLog) + Debug.Log("[CollisionButton] Collider가 트리거가 아니어서 강제로 트리거로 설정했습니다.", this); + } + } + + private void OnTriggerEnter(Collider other) + { + if (!interactable) + return; + + if (!IsHand(other)) + return; + + // 양손 콜라이더가 거의 동시에 들어오거나 빠르게 재진입할 때 중복 발동 방지 + if (Time.unscaledTime - _lastPressTime < cooldown) + return; + + Press(); + } + + private void Press() + { + _lastPressTime = Time.unscaledTime; + + if (showDebugLog) + Debug.Log("[CollisionButton] 손이 닿아 버튼이 눌렸습니다.", this); + + onPressed?.Invoke(); + } + + private bool IsHand(Collider other) + { + if (other == null) + return false; + + if (!string.IsNullOrEmpty(handTag) && other.CompareTag(handTag)) + return true; + + if (detectByHandMarker && other.GetComponentInParent() != null) + return true; + + return false; + } + + // 런타임에 활성/비활성 토글이 필요할 때 (UnityEvent 등에서 호출) + public void SetInteractable(bool value) => interactable = value; +} diff --git a/Assets/02_Scripts/UI/CollisionButton.cs.meta b/Assets/02_Scripts/UI/CollisionButton.cs.meta new file mode 100644 index 00000000..fd6433b1 --- /dev/null +++ b/Assets/02_Scripts/UI/CollisionButton.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c966c32e4e695c44795f9eb58d43d772 \ No newline at end of file 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 e2542c13..dcd19372 100644 --- a/Assets/04_Models/Characters/gepto/gepto.controller +++ b/Assets/04_Models/Characters/gepto/gepto.controller @@ -12,9 +12,6 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -2406606947297670322} m_Position: {x: -210, y: 20, z: 0} - - serializedVersion: 1 - m_State: {fileID: -3832682758273198342} - m_Position: {x: 100, y: -170, z: 0} - serializedVersion: 1 m_State: {fileID: 6143119609231041675} m_Position: {x: -378.74075, y: -74.29628, z: 0} @@ -43,32 +40,6 @@ AnimatorTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 1 ---- !u!1102 &-3832682758273198342 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: KA_Idle33_Hug1_1 - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 8993902097722301239, guid: e3140c001bd1dd249b2f4885d3041714, type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &-2406606947297670322 AnimatorState: serializedVersion: 6 @@ -79,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 @@ -96,28 +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_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 @@ -140,28 +88,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &2768032479665430707 -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: -3832682758273198342} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.77272725 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &6143119609231041675 AnimatorState: serializedVersion: 6 @@ -169,11 +95,10 @@ 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: - - {fileID: 2768032479665430707} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/04_Models/Objects/stone_hut_with_camp_fire.glb b/Assets/04_Models/Objects/stone_hut_with_camp_fire.glb new file mode 100644 index 00000000..e5d842a0 Binary files /dev/null and b/Assets/04_Models/Objects/stone_hut_with_camp_fire.glb differ diff --git a/Assets/04_Models/Objects/stone_hut_with_camp_fire.glb.meta b/Assets/04_Models/Objects/stone_hut_with_camp_fire.glb.meta new file mode 100644 index 00000000..6dd1a140 --- /dev/null +++ b/Assets/04_Models/Objects/stone_hut_with_camp_fire.glb.meta @@ -0,0 +1,28 @@ +fileFormatVersion: 2 +guid: 44bc951c8943f4642b0ef9dc7fb25204 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 715df9372183c47e389bb6e19fbc3b52, type: 3} + editorImportSettings: + generateSecondaryUVSet: 0 + importSettings: + nodeNameMethod: 1 + animationMethod: 2 + generateMipMaps: 1 + texturesReadable: 0 + defaultMinFilterMode: 9729 + defaultMagFilterMode: 9729 + anisotropicFilterLevel: 1 + instantiationSettings: + mask: -1 + layer: 0 + skinUpdateWhenOffscreen: 1 + lightIntensityFactor: 1 + sceneObjectCreation: 2 + assetDependencies: [] + reportItems: [] diff --git a/Assets/04_Models/VRPlayer.prefab b/Assets/04_Models/VRPlayer.prefab index efc6c6d6..4b9202b9 100644 --- a/Assets/04_Models/VRPlayer.prefab +++ b/Assets/04_Models/VRPlayer.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0977e7148adf1f7560756d79d82627e84cbcf2a279b94579605dec0d51e16a67 -size 162464 +oid sha256:d8d8dff5e3cd0c29cd86ccb70104c075b598ed1702ad010112c265f06e52ca2b +size 163330 diff --git a/Assets/New Terrain 1.asset b/Assets/New Terrain 1.asset new file mode 100644 index 00000000..4d956b74 --- /dev/null +++ b/Assets/New Terrain 1.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:368dbe6748851fdf60be88e380844e7ed88f532eb5476343fd04172c45b5cf1c +size 1958860 diff --git a/Assets/New Terrain 1.asset.meta b/Assets/New Terrain 1.asset.meta new file mode 100644 index 00000000..53b994d1 --- /dev/null +++ b/Assets/New Terrain 1.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d5fd6eed5b5a9b940b1db858e80950af +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 15600000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Stylized Water 3/_Demo/DemoAssets/Terrain/Layers/SWS_Seaweed.terrainlayer b/Assets/Stylized Water 3/_Demo/DemoAssets/Terrain/Layers/SWS_Seaweed.terrainlayer index 4e288e33..7b4990f5 100644 --- a/Assets/Stylized Water 3/_Demo/DemoAssets/Terrain/Layers/SWS_Seaweed.terrainlayer +++ b/Assets/Stylized Water 3/_Demo/DemoAssets/Terrain/Layers/SWS_Seaweed.terrainlayer @@ -20,3 +20,4 @@ TerrainLayer: m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1} m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0} m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1} + m_SmoothnessSource: 1