From 72e22272f3d1d54d9c51b8717241e825da607b93 Mon Sep 17 00:00:00 2001 From: Lucien Date: Thu, 20 Aug 2026 13:50:04 +0200 Subject: [PATCH] Torch anim --- Imports/Animation/Toria torch.mask | 2 +- Imports/Ratel/Common/Fiber/Materials.meta | 8 + .../Fiber/Materials/T_Fiber_Basecolor.mat | 133 ++++++++++++ .../Materials/T_Fiber_Basecolor.mat.meta | 8 + .../Animations/ToriaMainController.controller | 191 ++++++++++++------ 5 files changed, 276 insertions(+), 66 deletions(-) create mode 100644 Imports/Ratel/Common/Fiber/Materials.meta create mode 100644 Imports/Ratel/Common/Fiber/Materials/T_Fiber_Basecolor.mat create mode 100644 Imports/Ratel/Common/Fiber/Materials/T_Fiber_Basecolor.mat.meta diff --git a/Imports/Animation/Toria torch.mask b/Imports/Animation/Toria torch.mask index 61640ba3..815e834f 100644 --- a/Imports/Animation/Toria torch.mask +++ b/Imports/Animation/Toria torch.mask @@ -7,5 +7,5 @@ AvatarMask: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Toria torch - m_Mask: 00000000000000000000000000000000000000000100000000000000010000000000000000000000000000000100000000000000 + m_Mask: 00000000000000000000000000000000000000000100000001000000010000000100000000000000000000000100000001000000 m_Elements: [] diff --git a/Imports/Ratel/Common/Fiber/Materials.meta b/Imports/Ratel/Common/Fiber/Materials.meta new file mode 100644 index 00000000..6fac60b0 --- /dev/null +++ b/Imports/Ratel/Common/Fiber/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4e913e3b9062a414199c89c10f6dd0b8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Imports/Ratel/Common/Fiber/Materials/T_Fiber_Basecolor.mat b/Imports/Ratel/Common/Fiber/Materials/T_Fiber_Basecolor.mat new file mode 100644 index 00000000..c7a29058 --- /dev/null +++ b/Imports/Ratel/Common/Fiber/Materials/T_Fiber_Basecolor.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: T_Fiber_Basecolor + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 5479872ac4f56e4439083920d53b23a8, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 5479872ac4f56e4439083920d53b23a8, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &733224778783656475 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 diff --git a/Imports/Ratel/Common/Fiber/Materials/T_Fiber_Basecolor.mat.meta b/Imports/Ratel/Common/Fiber/Materials/T_Fiber_Basecolor.mat.meta new file mode 100644 index 00000000..285ab970 --- /dev/null +++ b/Imports/Ratel/Common/Fiber/Materials/T_Fiber_Basecolor.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c8f61605647f6094fa5d113c5d1847d9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Sources/Animations/ToriaMainController.controller b/Sources/Animations/ToriaMainController.controller index a1ebf096..501781a2 100644 --- a/Sources/Animations/ToriaMainController.controller +++ b/Sources/Animations/ToriaMainController.controller @@ -2208,11 +2208,11 @@ AnimatorStateMachine: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Torche + m_Name: TorchLeft m_ChildStates: - serializedVersion: 1 - m_State: {fileID: -4252740426744811023} - m_Position: {x: 300, y: 120, z: 0} + m_State: {fileID: -716215574471380857} + m_Position: {x: 310, y: 130, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -2222,7 +2222,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: -4252740426744811023} + m_DefaultState: {fileID: -716215574471380857} --- !u!1102 &-6668103813534856680 AnimatorState: serializedVersion: 6 @@ -4079,33 +4079,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &-4252740426744811023 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: New State - 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: -203655887218126122, guid: f034597624196994ca3a6435f8090247, - type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1107 &-4248706082888931467 AnimatorStateMachine: serializedVersion: 6 @@ -7283,6 +7256,33 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &-716215574471380857 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HoldingTorch_Left + 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: -203655887218126122, guid: f034597624196994ca3a6435f8090247, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &-699796217328264956 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -8017,12 +8017,6 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} - - m_Name: usingRightHand - m_Type: 4 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - m_Name: InstantDeath m_Type: 9 m_DefaultFloat: 0 @@ -8065,6 +8059,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: usingRightHand + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base @@ -8103,7 +8103,7 @@ AnimatorController: m_Motion: {fileID: 0} - serializedVersion: 2 m_State: {fileID: 0} - m_Motion: {fileID: 7400000, guid: ff4bed1c84c45284ea58b490480a9bb0, type: 3} + m_Motion: {fileID: 0} - serializedVersion: 2 m_State: {fileID: 6130766454674786} m_Motion: {fileID: 0} @@ -8148,7 +8148,7 @@ AnimatorController: m_Motion: {fileID: 0} - serializedVersion: 2 m_State: {fileID: 0} - m_Motion: {fileID: 7400000, guid: 2f05e8893ad5b8f468ee18803dd27070, type: 2} + m_Motion: {fileID: 0} m_Behaviours: - m_State: {fileID: -8386525712568589046} m_StateMachineBehaviours: [] @@ -8232,25 +8232,25 @@ AnimatorController: m_Motion: {fileID: 7400000, guid: 32dc8717e2f4bf44a8d9b135d8482b8c, type: 2} - serializedVersion: 2 m_State: {fileID: 0} - m_Motion: {fileID: 7400000, guid: b1c4a57ece73d404f9aebbd969b9be3a, type: 3} + m_Motion: {fileID: 0} - serializedVersion: 2 m_State: {fileID: 0} - m_Motion: {fileID: 7400000, guid: b981dfbd71b2d4640989bd5a70989c84, type: 3} + m_Motion: {fileID: 0} - serializedVersion: 2 m_State: {fileID: 0} - m_Motion: {fileID: 7400000, guid: b981dfbd71b2d4640989bd5a70989c84, type: 3} + m_Motion: {fileID: 0} - serializedVersion: 2 m_State: {fileID: 0} - m_Motion: {fileID: 7400000, guid: b1c4a57ece73d404f9aebbd969b9be3a, type: 3} + m_Motion: {fileID: 0} - serializedVersion: 2 m_State: {fileID: 0} - m_Motion: {fileID: 7400000, guid: b1c4a57ece73d404f9aebbd969b9be3a, type: 3} + m_Motion: {fileID: 0} - serializedVersion: 2 m_State: {fileID: 0} - m_Motion: {fileID: 7400000, guid: b1c4a57ece73d404f9aebbd969b9be3a, type: 3} + m_Motion: {fileID: 0} - serializedVersion: 2 m_State: {fileID: 0} - m_Motion: {fileID: 7400000, guid: 2f05e8893ad5b8f468ee18803dd27070, type: 2} + m_Motion: {fileID: 0} m_Behaviours: [] m_BlendingMode: 0 m_SyncedLayerIndex: 0 @@ -8325,10 +8325,10 @@ AnimatorController: m_Motion: {fileID: 7400000, guid: 7d4f25282b77a2148981dc862a46e1ae, type: 2} - serializedVersion: 2 m_State: {fileID: 0} - m_Motion: {fileID: 7400000, guid: 6c38af1f61d523347a39ef97b934ab61, type: 3} + m_Motion: {fileID: 0} - serializedVersion: 2 m_State: {fileID: 0} - m_Motion: {fileID: 7400000, guid: 2f05e8893ad5b8f468ee18803dd27070, type: 2} + m_Motion: {fileID: 0} m_Behaviours: [] m_BlendingMode: 0 m_SyncedLayerIndex: 0 @@ -8388,7 +8388,7 @@ AnimatorController: m_Motion: {fileID: 7400000, guid: 06ab0e6e8cbe1c94b9b0da2bb89ab2a5, type: 2} - serializedVersion: 2 m_State: {fileID: 0} - m_Motion: {fileID: 7400000, guid: 2f05e8893ad5b8f468ee18803dd27070, type: 2} + m_Motion: {fileID: 0} m_Behaviours: [] m_BlendingMode: 0 m_SyncedLayerIndex: 0 @@ -8396,21 +8396,6 @@ AnimatorController: m_IKPass: 1 m_SyncedLayerAffectsTiming: 1 m_Controller: {fileID: 9100000} - - serializedVersion: 5 - m_Name: Torche - m_StateMachine: {fileID: -6725325882510048208} - m_Mask: {fileID: 31900000, guid: 5b346c2072a3f5546924314098ff3dd6, type: 2} - m_Motions: - - serializedVersion: 2 - m_State: {fileID: 0} - m_Motion: {fileID: 7400000, guid: 2f05e8893ad5b8f468ee18803dd27070, type: 2} - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: 0 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} - serializedVersion: 5 m_Name: Bow m_StateMachine: {fileID: -1198411094098662630} @@ -8430,7 +8415,7 @@ AnimatorController: m_Motion: {fileID: 7400096, guid: 4426b47c29d0fa14ea4a47192c35c092, type: 3} - serializedVersion: 2 m_State: {fileID: 0} - m_Motion: {fileID: 7400000, guid: 2f05e8893ad5b8f468ee18803dd27070, type: 2} + m_Motion: {fileID: 0} m_Behaviours: [] m_BlendingMode: 0 m_SyncedLayerIndex: 0 @@ -8474,6 +8459,33 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: TorchLeft + m_StateMachine: {fileID: -6725325882510048208} + m_Mask: {fileID: 31900000, guid: 5b346c2072a3f5546924314098ff3dd6, type: 2} + m_Motions: + - serializedVersion: 2 + m_State: {fileID: 0} + m_Motion: {fileID: 0} + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: TorchRight + m_StateMachine: {fileID: 1577222231105167711} + m_Mask: {fileID: 31900000, guid: 1f6c8acb20dd2fe46add660bca26cd0f, type: 2} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} --- !u!1101 &110115930 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -18426,6 +18438,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1107 &1577222231105167711 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: TorchRight + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 5801471682503009514} + m_Position: {x: 340, y: 150, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + 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: 5801471682503009514} --- !u!1102 &1591010512599322234 AnimatorState: serializedVersion: 6 @@ -21934,6 +21968,33 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &5801471682503009514 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HoldingTorch_Right + 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: 1 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -203655887218126122, guid: f034597624196994ca3a6435f8090247, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!114 &5818476610424428948 MonoBehaviour: m_ObjectHideFlags: 1