From a0119f05606d8f8821ce4f9d32d8916ec237e3a1 Mon Sep 17 00:00:00 2001 From: rainylinjing-reboot Date: Mon, 22 Jun 2026 09:48:24 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8B=9C=EC=9E=91=EC=A0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/Cave_Test_2.unity | 4 +-- ...ontroller.controller => Rhinos.controller} | 27 +++++++++++++++++-- ...controller.meta => Rhinos.controller.meta} | 0 .../Fonts/Pretendard-Black SDF.asset | 4 +-- .../XR/AndroidXR/AndroidXRSettingsInitializer | 2 +- 5 files changed, 30 insertions(+), 7 deletions(-) rename Assets/04_Models/Cave/Enemy/{New Animator Controller.controller => Rhinos.controller} (85%) rename Assets/04_Models/Cave/Enemy/{New Animator Controller.controller.meta => Rhinos.controller.meta} (100%) diff --git a/Assets/01_Scenes/Cave_Test_2.unity b/Assets/01_Scenes/Cave_Test_2.unity index 184528f9..84894c44 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:f6270301ed6751f52903c7d700f05838143760714ed3a5dc0542e34bad53ce8d -size 514873 +oid sha256:c1cb02578e3389c0867cb8f16ee5ae0e88bba6d4b11466a7c132c84c51747ebd +size 515947 diff --git a/Assets/04_Models/Cave/Enemy/New Animator Controller.controller b/Assets/04_Models/Cave/Enemy/Rhinos.controller similarity index 85% rename from Assets/04_Models/Cave/Enemy/New Animator Controller.controller rename to Assets/04_Models/Cave/Enemy/Rhinos.controller index d9829d8d..75d529d5 100644 --- a/Assets/04_Models/Cave/Enemy/New Animator Controller.controller +++ b/Assets/04_Models/Cave/Enemy/Rhinos.controller @@ -10,7 +10,8 @@ AnimatorState: m_Name: WhiteRhino_Skelmesh|Rhino_Combat_Atk_Hit m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 8273947539310789631} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -82,7 +83,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: New Animator Controller + m_Name: Rhinos serializedVersion: 5 m_AnimatorParameters: - m_Name: isIdle @@ -131,3 +132,25 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &8273947539310789631 +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: -5762510348686555522} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.8947368 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/04_Models/Cave/Enemy/New Animator Controller.controller.meta b/Assets/04_Models/Cave/Enemy/Rhinos.controller.meta similarity index 100% rename from Assets/04_Models/Cave/Enemy/New Animator Controller.controller.meta rename to Assets/04_Models/Cave/Enemy/Rhinos.controller.meta diff --git a/Assets/My project/Fonts/Pretendard-Black SDF.asset b/Assets/My project/Fonts/Pretendard-Black SDF.asset index 293ca15c..afbcf0ab 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:33d1b8ab213c79b046892d59ef6d55391add80541b88fe972cee7a9f0b27f0ac -size 41448806 +oid sha256:a81a06b57f04031dc553ed2a18857edbf18e5f2ef32f65f713e538f6cebf5da5 +size 7807136 diff --git a/Assets/XR/AndroidXR/AndroidXRSettingsInitializer b/Assets/XR/AndroidXR/AndroidXRSettingsInitializer index f9a9372d..ba1ef72f 100644 --- a/Assets/XR/AndroidXR/AndroidXRSettingsInitializer +++ b/Assets/XR/AndroidXR/AndroidXRSettingsInitializer @@ -11,5 +11,5 @@ MonoBehaviour: m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d7e9a0ba2b7f40ebbb3dad8385aa807b, type: 3} m_Name: - m_EditorClassIdentifier: Unity.XR.AndroidOpenXR.Editor::UnityEditor.XR.OpenXR.Features.Android.AndroidXRSettingsInitializer + m_EditorClassIdentifier: isInitialized: 0