diff --git a/Assets/Import/Fairy Pet/Fairy Pet.prefab b/Assets/Import/Fairy Pet/Fairy Pet.prefab
deleted file mode 100644
index 8b529771ce78ee3dd5be28bf48de65734326df6c..0000000000000000000000000000000000000000
--- a/Assets/Import/Fairy Pet/Fairy Pet.prefab
+++ /dev/null
@@ -1,672 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &348883576905694902
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6755055074116141233}
- m_Layer: 0
- m_Name: Navi.fbx
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &6755055074116141233
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 348883576905694902}
- serializedVersion: 2
- m_LocalRotation: {x: 0.7071068, y: 0, z: -0, w: -0.7071068}
- m_LocalPosition: {x: 0, y: 0, z: -0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 8096519517108927016}
- m_Father: {fileID: 5821201857054705746}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1144071162852826096
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 2664150760027912577}
- m_Layer: 0
- m_Name: _rootJoint
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &2664150760027912577
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1144071162852826096}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: -0, w: -1}
- m_LocalPosition: {x: 0, y: 0, z: -0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 1057107797221783893}
- m_Father: {fileID: 6141019089264754043}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1543844357297549919
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6464201358739579636}
- m_Layer: 0
- m_Name: Object_6
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &6464201358739579636
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1543844357297549919}
- serializedVersion: 2
- m_LocalRotation: {x: -0.7071068, y: -1.0375968e-14, z: 1.0869346e-14, w: -0.7071068}
- m_LocalPosition: {x: -3.6700056e-11, y: -3.5159933e-16, z: -5.5992597e-13}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 6141019089264754043}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3602930714935618962
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5821201857054705746}
- m_Layer: 0
- m_Name: Sketchfab_model
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &5821201857054705746
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3602930714935618962}
- serializedVersion: 2
- m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: -0.7071068}
- m_LocalPosition: {x: 0.000058328336, y: -2.4049785, z: -2.6537337}
- m_LocalScale: {x: 0.08753114, y: 0.08753114, z: 0.08753114}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 6755055074116141233}
- m_Father: {fileID: 966888307786304144}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3788280587056849830
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1057107797221783893}
- m_Layer: 0
- m_Name: fairy_qc_skeleton_00
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1057107797221783893
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3788280587056849830}
- serializedVersion: 2
- m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: -0.7071067}
- m_LocalPosition: {x: 0, y: 0, z: -0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 713805226272955370}
- m_Father: {fileID: 2664150760027912577}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3875000545293788105
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 966888307786304144}
- - component: {fileID: 644668927765366789}
- - component: {fileID: 3499149715988182763}
- - component: {fileID: 548764209503606066}
- - component: {fileID: 6339998406930842575}
- m_Layer: 0
- m_Name: Fairy Pet
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &966888307786304144
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3875000545293788105}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 3.39, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 5821201857054705746}
- m_Father: {fileID: 0}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!95 &644668927765366789
-Animator:
- serializedVersion: 5
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3875000545293788105}
- m_Enabled: 1
- m_Avatar: {fileID: 0}
- m_Controller: {fileID: 9100000, guid: b71c891bef74fcc41ae3ea4ce05ad2c5, type: 2}
- m_CullingMode: 0
- m_UpdateMode: 0
- m_ApplyRootMotion: 0
- m_LinearVelocityBlending: 0
- m_StabilizeFeet: 0
- m_WarningMessage:
- m_HasTransformHierarchy: 1
- m_AllowConstantClipSamplingOptimization: 1
- m_KeepAnimatorStateOnDisable: 0
- m_WriteDefaultValuesOnDisable: 0
---- !u!195 &3499149715988182763
-NavMeshAgent:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3875000545293788105}
- m_Enabled: 1
- m_AgentTypeID: 0
- m_Radius: 0.5
- m_Speed: 3.5
- m_Acceleration: 8
- avoidancePriority: 50
- m_AngularSpeed: 120
- m_StoppingDistance: 0
- m_AutoTraverseOffMeshLink: 1
- m_AutoBraking: 1
- m_AutoRepath: 1
- m_Height: 2
- m_BaseOffset: 0
- m_WalkableMask: 4294967295
- m_ObstacleAvoidanceType: 4
---- !u!114 &548764209503606066
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3875000545293788105}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 448d99e48d7e5804787c9eb527f96087, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- path: {fileID: 0}
- currentState:
---- !u!114 &6339998406930842575
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3875000545293788105}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 9bf5f85c3b57919419c75499773d9d4b, type: 3}
- m_Name:
- m_EditorClassIdentifier:
---- !u!1 &5294517103747172021
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8579353222112687601}
- m_Layer: 0
- m_Name: fairy_wings_L_03
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &8579353222112687601
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5294517103747172021}
- serializedVersion: 2
- m_LocalRotation: {x: -0.68379664, y: -0.000000051625207, z: -1.187024e-14, w: -0.7296727}
- m_LocalPosition: {x: 0.00000006421697, y: -0.1412749, z: -2.1740587}
- m_LocalScale: {x: 1, y: 0.9999999, z: 0.9999999}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 713805226272955370}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5828928452601550348
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 7358576209465132444}
- - component: {fileID: 5603430068416824759}
- m_Layer: 0
- m_Name: Object_7
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &7358576209465132444
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5828928452601550348}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: -0, w: -1}
- m_LocalPosition: {x: 0, y: 0, z: -0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 6141019089264754043}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &5603430068416824759
-SkinnedMeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5828928452601550348}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 3
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 5ca35f535e147d3439301cb8e00fa6c0, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- serializedVersion: 2
- m_Quality: 0
- m_UpdateWhenOffscreen: 0
- m_SkinnedMotionVectors: 1
- m_Mesh: {fileID: 4300000, guid: 92c745c9992a95f4c9d7b55c64f4e7fa, type: 2}
- m_Bones:
- - {fileID: 2664150760027912577}
- - {fileID: 1057107797221783893}
- - {fileID: 713805226272955370}
- - {fileID: 1481454704328144900}
- - {fileID: 8579353222112687601}
- m_BlendShapeWeights: []
- m_RootBone: {fileID: 0}
- m_AABB:
- m_Center: {x: 0, y: 0, z: 0}
- m_Extent: {x: 0, y: 0, z: 0}
- m_DirtyAABB: 0
---- !u!1 &7199057269388235417
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5328949563805921836}
- m_Layer: 0
- m_Name: fairy_reference_001
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &5328949563805921836
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7199057269388235417}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: -0, w: -1}
- m_LocalPosition: {x: 0, y: 0, z: -0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 6141019089264754043}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &7357467698356110505
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 6141019089264754043}
- m_Layer: 0
- m_Name: Object_4
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &6141019089264754043
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7357467698356110505}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: -0, w: -1}
- m_LocalPosition: {x: 0, y: 0, z: -0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 2664150760027912577}
- - {fileID: 7358576209465132444}
- - {fileID: 8889891604708804721}
- - {fileID: 6464201358739579636}
- - {fileID: 5328949563805921836}
- m_Father: {fileID: 5645456673773390134}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &7877622915410143391
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8096519517108927016}
- m_Layer: 0
- m_Name: Object_2
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &8096519517108927016
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7877622915410143391}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: -0, w: -1}
- m_LocalPosition: {x: 0, y: 0, z: -0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 5645456673773390134}
- m_Father: {fileID: 6755055074116141233}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &7990922998704324036
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 8889891604708804721}
- - component: {fileID: 1401860704291249237}
- m_Layer: 0
- m_Name: Object_8
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &8889891604708804721
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7990922998704324036}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: -0, w: -1}
- m_LocalPosition: {x: 0, y: 0, z: -0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 6141019089264754043}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &1401860704291249237
-SkinnedMeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 7990922998704324036}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 3
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 53c1e7dec936e504a8fd723f40511e7e, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- serializedVersion: 2
- m_Quality: 0
- m_UpdateWhenOffscreen: 0
- m_SkinnedMotionVectors: 1
- m_Mesh: {fileID: 4300000, guid: 8330af2f461272743ac0ffbc91b58463, type: 2}
- m_Bones:
- - {fileID: 2664150760027912577}
- - {fileID: 1057107797221783893}
- - {fileID: 713805226272955370}
- - {fileID: 1481454704328144900}
- - {fileID: 8579353222112687601}
- m_BlendShapeWeights: []
- m_RootBone: {fileID: 0}
- m_AABB:
- m_Center: {x: 0, y: 0, z: 0}
- m_Extent: {x: 0, y: 0, z: 0}
- m_DirtyAABB: 0
---- !u!1 &8461376658669973021
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1481454704328144900}
- m_Layer: 0
- m_Name: fairy_wings_R_02
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1481454704328144900
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8461376658669973021}
- serializedVersion: 2
- m_LocalRotation: {x: -0.68379664, y: -0.000000051625207, z: -1.187024e-14, w: -0.7296727}
- m_LocalPosition: {x: -0.00000006420265, y: 0.14108388, z: 2.1711276}
- m_LocalScale: {x: 1, y: 0.9999999, z: 0.9999999}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 713805226272955370}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8604281886687204497
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 713805226272955370}
- m_Layer: 0
- m_Name: fairy_root_01
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &713805226272955370
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8604281886687204497}
- serializedVersion: 2
- m_LocalRotation: {x: 0.7067348, y: -0.02293807, z: -0.7067345, w: -0.02293808}
- m_LocalPosition: {x: -0.001469, y: 0, z: -0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 1481454704328144900}
- - {fileID: 8579353222112687601}
- m_Father: {fileID: 1057107797221783893}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8962482341695735415
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 5645456673773390134}
- m_Layer: 0
- m_Name: RootNode
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &5645456673773390134
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8962482341695735415}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: -0, w: -1}
- m_LocalPosition: {x: 0, y: 0, z: -0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 6141019089264754043}
- m_Father: {fileID: 8096519517108927016}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Import/Fairy Pet.meta b/Assets/Prefabs/Pets/Fairy Pet.meta
similarity index 100%
rename from Assets/Import/Fairy Pet.meta
rename to Assets/Prefabs/Pets/Fairy Pet.meta
diff --git a/Assets/Prefabs/Pets/Fairy Pet.prefab b/Assets/Prefabs/Pets/Fairy Pet/Fairy Pet.prefab
similarity index 100%
rename from Assets/Prefabs/Pets/Fairy Pet.prefab
rename to Assets/Prefabs/Pets/Fairy Pet/Fairy Pet.prefab
diff --git a/Assets/Prefabs/Pets/Fairy Pet.prefab.meta b/Assets/Prefabs/Pets/Fairy Pet/Fairy Pet.prefab.meta
similarity index 100%
rename from Assets/Prefabs/Pets/Fairy Pet.prefab.meta
rename to Assets/Prefabs/Pets/Fairy Pet/Fairy Pet.prefab.meta
diff --git a/Assets/Import/Fairy Pet/animations.meta b/Assets/Prefabs/Pets/Fairy Pet/animations.meta
similarity index 100%
rename from Assets/Import/Fairy Pet/animations.meta
rename to Assets/Prefabs/Pets/Fairy Pet/animations.meta
diff --git a/Assets/Import/Fairy Pet/animations/Fairy Pet.controller b/Assets/Prefabs/Pets/Fairy Pet/animations/Fairy Pet.controller
similarity index 100%
rename from Assets/Import/Fairy Pet/animations/Fairy Pet.controller
rename to Assets/Prefabs/Pets/Fairy Pet/animations/Fairy Pet.controller
diff --git a/Assets/Import/Fairy Pet/animations/Fairy Pet.controller.meta b/Assets/Prefabs/Pets/Fairy Pet/animations/Fairy Pet.controller.meta
similarity index 100%
rename from Assets/Import/Fairy Pet/animations/Fairy Pet.controller.meta
rename to Assets/Prefabs/Pets/Fairy Pet/animations/Fairy Pet.controller.meta
diff --git a/Assets/Import/Fairy Pet/animations/idle.anim b/Assets/Prefabs/Pets/Fairy Pet/animations/idle.anim
similarity index 100%
rename from Assets/Import/Fairy Pet/animations/idle.anim
rename to Assets/Prefabs/Pets/Fairy Pet/animations/idle.anim
diff --git a/Assets/Import/Fairy Pet/animations/idle.anim.meta b/Assets/Prefabs/Pets/Fairy Pet/animations/idle.anim.meta
similarity index 100%
rename from Assets/Import/Fairy Pet/animations/idle.anim.meta
rename to Assets/Prefabs/Pets/Fairy Pet/animations/idle.anim.meta
diff --git a/Assets/Import/Fairy Pet/materials.meta b/Assets/Prefabs/Pets/Fairy Pet/materials.meta
similarity index 100%
rename from Assets/Import/Fairy Pet/materials.meta
rename to Assets/Prefabs/Pets/Fairy Pet/materials.meta
diff --git a/Assets/Import/Fairy Pet/materials/fairy_navi_1.mat b/Assets/Prefabs/Pets/Fairy Pet/materials/fairy_navi_1.mat
similarity index 100%
rename from Assets/Import/Fairy Pet/materials/fairy_navi_1.mat
rename to Assets/Prefabs/Pets/Fairy Pet/materials/fairy_navi_1.mat
diff --git a/Assets/Import/Fairy Pet/materials/fairy_navi_1.mat.meta b/Assets/Prefabs/Pets/Fairy Pet/materials/fairy_navi_1.mat.meta
similarity index 100%
rename from Assets/Import/Fairy Pet/materials/fairy_navi_1.mat.meta
rename to Assets/Prefabs/Pets/Fairy Pet/materials/fairy_navi_1.mat.meta
diff --git a/Assets/Import/Fairy Pet/materials/fairy_wings_0.mat b/Assets/Prefabs/Pets/Fairy Pet/materials/fairy_wings_0.mat
similarity index 100%
rename from Assets/Import/Fairy Pet/materials/fairy_wings_0.mat
rename to Assets/Prefabs/Pets/Fairy Pet/materials/fairy_wings_0.mat
diff --git a/Assets/Import/Fairy Pet/materials/fairy_wings_0.mat.meta b/Assets/Prefabs/Pets/Fairy Pet/materials/fairy_wings_0.mat.meta
similarity index 100%
rename from Assets/Import/Fairy Pet/materials/fairy_wings_0.mat.meta
rename to Assets/Prefabs/Pets/Fairy Pet/materials/fairy_wings_0.mat.meta
diff --git a/Assets/Import/Fairy Pet/meshes.meta b/Assets/Prefabs/Pets/Fairy Pet/meshes.meta
similarity index 100%
rename from Assets/Import/Fairy Pet/meshes.meta
rename to Assets/Prefabs/Pets/Fairy Pet/meshes.meta
diff --git a/Assets/Import/Fairy Pet/meshes/fairy_reference_001_fairy_navi_0_1_0.asset b/Assets/Prefabs/Pets/Fairy Pet/meshes/fairy_reference_001_fairy_navi_0_1_0.asset
similarity index 100%
rename from Assets/Import/Fairy Pet/meshes/fairy_reference_001_fairy_navi_0_1_0.asset
rename to Assets/Prefabs/Pets/Fairy Pet/meshes/fairy_reference_001_fairy_navi_0_1_0.asset
diff --git a/Assets/Import/Fairy Pet/meshes/fairy_reference_001_fairy_navi_0_1_0.asset.meta b/Assets/Prefabs/Pets/Fairy Pet/meshes/fairy_reference_001_fairy_navi_0_1_0.asset.meta
similarity index 100%
rename from Assets/Import/Fairy Pet/meshes/fairy_reference_001_fairy_navi_0_1_0.asset.meta
rename to Assets/Prefabs/Pets/Fairy Pet/meshes/fairy_reference_001_fairy_navi_0_1_0.asset.meta
diff --git a/Assets/Import/Fairy Pet/meshes/fairy_reference_001_fairy_wings_0_0_0.asset b/Assets/Prefabs/Pets/Fairy Pet/meshes/fairy_reference_001_fairy_wings_0_0_0.asset
similarity index 100%
rename from Assets/Import/Fairy Pet/meshes/fairy_reference_001_fairy_wings_0_0_0.asset
rename to Assets/Prefabs/Pets/Fairy Pet/meshes/fairy_reference_001_fairy_wings_0_0_0.asset
diff --git a/Assets/Import/Fairy Pet/meshes/fairy_reference_001_fairy_wings_0_0_0.asset.meta b/Assets/Prefabs/Pets/Fairy Pet/meshes/fairy_reference_001_fairy_wings_0_0_0.asset.meta
similarity index 100%
rename from Assets/Import/Fairy Pet/meshes/fairy_reference_001_fairy_wings_0_0_0.asset.meta
rename to Assets/Prefabs/Pets/Fairy Pet/meshes/fairy_reference_001_fairy_wings_0_0_0.asset.meta
diff --git a/Assets/Import/Fairy Pet/textures.meta b/Assets/Prefabs/Pets/Fairy Pet/textures.meta
similarity index 100%
rename from Assets/Import/Fairy Pet/textures.meta
rename to Assets/Prefabs/Pets/Fairy Pet/textures.meta
diff --git a/Assets/Import/Fairy Pet/textures/fairy_navi_baseColor_1.png b/Assets/Prefabs/Pets/Fairy Pet/textures/fairy_navi_baseColor_1.png
similarity index 100%
rename from Assets/Import/Fairy Pet/textures/fairy_navi_baseColor_1.png
rename to Assets/Prefabs/Pets/Fairy Pet/textures/fairy_navi_baseColor_1.png
diff --git a/Assets/Import/Fairy Pet/textures/fairy_navi_baseColor_1.png.meta b/Assets/Prefabs/Pets/Fairy Pet/textures/fairy_navi_baseColor_1.png.meta
similarity index 100%
rename from Assets/Import/Fairy Pet/textures/fairy_navi_baseColor_1.png.meta
rename to Assets/Prefabs/Pets/Fairy Pet/textures/fairy_navi_baseColor_1.png.meta
diff --git a/Assets/Import/Fairy Pet/textures/fairy_wings_baseColor_0.png b/Assets/Prefabs/Pets/Fairy Pet/textures/fairy_wings_baseColor_0.png
similarity index 100%
rename from Assets/Import/Fairy Pet/textures/fairy_wings_baseColor_0.png
rename to Assets/Prefabs/Pets/Fairy Pet/textures/fairy_wings_baseColor_0.png
diff --git a/Assets/Import/Fairy Pet/textures/fairy_wings_baseColor_0.png.meta b/Assets/Prefabs/Pets/Fairy Pet/textures/fairy_wings_baseColor_0.png.meta
similarity index 100%
rename from Assets/Import/Fairy Pet/textures/fairy_wings_baseColor_0.png.meta
rename to Assets/Prefabs/Pets/Fairy Pet/textures/fairy_wings_baseColor_0.png.meta
diff --git a/Assets/Prefabs/Wolf_Animated.meta b/Assets/Prefabs/Pets/Wolf Pet.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated.meta
rename to Assets/Prefabs/Pets/Wolf Pet.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Material.meta b/Assets/Prefabs/Pets/Wolf Pet/Material.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Material.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Material.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Material/Wolf.mat b/Assets/Prefabs/Pets/Wolf Pet/Material/Wolf.mat
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Material/Wolf.mat
rename to Assets/Prefabs/Pets/Wolf Pet/Material/Wolf.mat
diff --git a/Assets/Prefabs/Wolf_Animated/Material/Wolf.mat.meta b/Assets/Prefabs/Pets/Wolf Pet/Material/Wolf.mat.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Material/Wolf.mat.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Material/Wolf.mat.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Model.meta b/Assets/Prefabs/Pets/Wolf Pet/Model.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Model.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Materials.meta b/Assets/Prefabs/Pets/Wolf Pet/Model/Materials.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Materials.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Materials.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Materials/Wolf_Albedo1.mat b/Assets/Prefabs/Pets/Wolf Pet/Model/Materials/Wolf_Albedo1.mat
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Materials/Wolf_Albedo1.mat
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Materials/Wolf_Albedo1.mat
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Materials/Wolf_Albedo1.mat.meta b/Assets/Prefabs/Pets/Wolf Pet/Model/Materials/Wolf_Albedo1.mat.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Materials/Wolf_Albedo1.mat.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Materials/Wolf_Albedo1.mat.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_Digs.FBX b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_Digs.FBX
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_Digs.FBX
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_Digs.FBX
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_Digs.FBX.meta b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_Digs.FBX.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_Digs.FBX.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_Digs.FBX.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_animation.controller b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_animation.controller
similarity index 64%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_animation.controller
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_animation.controller
index 4ec46544f907ef7425b33a9ce726a3bee8d8035a..c9fe18f26b9f23cac35a36dac9057a78bcd39acd 100644
--- a/Assets/Prefabs/Wolf_Animated/Model/Wolf_animation.controller
+++ b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_animation.controller
@@ -17,9 +17,9 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
- m_TransitionDuration: 0.25
+ m_TransitionDuration: 0
m_TransitionOffset: 0
- m_ExitTime: 0.75
+ m_ExitTime: 0
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
@@ -51,7 +51,20 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
---- !u!1101 &-6618319624563714922
+--- !u!114 &-7543205785208555882
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: a3d56069cb271a440bcc77af2d00f707, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ idleTime: 0
+--- !u!1101 &-6672659925179011428
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -59,18 +72,18 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- - m_ConditionMode: 1
+ - m_ConditionMode: 2
m_ConditionEvent: isFollowing
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: -4993268556953334356}
+ m_DstState: {fileID: -5787318064195990180}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.75
+ m_ExitTime: 0.925
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
@@ -86,8 +99,10 @@ AnimatorState:
m_Name: attack1
m_Speed: 1
m_CycleOffset: 0
- m_Transitions: []
- m_StateMachineBehaviours: []
+ m_Transitions:
+ - {fileID: 4308682138459867171}
+ m_StateMachineBehaviours:
+ - {fileID: 973248038036687397}
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
@@ -112,8 +127,11 @@ AnimatorState:
m_Name: breathes
m_Speed: 1
m_CycleOffset: 0
- m_Transitions: []
- m_StateMachineBehaviours: []
+ m_Transitions:
+ - {fileID: 469437836901334946}
+ - {fileID: 1028379272819215690}
+ m_StateMachineBehaviours:
+ - {fileID: -7543205785208555882}
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
@@ -138,8 +156,10 @@ AnimatorState:
m_Name: walk
m_Speed: 1
m_CycleOffset: 0
- m_Transitions: []
- m_StateMachineBehaviours: []
+ m_Transitions:
+ - {fileID: -6672659925179011428}
+ m_StateMachineBehaviours:
+ - {fileID: -4563053511282628363}
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
@@ -154,6 +174,66 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
+--- !u!114 &-4563053511282628363
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: 2365ebf0af12ffa429aa1e98f0e188d1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ followSpeed: 5
+--- !u!1101 &-3918804734540714632
+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: -5787318064195990180}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.8125
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &-1826386916009402958
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 2
+ m_ConditionEvent: isCharging
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -5787318064195990180}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.925
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1102 &-657766864015546617
AnimatorState:
serializedVersion: 6
@@ -164,8 +244,11 @@ AnimatorState:
m_Name: run
m_Speed: 1
m_CycleOffset: 0
- m_Transitions: []
- m_StateMachineBehaviours: []
+ m_Transitions:
+ - {fileID: 243893529096177852}
+ - {fileID: -1826386916009402958}
+ m_StateMachineBehaviours:
+ - {fileID: 3025534309837950764}
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
@@ -202,7 +285,7 @@ AnimatorController:
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: isAttacking
- m_Type: 9
+ m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
@@ -243,37 +326,84 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: -5787318064195990180}
- m_Position: {x: 270, y: 110, z: 0}
+ m_Position: {x: 210, y: 150, z: 0}
- serializedVersion: 1
m_State: {fileID: -6083100217596034681}
- m_Position: {x: 260, y: -70, z: 0}
+ m_Position: {x: 210, y: -100, z: 0}
- serializedVersion: 1
m_State: {fileID: 8299852092238851394}
- m_Position: {x: 20, y: -70, z: 0}
+ m_Position: {x: -110, y: 80, z: 0}
- serializedVersion: 1
m_State: {fileID: -7957386874051242581}
- m_Position: {x: 260, y: 10, z: 0}
+ m_Position: {x: 160, y: 10, z: 0}
- serializedVersion: 1
m_State: {fileID: -657766864015546617}
- m_Position: {x: -200, y: 20, z: 0}
+ m_Position: {x: 400, y: 40, z: 0}
- serializedVersion: 1
m_State: {fileID: -4993268556953334356}
- m_Position: {x: -210, y: -70, z: 0}
+ m_Position: {x: 210, y: 300, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 880161630578349779}
- - {fileID: 3092019323183136062}
- {fileID: -8167980949885886406}
- - {fileID: -6618319624563714922}
- - {fileID: 4223831648132340866}
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
- m_AnyStatePosition: {x: 50, y: 20, z: 0}
- m_EntryPosition: {x: 50, y: 120, z: 0}
+ m_AnyStatePosition: {x: -110, y: 20, z: 0}
+ m_EntryPosition: {x: -120, y: 160, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -5787318064195990180}
+--- !u!1101 &243893529096177852
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: isAttacking
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -6083100217596034681}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.925
+ m_HasExitTime: 1
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
+--- !u!1101 &469437836901334946
+AnimatorStateTransition:
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ m_Conditions:
+ - m_ConditionMode: 1
+ m_ConditionEvent: isFollowing
+ m_EventTreshold: 0
+ m_DstStateMachine: {fileID: 0}
+ m_DstState: {fileID: -4993268556953334356}
+ m_Solo: 0
+ m_Mute: 0
+ m_IsExit: 0
+ serializedVersion: 3
+ m_TransitionDuration: 0.25
+ m_TransitionOffset: 0
+ m_ExitTime: 0.8125
+ m_HasExitTime: 0
+ m_HasFixedDuration: 1
+ m_InterruptionSource: 0
+ m_OrderedInterruption: 1
+ m_CanTransitionToSelf: 1
--- !u!1101 &880161630578349779
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -299,7 +429,21 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &3092019323183136062
+--- !u!114 &973248038036687397
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: 451e8dfff6b5ac342a22026a9c898dcc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ attackDistance: 2
+ attackDamage: 10
+--- !u!1101 &1028379272819215690
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -308,23 +452,37 @@ AnimatorStateTransition:
m_Name:
m_Conditions:
- m_ConditionMode: 1
- m_ConditionEvent: isAttacking
+ m_ConditionEvent: isCharging
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
- m_DstState: {fileID: -6083100217596034681}
+ m_DstState: {fileID: -657766864015546617}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.75
+ m_ExitTime: 0.8125
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
---- !u!1101 &4223831648132340866
+--- !u!114 &3025534309837950764
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ 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: e2b6a51fa167c284da8d703e2ae7be9d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ stopChasingDistance: 3
+ chasingSpeed: 10
+--- !u!1101 &4308682138459867171
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -332,8 +490,8 @@ AnimatorStateTransition:
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- - m_ConditionMode: 1
- m_ConditionEvent: isCharging
+ - m_ConditionMode: 2
+ m_ConditionEvent: isAttacking
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -657766864015546617}
@@ -343,7 +501,7 @@ AnimatorStateTransition:
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
- m_ExitTime: 0.75
+ m_ExitTime: 0.85294116
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
@@ -359,7 +517,8 @@ AnimatorState:
m_Name: damege
m_Speed: 1
m_CycleOffset: 0
- m_Transitions: []
+ m_Transitions:
+ - {fileID: -3918804734540714632}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_animation.controller.meta b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_animation.controller.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_animation.controller.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_animation.controller.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_attack1.FBX b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_attack1.FBX
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_attack1.FBX
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_attack1.FBX
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_attack1.FBX.meta b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_attack1.FBX.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_attack1.FBX.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_attack1.FBX.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_attack2.FBX b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_attack2.FBX
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_attack2.FBX
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_attack2.FBX
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_attack2.FBX.meta b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_attack2.FBX.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_attack2.FBX.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_attack2.FBX.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_breathes.FBX b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_breathes.FBX
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_breathes.FBX
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_breathes.FBX
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_breathes.FBX.meta b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_breathes.FBX.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_breathes.FBX.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_breathes.FBX.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_damege.FBX b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_damege.FBX
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_damege.FBX
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_damege.FBX
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_damege.FBX.meta b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_damege.FBX.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_damege.FBX.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_damege.FBX.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_die.FBX b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_die.FBX
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_die.FBX
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_die.FBX
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_die.FBX.meta b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_die.FBX.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_die.FBX.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_die.FBX.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_eating.FBX b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_eating.FBX
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_eating.FBX
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_eating.FBX
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_eating.FBX.meta b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_eating.FBX.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_eating.FBX.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_eating.FBX.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_howl.FBX b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_howl.FBX
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_howl.FBX
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_howl.FBX
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_howl.FBX.meta b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_howl.FBX.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_howl.FBX.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_howl.FBX.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_run.FBX b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_run.FBX
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_run.FBX
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_run.FBX
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_run.FBX.meta b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_run.FBX.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_run.FBX.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_run.FBX.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_sit.FBX b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_sit.FBX
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_sit.FBX
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_sit.FBX
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_sit.FBX.meta b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_sit.FBX.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_sit.FBX.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_sit.FBX.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_walk.FBX b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_walk.FBX
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_walk.FBX
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_walk.FBX
diff --git a/Assets/Prefabs/Wolf_Animated/Model/Wolf_walk.FBX.meta b/Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_walk.FBX.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Model/Wolf_walk.FBX.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Model/Wolf_walk.FBX.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Prefabs.meta b/Assets/Prefabs/Pets/Wolf Pet/Prefabs.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Prefabs.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Prefabs.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Prefabs/Wolf.prefab b/Assets/Prefabs/Pets/Wolf Pet/Prefabs/Wolf.prefab
similarity index 97%
rename from Assets/Prefabs/Wolf_Animated/Prefabs/Wolf.prefab
rename to Assets/Prefabs/Pets/Wolf Pet/Prefabs/Wolf.prefab
index 63af7b7448a49f3477e185205f088e8b35df7691..36b661f1d8bad3f6902694deecf142a890ec5db5 100644
--- a/Assets/Prefabs/Wolf_Animated/Prefabs/Wolf.prefab
+++ b/Assets/Prefabs/Pets/Wolf Pet/Prefabs/Wolf.prefab
@@ -797,9 +797,11 @@ GameObject:
m_Component:
- component: {fileID: 477254}
- component: {fileID: 9547338}
+ - component: {fileID: 6750622181414969394}
+ - component: {fileID: 8378916169446490783}
m_Layer: 7
m_Name: Wolf
- m_TagString: Enemy
+ m_TagString: Pet
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -814,8 +816,8 @@ Transform:
serializedVersion: 2
m_LocalRotation: {x: 0, y: -0.28635734, z: 0, w: 0.9581229}
m_LocalPosition: {x: -1.6315856, y: -2.3763413e-17, z: 1.0702089}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
+ m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
+ m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 497144}
- {fileID: 414582}
@@ -836,7 +838,7 @@ Animator:
m_GameObject: {fileID: 175852}
m_Enabled: 1
m_Avatar: {fileID: 9000000, guid: 1021c3a1a114cd149aa3d292fe946e87, type: 3}
- m_Controller: {fileID: 9100000, guid: 637de76f13af2dc48b2b805604d0735a, type: 2}
+ m_Controller: {fileID: 9100000, guid: 4207a14823e50e6438f37b401c727159, type: 2}
m_CullingMode: 1
m_UpdateMode: 0
m_ApplyRootMotion: 0
@@ -847,6 +849,43 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
+--- !u!195 &6750622181414969394
+NavMeshAgent:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 175852}
+ m_Enabled: 1
+ m_AgentTypeID: 0
+ m_Radius: 0.5
+ m_Speed: 3.5
+ m_Acceleration: 8
+ avoidancePriority: 50
+ m_AngularSpeed: 120
+ m_StoppingDistance: 0
+ m_AutoTraverseOffMeshLink: 1
+ m_AutoBraking: 1
+ m_AutoRepath: 1
+ m_Height: 2
+ m_BaseOffset: 0
+ m_WalkableMask: 4294967295
+ m_ObstacleAvoidanceType: 4
+--- !u!114 &8378916169446490783
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 175852}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f64f5ab9c59da9d48bc42e9e8995ca24, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ health: 100
+ maxHealth: 100
+ isDead: 0
--- !u!1 &176664
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/Wolf_Animated/Prefabs/Wolf.prefab.meta b/Assets/Prefabs/Pets/Wolf Pet/Prefabs/Wolf.prefab.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Prefabs/Wolf.prefab.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Prefabs/Wolf.prefab.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Scene.meta b/Assets/Prefabs/Pets/Wolf Pet/Scene.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Scene.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Scene.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Scene/Wolf_scene.unity b/Assets/Prefabs/Pets/Wolf Pet/Scene/Wolf_scene.unity
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Scene/Wolf_scene.unity
rename to Assets/Prefabs/Pets/Wolf Pet/Scene/Wolf_scene.unity
diff --git a/Assets/Prefabs/Wolf_Animated/Scene/Wolf_scene.unity.meta b/Assets/Prefabs/Pets/Wolf Pet/Scene/Wolf_scene.unity.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Scene/Wolf_scene.unity.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Scene/Wolf_scene.unity.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Scene/Wolf_sceneSettings.lighting b/Assets/Prefabs/Pets/Wolf Pet/Scene/Wolf_sceneSettings.lighting
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Scene/Wolf_sceneSettings.lighting
rename to Assets/Prefabs/Pets/Wolf Pet/Scene/Wolf_sceneSettings.lighting
diff --git a/Assets/Prefabs/Wolf_Animated/Scene/Wolf_sceneSettings.lighting.meta b/Assets/Prefabs/Pets/Wolf Pet/Scene/Wolf_sceneSettings.lighting.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Scene/Wolf_sceneSettings.lighting.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Scene/Wolf_sceneSettings.lighting.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Textures.meta b/Assets/Prefabs/Pets/Wolf Pet/Textures.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Textures.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Textures.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Textures/Wolf_Albedo.tga b/Assets/Prefabs/Pets/Wolf Pet/Textures/Wolf_Albedo.tga
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Textures/Wolf_Albedo.tga
rename to Assets/Prefabs/Pets/Wolf Pet/Textures/Wolf_Albedo.tga
diff --git a/Assets/Prefabs/Wolf_Animated/Textures/Wolf_Albedo.tga.meta b/Assets/Prefabs/Pets/Wolf Pet/Textures/Wolf_Albedo.tga.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Textures/Wolf_Albedo.tga.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Textures/Wolf_Albedo.tga.meta
diff --git a/Assets/Prefabs/Wolf_Animated/Textures/Wolf_normal.tga b/Assets/Prefabs/Pets/Wolf Pet/Textures/Wolf_normal.tga
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Textures/Wolf_normal.tga
rename to Assets/Prefabs/Pets/Wolf Pet/Textures/Wolf_normal.tga
diff --git a/Assets/Prefabs/Wolf_Animated/Textures/Wolf_normal.tga.meta b/Assets/Prefabs/Pets/Wolf Pet/Textures/Wolf_normal.tga.meta
similarity index 100%
rename from Assets/Prefabs/Wolf_Animated/Textures/Wolf_normal.tga.meta
rename to Assets/Prefabs/Pets/Wolf Pet/Textures/Wolf_normal.tga.meta
diff --git a/Assets/Script/Bot/Pet/Pet.cs b/Assets/Script/Bot/Pet/Pet.cs
index 077f5a4266f7bc40163e97ea894cc63656129e32..9f296cc5ac7238fcf7d1fe226e0f607010f09081 100644
--- a/Assets/Script/Bot/Pet/Pet.cs
+++ b/Assets/Script/Bot/Pet/Pet.cs
@@ -6,12 +6,13 @@ using UnityEngine.AI;
public abstract class Pet : MonoBehaviour
{
[SerializeField]
- private int health;
+ public int health;
public int maxHealth;
public float speed;
public bool isDead;
-
+ private Animator animator;
+
// Start is called before the first frame update
void Start()
{
@@ -22,6 +23,7 @@ public abstract class Pet : MonoBehaviour
// Update is called once per frame
void Update()
{
+ Debug.Log("Pet Health: " + health);
if (health <= 0)
{
isDead = true;
@@ -34,13 +36,14 @@ public abstract class Pet : MonoBehaviour
if (health > 0)
{
health -= damage;
+ gameObject.GetComponent<Animator>().SetTrigger("isHit");
}
-
}
- private IEnumerator Dead()
+ public IEnumerator Dead()
{
- yield return new WaitForSeconds(1);
+ gameObject.GetComponent<Animator>().SetTrigger("isDead");
+ yield return new WaitForSeconds(2f);
Destroy(gameObject);
}
}
diff --git a/Assets/Script/Bot/Pet/WolfPet.meta b/Assets/Script/Bot/Pet/WolfPet.meta
new file mode 100644
index 0000000000000000000000000000000000000000..90279969ce5785218fb13534b58cfc748d2382e5
--- /dev/null
+++ b/Assets/Script/Bot/Pet/WolfPet.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e517b7d3a52dc9b43b8d443a346169dc
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Script/Bot/Pet/WolfPet/WolfPet.cs b/Assets/Script/Bot/Pet/WolfPet/WolfPet.cs
new file mode 100644
index 0000000000000000000000000000000000000000..0a1b382d8bbc021173af3dab8d577bf810d0bf35
--- /dev/null
+++ b/Assets/Script/Bot/Pet/WolfPet/WolfPet.cs
@@ -0,0 +1,41 @@
+using System.Collections;
+using System.Collections.Generic;
+using Unity.VisualScripting;
+using UnityEngine;
+
+public class WolfPet : MonoBehaviour
+{
+
+ [SerializeField]
+ public int health = 100;
+ public int maxHealth = 100;
+ public bool isDead;
+
+ void Start()
+ {
+ health = maxHealth;
+ isDead = false;
+ }
+
+ public void TakeDamage(int damage)
+ {
+ Debug.Log("Taking Damage");
+ if (health > 0 && !isDead)
+ {
+ health -= damage;
+ gameObject.GetComponent<Animator>().SetTrigger("isHit");
+ }
+ else if (!isDead)
+ {
+ isDead = true;
+ gameObject.GetComponent<Animator>().SetTrigger("isDying");
+ StartCoroutine(Dead());
+ }
+ }
+
+ public IEnumerator Dead()
+ {
+ yield return new WaitForSeconds(5f);
+ Destroy(gameObject);
+ }
+}
diff --git a/Assets/Script/Bot/Pet/WolfPet/WolfPet.cs.meta b/Assets/Script/Bot/Pet/WolfPet/WolfPet.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..9d40a1f1723465577e5ca571b463e33bce99070e
--- /dev/null
+++ b/Assets/Script/Bot/Pet/WolfPet/WolfPet.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f64f5ab9c59da9d48bc42e9e8995ca24
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/WolfPetAttackState.cs b/Assets/WolfPetAttackState.cs
new file mode 100644
index 0000000000000000000000000000000000000000..fe1b14c98078c3801e4b8bd8f9f6a20fc4f4db6a
--- /dev/null
+++ b/Assets/WolfPetAttackState.cs
@@ -0,0 +1,81 @@
+using System.Collections;
+using System.Collections.Generic;
+using Unity.VisualScripting;
+using UnityEngine;
+using UnityEngine.AI;
+
+public class WolfPetAttackState : StateMachineBehaviour
+{
+ public float attackDistance = 5f;
+ public int attackDamage = 10;
+
+ private GameObject target;
+ NavMeshAgent agent;
+ private GameObject GetClosestEnemy()
+ {
+ GameObject[] enemies = GameObject.FindGameObjectsWithTag("Enemy");
+ GameObject closestEnemy = null;
+ float closestDistance = Mathf.Infinity;
+ Vector3 position = agent.transform.position;
+ foreach (GameObject enemy in enemies)
+ {
+ if (!enemy.IsDestroyed())
+ {
+ Vector3 direction = enemy.transform.position - position;
+ float distance = direction.sqrMagnitude;
+ if (distance < closestDistance)
+ {
+ closestDistance = distance;
+ closestEnemy = enemy;
+ }
+ }
+ }
+ return closestEnemy;
+ }
+
+ override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+ agent = animator.GetComponent<NavMeshAgent>();
+ target = GetClosestEnemy();
+ }
+
+ // OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
+ override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+ if (target != null)
+ {
+ if (Vector3.Distance(agent.transform.position, target.transform.position) <= attackDistance)
+ {
+ agent.transform.LookAt(target.transform);
+ target.GetComponent<Enemy>().TakeDamage(attackDamage);
+ }
+ else
+ {
+ animator.SetBool("isAttacking", false);
+ }
+ }
+ else
+ {
+ animator.SetBool("isAttacking", false);
+ }
+
+ }
+
+ // OnStateExit is called when a transition ends and the state machine finishes evaluating this state
+ //override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ //{
+ //
+ //}
+
+ // OnStateMove is called right after Animator.OnAnimatorMove()
+ //override public void OnStateMove(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ //{
+ // // Implement code that processes and affects root motion
+ //}
+
+ // OnStateIK is called right after Animator.OnAnimatorIK()
+ //override public void OnStateIK(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ //{
+ // // Implement code that sets up animation IK (inverse kinematics)
+ //}
+}
diff --git a/Assets/WolfPetAttackState.cs.meta b/Assets/WolfPetAttackState.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..8041235147597d2624fcebb50bde2946c9b04b8e
--- /dev/null
+++ b/Assets/WolfPetAttackState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 451e8dfff6b5ac342a22026a9c898dcc
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/WolfPetChasingState.cs b/Assets/WolfPetChasingState.cs
new file mode 100644
index 0000000000000000000000000000000000000000..1438aba0fd2a40314697171893412b888a570724
--- /dev/null
+++ b/Assets/WolfPetChasingState.cs
@@ -0,0 +1,65 @@
+using System.Collections;
+using System.Collections.Generic;
+using Unity.VisualScripting;
+using UnityEngine;
+using UnityEngine.AI;
+
+public class WolfPetChasingState : StateMachineBehaviour
+{
+ public float stopChasingDistance = 3f;
+ public float chasingSpeed = 10f;
+
+ private GameObject target;
+ NavMeshAgent agent;
+
+ private GameObject GetClosestEnemy()
+ {
+ GameObject[] enemies = GameObject.FindGameObjectsWithTag("Enemy");
+ GameObject closestEnemy = null;
+ float closestDistance = Mathf.Infinity;
+ Vector3 position = agent.transform.position;
+ foreach (GameObject enemy in enemies)
+ {
+ if (!enemy.IsDestroyed())
+ {
+ Vector3 direction = enemy.transform.position - position;
+ float distance = direction.sqrMagnitude;
+ if (distance < closestDistance)
+ {
+ closestDistance = distance;
+ closestEnemy = enemy;
+ }
+ }
+ }
+ return closestEnemy;
+ }
+
+ override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+ agent = animator.GetComponent<NavMeshAgent>();
+ agent.speed = chasingSpeed;
+ target = GetClosestEnemy();
+ }
+
+ // OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
+ override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+ if (target != null)
+ {
+ agent.SetDestination(target.transform.position);
+ if (Vector3.Distance(agent.transform.position, target.transform.position) <= stopChasingDistance)
+ {
+ animator.SetBool("isAttacking", true);
+ }
+ }
+ else
+ {
+ animator.SetBool("isCharging", false);
+ }
+ }
+
+ public override void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+ agent.SetDestination(agent.transform.position);
+ }
+}
diff --git a/Assets/WolfPetChasingState.cs.meta b/Assets/WolfPetChasingState.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..cd6f1817770f7be162f4b1b056ee16045375692e
--- /dev/null
+++ b/Assets/WolfPetChasingState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e2b6a51fa167c284da8d703e2ae7be9d
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/WolfPetFollowingState.cs b/Assets/WolfPetFollowingState.cs
new file mode 100644
index 0000000000000000000000000000000000000000..6ce1767a3f891a3ecaccf48bcb54be126dca5805
--- /dev/null
+++ b/Assets/WolfPetFollowingState.cs
@@ -0,0 +1,48 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.AI;
+
+public class WolfPetFollowingState : StateMachineBehaviour
+{
+ public float followSpeed = 5f;
+
+ private GameObject player;
+ private GameObject target;
+ NavMeshAgent agent;
+ override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+ player = GameObject.FindGameObjectWithTag("Player");
+ target = GameObject.FindGameObjectWithTag("Enemy");
+ agent = animator.GetComponent<NavMeshAgent>();
+ agent.speed = followSpeed;
+ }
+
+ // OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
+ override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+ // if there is an enemy in the scene, the pet will chase the enemy
+ if (target != null)
+ {
+ animator.SetBool("isFollowing", false);
+ }
+ else // if there is no enemy in the scene, the pet will follow the player
+ {
+ if (Vector3.Distance(player.transform.position, animator.transform.position) > 3)
+ {
+ agent.SetDestination(player.transform.position);
+ }
+ else
+ {
+ agent.SetDestination(agent.transform.position);
+ animator.SetBool("isFollowing", false);
+ }
+ }
+ }
+
+ // OnStateExit is called when a transition ends and the state machine finishes evaluating this state
+ override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+ agent.SetDestination(agent.transform.position);
+ }
+}
diff --git a/Assets/WolfPetFollowingState.cs.meta b/Assets/WolfPetFollowingState.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..e369bf1f42d362eb2104d7ed8f6b3359af66f57e
--- /dev/null
+++ b/Assets/WolfPetFollowingState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2365ebf0af12ffa429aa1e98f0e188d1
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/WolfPetIdleState.cs b/Assets/WolfPetIdleState.cs
new file mode 100644
index 0000000000000000000000000000000000000000..0dc4d6ab8f550a12368a2f796e271932bbfbfa47
--- /dev/null
+++ b/Assets/WolfPetIdleState.cs
@@ -0,0 +1,36 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class WolfPetIdleState : StateMachineBehaviour
+{
+ float timer;
+ public float idleTime = 0f;
+ private GameObject player;
+ private GameObject target;
+
+ override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+ timer = 0;
+ player = GameObject.FindGameObjectWithTag("Player");
+ target = GameObject.FindGameObjectWithTag("Enemy");
+ }
+
+ override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+ {
+ timer += Time.deltaTime;
+
+ // if there is an enemy in the scene, the pet will chase the enemy
+ if (target != null)
+ {
+ animator.SetBool("isCharging", true);
+ }
+ else // if there is no enemy in the scene, the pet will follow the player
+ {
+ if (Vector3.Distance(player.transform.position, animator.transform.position) > 3)
+ {
+ animator.SetBool("isFollowing", true);
+ }
+ }
+ }
+}
diff --git a/Assets/WolfPetIdleState.cs.meta b/Assets/WolfPetIdleState.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..54669bac88b6da7cf49c21aad82c0a95ab0ff08e
--- /dev/null
+++ b/Assets/WolfPetIdleState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a3d56069cb271a440bcc77af2d00f707
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index 4a9f35fd5e7c15fa11916ce1d5c5228f0afda2a3..9929d0b3ae1a464c63fa518684f6ec07774000f8 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -12,6 +12,7 @@ TagManager:
- HUD
- Virtual Camera
- Sword
+ - Pet
layers:
- Default
- TransparentFX