From 9e4a5ac14309c1a722559ff729cd2b5f79680b9a Mon Sep 17 00:00:00 2001 From: nakjun Date: Mon, 20 Jul 2026 12:25:42 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=ED=8B=B0=ED=81=B4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/_TestScenes/Test3.unity | 4 +- .../Yuna_DragonFormAnimController.controller | 122 +++++++++--------- .../Yuna_DragonForm/Animations/attack_5.anim | 4 +- .../Prefabs/Yuna_DragonForm.prefab | 4 +- .../10_FX/VFX/Effect_09_GuardianShield.prefab | 3 + .../VFX/Effect_09_GuardianShield.prefab.meta | 7 + .../Effect_09_Materials/Effect_09_Sphere.mat | 31 ++++- .../Effect_09_Sphere_2.mat | 32 ++++- .../XR/Settings/OpenXR Package Settings.asset | 4 +- 9 files changed, 133 insertions(+), 78 deletions(-) create mode 100644 Assets/10_FX/VFX/Effect_09_GuardianShield.prefab create mode 100644 Assets/10_FX/VFX/Effect_09_GuardianShield.prefab.meta diff --git a/Assets/01_Scenes/_TestScenes/Test3.unity b/Assets/01_Scenes/_TestScenes/Test3.unity index 05a31b9a..7d777224 100644 --- a/Assets/01_Scenes/_TestScenes/Test3.unity +++ b/Assets/01_Scenes/_TestScenes/Test3.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b66c0ca69e7b4df9d3dd83501cc67580c0ad9ea591d6203e1c22120cf08a3b23 -size 135044 +oid sha256:4e513f78fb4a8c1d9ede635c7ceccb0fa26a9a6dad658d2188c60453f60cc0f6 +size 13848 diff --git a/Assets/04_Models/Characters/Yuna_DragonForm/Animations/Yuna_DragonFormAnimController.controller b/Assets/04_Models/Characters/Yuna_DragonForm/Animations/Yuna_DragonFormAnimController.controller index b28f0d04..6d02fd1e 100644 --- a/Assets/04_Models/Characters/Yuna_DragonForm/Animations/Yuna_DragonFormAnimController.controller +++ b/Assets/04_Models/Characters/Yuna_DragonForm/Animations/Yuna_DragonFormAnimController.controller @@ -1,30 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1101 &-7426273746094756130 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 4 - m_ConditionEvent: AnimNo - m_EventTreshold: 1 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1416283243031200240} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.8 - m_TransitionOffset: 0 - m_ExitTime: 0.9516129 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &-6788805772577850398 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -53,34 +28,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-4032792298352943867 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 3 - m_ConditionEvent: AnimNo - m_EventTreshold: 0 - - m_ConditionMode: 4 - m_ConditionEvent: AnimNo - m_EventTreshold: 2 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 3847859843293333409} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.90625 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1107 &-2955278449653885203 AnimatorStateMachine: serializedVersion: 7 @@ -92,16 +39,16 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 1416283243031200240} - m_Position: {x: 300.77667, y: 40.92061, z: 0} - - serializedVersion: 1 - m_State: {fileID: 3847859843293333409} - m_Position: {x: 550, y: 150, z: 0} + m_Position: {x: 290, y: 30, z: 0} - serializedVersion: 1 m_State: {fileID: 1897553871236046948} - m_Position: {x: 550, y: 10, z: 0} + m_Position: {x: 580, y: 10, z: 0} - serializedVersion: 1 m_State: {fileID: 7367256844088832823} m_Position: {x: 550, y: -110, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3365208732598070520} + m_Position: {x: 581.5727, y: 138.60548, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -183,9 +130,9 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -4032792298352943867} - {fileID: 2319555601443491813} - {fileID: -6788805772577850398} + - {fileID: 8178702457267404826} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -256,7 +203,7 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &3847859843293333409 +--- !u!1102 &3365208732598070520 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -267,7 +214,7 @@ AnimatorState: m_Speed: 0.45 m_CycleOffset: 0 m_Transitions: - - {fileID: -7426273746094756130} + - {fileID: 8681300770241125914} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -310,6 +257,34 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &8178702457267404826 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: AnimNo + m_EventTreshold: 0 + - m_ConditionMode: 4 + m_ConditionEvent: AnimNo + m_EventTreshold: 2 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3365208732598070520} + 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!1101 &8356436374897089747 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -335,3 +310,28 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &8681300770241125914 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: AnimNo + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1416283243031200240} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.9050633 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/04_Models/Characters/Yuna_DragonForm/Animations/attack_5.anim b/Assets/04_Models/Characters/Yuna_DragonForm/Animations/attack_5.anim index e4eb5b49..92843da9 100644 --- a/Assets/04_Models/Characters/Yuna_DragonForm/Animations/attack_5.anim +++ b/Assets/04_Models/Characters/Yuna_DragonForm/Animations/attack_5.anim @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fdb80da896570380a5ee67f8f27762bd3a08ad041653d0f0aecea2bbdf078e97 -size 5477069 +oid sha256:554148feab581c079b277ef3c62b7f8d9a80bd5b7be5c6f409f160235897ac11 +size 5477417 diff --git a/Assets/04_Models/Characters/Yuna_DragonForm/Prefabs/Yuna_DragonForm.prefab b/Assets/04_Models/Characters/Yuna_DragonForm/Prefabs/Yuna_DragonForm.prefab index 9f69bf1a..a7ec86b5 100644 --- a/Assets/04_Models/Characters/Yuna_DragonForm/Prefabs/Yuna_DragonForm.prefab +++ b/Assets/04_Models/Characters/Yuna_DragonForm/Prefabs/Yuna_DragonForm.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae4856f1e9d8cc20362f78b6aec2934ca47279ca0634467f65200c8fc6e73d45 -size 88048 +oid sha256:b9ec6042b495d409f04e7f9b2938fd7af9e769760315623d35b8cde777620f92 +size 927151 diff --git a/Assets/10_FX/VFX/Effect_09_GuardianShield.prefab b/Assets/10_FX/VFX/Effect_09_GuardianShield.prefab new file mode 100644 index 00000000..9dc9ca55 --- /dev/null +++ b/Assets/10_FX/VFX/Effect_09_GuardianShield.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f46cfa355db791156ddcea3af0c2f212f5e2dcc5e7a23478526a1280c4d63095 +size 830793 diff --git a/Assets/10_FX/VFX/Effect_09_GuardianShield.prefab.meta b/Assets/10_FX/VFX/Effect_09_GuardianShield.prefab.meta new file mode 100644 index 00000000..4ba16ad6 --- /dev/null +++ b/Assets/10_FX/VFX/Effect_09_GuardianShield.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 22bf303b586b5364e883dca222e3458e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SpecialSkillsEffectsPack/AllEffects/EffectsSet_1(NotScriptBased)/Materials/Effect_09_Materials/Effect_09_Sphere.mat b/Assets/SpecialSkillsEffectsPack/AllEffects/EffectsSet_1(NotScriptBased)/Materials/Effect_09_Materials/Effect_09_Sphere.mat index 6cbe6e24..28f17c2b 100644 --- a/Assets/SpecialSkillsEffectsPack/AllEffects/EffectsSet_1(NotScriptBased)/Materials/Effect_09_Materials/Effect_09_Sphere.mat +++ b/Assets/SpecialSkillsEffectsPack/AllEffects/EffectsSet_1(NotScriptBased)/Materials/Effect_09_Materials/Effect_09_Sphere.mat @@ -2,21 +2,32 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Effect_09_Sphere m_Shader: {fileID: 4800000, guid: 1d58a8e283100ea4f8435e923e54553e, type: 3} - m_ShaderKeywords: IS_MASK_FADE IS_NORMAL_ANIMATE IS_NORMAL_DISTORTION IS_SOFT_PARTICLES - IS_TEXCOORD_MOVE IS_TEXTURE_ANIMATE IS_UNITY_PARTICLE_INSTANCING_ENABLED _ALPHAPREMULTIPLY_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - IS_MASK_FADE + - IS_NORMAL_ANIMATE + - IS_NORMAL_DISTORTION + - IS_SOFT_PARTICLES + - IS_TEXCOORD_MOVE + - IS_TEXTURE_ANIMATE + m_InvalidKeywords: + - IS_UNITY_PARTICLE_INSTANCING_ENABLED + - _ALPHAPREMULTIPLY_ON m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -84,6 +95,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendDst: 1 - _BlendOp: 0 @@ -109,8 +121,10 @@ Material: - _Glossiness: 0.5 - _GlossyReflections: 1 - _Impact: 0 + - _ImpactFactor: 1 - _ImpactSize: 0.5 - _InvFade: 1 + - _IsRotateAngle: 0 - _Lighting: 0 - _LightingEnabled: 0 - _LinePass: 0 @@ -118,6 +132,7 @@ Material: - _MaskCutOut: 1 - _MaskFade: 1 - _MaskOffsetFactor: 20 + - _MaxIndex: 2 - _Metallic: 0 - _MixedMove: 0 - _Mode: 3 @@ -133,6 +148,8 @@ Material: - _RimLight: 0 - _RimScale: 4 - _RimStrength: 1 + - _RotateAngle: 0 + - _SecondColor: 0 - _SmoothnessTextureChannel: 0 - _SoftParticle: 1 - _SoftParticlesEnabled: 0 @@ -140,11 +157,14 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _TexLength: 1 - _TexPath: 1 - _TexPosMove: -1 - _TexcoordMove: 1 - _TexcoordMoveStrength: 5 + - _TexcoordMoveUsingCustom: 0 - _TextureAnimate: 1 + - _TextureAnimateAdvanced: 0 - _TextureAnimateSpeed: 1 - _TextureAnimateStyle: 0.01 - _TextureBlend: 0 @@ -165,4 +185,7 @@ Material: - _NoiseValue: {r: 0, g: 0, b: 0, a: 0} - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - - _TintColor: {r: 7.243609, g: 2.5870032, b: 0.5174006, a: 1} + - _TintColor: {r: 2.1185474, g: 0.8042139, b: 0.15528612, a: 1} + - _TintColor2: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/SpecialSkillsEffectsPack/AllEffects/EffectsSet_1(NotScriptBased)/Materials/Effect_09_Materials/Effect_09_Sphere_2.mat b/Assets/SpecialSkillsEffectsPack/AllEffects/EffectsSet_1(NotScriptBased)/Materials/Effect_09_Materials/Effect_09_Sphere_2.mat index e2fdc1e5..42d84d1f 100644 --- a/Assets/SpecialSkillsEffectsPack/AllEffects/EffectsSet_1(NotScriptBased)/Materials/Effect_09_Materials/Effect_09_Sphere_2.mat +++ b/Assets/SpecialSkillsEffectsPack/AllEffects/EffectsSet_1(NotScriptBased)/Materials/Effect_09_Materials/Effect_09_Sphere_2.mat @@ -2,21 +2,31 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Effect_09_Sphere_2 m_Shader: {fileID: 4800000, guid: 1d58a8e283100ea4f8435e923e54553e, type: 3} - m_ShaderKeywords: IS_MASK_FADE IS_NORMAL_ANIMATE IS_NORMAL_DISTORTION IS_SOFT_PARTICLES - IS_TEXCOORD_MOVE IS_TEXTURE_ANIMATE IS_UNITY_PARTICLE_INSTANCING_ENABLED _ALPHAPREMULTIPLY_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - IS_NORMAL_ANIMATE + - IS_NORMAL_DISTORTION + - IS_SOFT_PARTICLES + - IS_TEXCOORD_MOVE + - IS_TEXTURE_ANIMATE + m_InvalidKeywords: + - IS_UNITY_PARTICLE_INSTANCING_ENABLED + - _ALPHAPREMULTIPLY_ON m_LightmapFlags: 0 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -84,6 +94,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendDst: 1 - _BlendOp: 0 @@ -109,15 +120,18 @@ Material: - _Glossiness: 0.5 - _GlossyReflections: 1 - _Impact: 0 + - _ImpactFactor: 1 - _ImpactSize: 0.5 - _InvFade: 1 + - _IsRotateAngle: 0 - _Lighting: 0 - _LightingEnabled: 0 - _LinePass: 0 - _MaskAnimatedSpeed: 1 - _MaskCutOut: 1 - - _MaskFade: 1 + - _MaskFade: 0 - _MaskOffsetFactor: 15 + - _MaxIndex: 2 - _Metallic: 0 - _MixedMove: 0 - _Mode: 3 @@ -133,6 +147,8 @@ Material: - _RimLight: 0 - _RimScale: 4 - _RimStrength: 1 + - _RotateAngle: 0 + - _SecondColor: 0 - _SmoothnessTextureChannel: 0 - _SoftParticle: 1 - _SoftParticlesEnabled: 0 @@ -140,11 +156,14 @@ Material: - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _TexLength: 1 - _TexPath: 1 - _TexPosMove: -1 - _TexcoordMove: 1 - _TexcoordMoveStrength: 5 + - _TexcoordMoveUsingCustom: 0 - _TextureAnimate: 1 + - _TextureAnimateAdvanced: 0 - _TextureAnimateSpeed: 1 - _TextureAnimateStyle: 0 - _TextureBlend: 0 @@ -165,4 +184,7 @@ Material: - _NoiseValue: {r: 0, g: 0, b: 0, a: 0} - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - - _TintColor: {r: 7.243609, g: 2.5870032, b: 0.5174006, a: 1} + - _TintColor: {r: 1.4980392, g: 0.53501403, b: 0.107002795, a: 1} + - _TintColor2: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index 8c9ed33a..c910be78 100644 --- a/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/Assets/XR/Settings/OpenXR Package Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6eff47c7028673e04fb28ab2d0697a4873278dbcea375f2826f42b94fa786ef3 -size 98816 +oid sha256:4feb54764d49fa4e2a382fc60aa26560a202c3a8c4d1035ea7f74966b0943c29 +size 101257