폭탄마장갑, 백익부채, 기름통, 활, 비트검 애니메이션 및 구현

Assets/Animation/Item.meta

+fileFormatVersion: 2
+guid: 2334e41c861cf564e8c6749ece7f8500
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animation/Item/ExplosionMark.meta

+fileFormatVersion: 2
+guid: d39d1c9be18031041949f25e71f18303
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animation/Item/ExplosionMark/Explode.anim

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Explode
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: ab87abd0fd4dfd242bb9b3db61be4682, type: 3}
+    - time: 0.033333335
+      value: {fileID: 21300000, guid: 65b190c5d8486764dbb4f0f0e7b3f695, type: 3}
+    - time: 0.06666667
+      value: {fileID: 21300000, guid: ab87abd0fd4dfd242bb9b3db61be4682, type: 3}
+    - time: 0.1
+      value: {fileID: 21300000, guid: 65b190c5d8486764dbb4f0f0e7b3f695, type: 3}
+    - time: 0.13333334
+      value: {fileID: 21300000, guid: ab87abd0fd4dfd242bb9b3db61be4682, type: 3}
+    - time: 0.16666667
+      value: {fileID: 21300000, guid: 65b190c5d8486764dbb4f0f0e7b3f695, type: 3}
+    - time: 0.2
+      value: {fileID: 21300000, guid: ab87abd0fd4dfd242bb9b3db61be4682, type: 3}
+    - time: 0.23333333
+      value: {fileID: 21300000, guid: 65b190c5d8486764dbb4f0f0e7b3f695, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 21300000, guid: ab87abd0fd4dfd242bb9b3db61be4682, type: 3}
+    - {fileID: 21300000, guid: 65b190c5d8486764dbb4f0f0e7b3f695, type: 3}
+    - {fileID: 21300000, guid: ab87abd0fd4dfd242bb9b3db61be4682, type: 3}
+    - {fileID: 21300000, guid: 65b190c5d8486764dbb4f0f0e7b3f695, type: 3}
+    - {fileID: 21300000, guid: ab87abd0fd4dfd242bb9b3db61be4682, type: 3}
+    - {fileID: 21300000, guid: 65b190c5d8486764dbb4f0f0e7b3f695, type: 3}
+    - {fileID: 21300000, guid: ab87abd0fd4dfd242bb9b3db61be4682, type: 3}
+    - {fileID: 21300000, guid: 65b190c5d8486764dbb4f0f0e7b3f695, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.25
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []

Assets/Animation/Item/ExplosionMark/Explode.anim.meta

+fileFormatVersion: 2
+guid: 0d5d09d493cd01f4d87e7f5d05e5c720
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animation/Item/ExplosionMark/ExplosionMark.controller

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: ExplosionMark
+  serializedVersion: 5
+  m_AnimatorParameters:
+  - m_Name: plant
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: explode
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 1107653892933801726}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!114 &114395706776069272
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 737f680951513b34f90faaa059cbb683, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1101 &1101020668960235238
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: plant
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102342191743318888}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101590603490628220
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102778963077003218}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1101785609286003734
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: explode
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1102266639781071868}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &1102266639781071868
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Explode
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101590603490628220}
+  m_StateMachineBehaviours:
+  - {fileID: 114395706776069272}
+  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: 7400000, guid: 0d5d09d493cd01f4d87e7f5d05e5c720, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &1102342191743318888
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Plant
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101785609286003734}
+  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: 7400000, guid: ad71955d17ee3a942b6a4c6b12e9e7bf, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1102 &1102778963077003218
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: StandBy
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 1101020668960235238}
+  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: 0}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &1107653892933801726
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 1102342191743318888}
+    m_Position: {x: 456, y: 60, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102778963077003218}
+    m_Position: {x: 288, y: 132, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102266639781071868}
+    m_Position: {x: 468, y: 204, 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: 876, y: 144, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 1102778963077003218}

Assets/Animation/Item/ExplosionMark/ExplosionMark.controller.meta

+fileFormatVersion: 2
+guid: db8fa37224335b949b055eb078405f95
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animation/Item/ExplosionMark/Plant.anim

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Plant
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: f999942c8e241a44c9772dc4e19d679c, type: 3}
+    - time: 0.05
+      value: {fileID: 21300000, guid: 65b190c5d8486764dbb4f0f0e7b3f695, type: 3}
+    - time: 0.1
+      value: {fileID: 21300000, guid: 95147458448122341970a8ebe386dd51, type: 3}
+    - time: 0.15
+      value: {fileID: 21300000, guid: ab87abd0fd4dfd242bb9b3db61be4682, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 21300000, guid: f999942c8e241a44c9772dc4e19d679c, type: 3}
+    - {fileID: 21300000, guid: 65b190c5d8486764dbb4f0f0e7b3f695, type: 3}
+    - {fileID: 21300000, guid: 95147458448122341970a8ebe386dd51, type: 3}
+    - {fileID: 21300000, guid: ab87abd0fd4dfd242bb9b3db61be4682, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.16666667
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []

Assets/Animation/Item/ExplosionMark/Plant.anim.meta

+fileFormatVersion: 2
+guid: ad71955d17ee3a942b6a4c6b12e9e7bf
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animation/Player/Player animator.controller

@@ -297,6 +297,31 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1102 &1102009384124774484
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: bitSwordAttack1
+  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: 7400000, guid: a784644898fd1664db2b1a47d63c0f73, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &1102076038672576614
 AnimatorState:
   serializedVersion: 5
@@ -499,6 +524,31 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &1102541164631015848
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: explosionGlovesAttack1
+  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: 7400000, guid: f0e3b19ee969d4f429ee9d8430bb4a58, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &1102579710918655568
 AnimatorState:
   serializedVersion: 5
@@ -599,6 +649,31 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &1102829433887053116
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: explosionGlovesAttack2
+  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: 7400000, guid: 8577ae016a412764684fcba81af639cb, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &1102832384910426066
 AnimatorState:
   serializedVersion: 5
@@ -699,6 +774,15 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: 1102309299412679616}
     m_Position: {x: -156, y: 456, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102541164631015848}
+    m_Position: {x: 48, y: 408, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102829433887053116}
+    m_Position: {x: 48, y: 456, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1102009384124774484}
+    m_Position: {x: 252, y: 408, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions:
   - {fileID: 1101150420884930214}

Assets/ExplosiveMarkExplode.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ExplosiveMarkExplode : StateMachineBehaviour {
+
+	 // OnStateEnter is called when a transition starts and the state machine starts to evaluate this state
+	override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
+        animator.GetComponent<BoxCollider2D>().enabled = true;
+    }
+
+	// OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
+	//override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
+	//
+	//}
+
+	// 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) {
+        animator.GetComponent<BoxCollider2D>().enabled = false;
+        animator.gameObject.SetActive(false);
+	}
+
+	// OnStateMove is called right after Animator.OnAnimatorMove(). Code that processes and affects root motion should be implemented here
+	//override public void OnStateMove(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
+	//
+	//}
+
+	// OnStateIK is called right after Animator.OnAnimatorIK(). Code that sets up animation IK (inverse kinematics) should be implemented here.
+	//override public void OnStateIK(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) {
+	//
+	//}
+}

Assets/Scripts/Item/Items/Baculus.cs.meta → Assets/ExplosiveMarkExplode.cs.meta

 fileFormatVersion: 2
-guid: ac372fbc159ca8c4c83eeef8f53c5344
+guid: 737f680951513b34f90faaa059cbb683
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Prefabs/UI/In-Game UI/InventoryUI/InventoryManager.prefab

@@ -56,5 +56,4 @@ MonoBehaviour:
     type: 2}
   popoutStrengthMultiplier: 9
   popoutTime: 0.1
-  textCanvas: {fileID: 1326064071694500, guid: 51286afce3c9c8a4bae74feddf8b13af, type: 2}
   price: {fileID: 114275555228777956, guid: 4ec53eab8ea50de4ea5b9ff658d83ca0, type: 2}

Assets/Prefabs/UI/In-Game UI/LifeStoneUI/goldPotion.prefab

@@ -104,19 +104,19 @@ BoxCollider2D:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_UsedByEffector: 0
-  m_UsedByComposite: 0
+  m_UsedByComposite: 1
   m_Offset: {x: 0, y: 0}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 0.46875, y: 0.53125}
+    oldSize: {x: 0.46875, y: 0.609375}
     newSize: {x: 0.46875, y: 0.53125}
     adaptiveTilingThreshold: 0.5
     drawMode: 0
     adaptiveTiling: 0
   m_AutoTiling: 0
   serializedVersion: 2
-  m_Size: {x: 0.375, y: 0.438}
+  m_Size: {x: 0.375, y: 0.52}
   m_EdgeRadius: 0
 --- !u!114 &114215107451734404
 MonoBehaviour:
@@ -129,6 +129,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 36609b223803b6043b6f1b673d0c8665, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  price: 0
+  priceTag: {fileID: 0}
   highlight: {fileID: 1379687187881618}
 --- !u!212 &212633996592932028
 SpriteRenderer:
@@ -163,7 +165,7 @@ SpriteRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 2145601713
-  m_SortingLayer: 9
+  m_SortingLayer: 11
   m_SortingOrder: -1
   m_Sprite: {fileID: 21300000, guid: 4ed132a41da0c71499cd98e8ca7ea94b, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
@@ -209,7 +211,7 @@ SpriteRenderer:
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 2145601713
-  m_SortingLayer: 9
+  m_SortingLayer: 11
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 634b66525497d9f4f987f4868a7107a0, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

Assets/Resources/Animations/bitSwordAttack1.anim

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: bitSwordAttack1
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.4986496
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Offset.x
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.0024043322
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Offset.y
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.56732106
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Size.y
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.56440926
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Size.x
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.5
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.53333336
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Enabled
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 200
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: damage
+    path: AttackColider
+    classID: 114
+    script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: dcdd8c973cd38e0429b8bc9d2615bfcc, type: 3}
+    - time: 0.25
+      value: {fileID: 21300000, guid: c4d2ece3a02a471469c55dd270122c08, type: 3}
+    - time: 0.5
+      value: {fileID: 21300000, guid: c132e04fb41eb6c439ffd7f9548d80aa, type: 3}
+    - time: 0.53333336
+      value: {fileID: 21300000, guid: dcdd8c973cd38e0429b8bc9d2615bfcc, type: 3}
+    - time: 1
+      value: {fileID: 21300000, guid: dcdd8c973cd38e0429b8bc9d2615bfcc, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 3305885265
+      script: {fileID: 0}
+      typeID: 61
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 298341484
+      script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
+      typeID: 114
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 413499720
+      script: {fileID: 0}
+      typeID: 61
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 1872933342
+      script: {fileID: 0}
+      typeID: 61
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 2368279999
+      script: {fileID: 0}
+      typeID: 61
+      customType: 0
+      isPPtrCurve: 0
+    - serializedVersion: 2
+      path: 2942363444
+      attribute: 4197328169
+      script: {fileID: 0}
+      typeID: 61
+      customType: 0
+      isPPtrCurve: 0
+    pptrCurveMapping:
+    - {fileID: 21300000, guid: dcdd8c973cd38e0429b8bc9d2615bfcc, type: 3}
+    - {fileID: 21300000, guid: c4d2ece3a02a471469c55dd270122c08, type: 3}
+    - {fileID: 21300000, guid: c132e04fb41eb6c439ffd7f9548d80aa, type: 3}
+    - {fileID: 21300000, guid: dcdd8c973cd38e0429b8bc9d2615bfcc, type: 3}
+    - {fileID: 21300000, guid: dcdd8c973cd38e0429b8bc9d2615bfcc, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.0166667
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: -0.4986496
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Offset.x
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.0024043322
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Offset.y
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.56732106
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Size.y
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.56440926
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Size.x
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.5
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 0.53333336
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Enabled
+    path: AttackColider
+    classID: 61
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 200
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: damage
+    path: AttackColider
+    classID: 114
+    script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
+  m_Events: []

Assets/Resources/Animations/bitSwordAttack1.anim.meta

+fileFormatVersion: 2
+guid: a784644898fd1664db2b1a47d63c0f73
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Animations/explosionGlovesAttack1.anim

@@ -16,21 +16,54 @@ AnimationClip:
   m_PositionCurves: []
   m_ScaleCurves: []
   m_FloatCurves: []
-  m_PPtrCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: d79efc14283590445ad51f492b8c7009, type: 3}
+    - time: 0.083333336
+      value: {fileID: 21300000, guid: dcbdecfe12ed64f4190509769f59a854, type: 3}
+    - time: 0.16666667
+      value: {fileID: 21300000, guid: 9f8cad957c409e347aee7364e2beb63b, type: 3}
+    - time: 0.25
+      value: {fileID: 21300000, guid: 193cf3751a55a274583e1a7b5ceef109, type: 3}
+    - time: 0.56666666
+      value: {fileID: 21300000, guid: 9f8cad957c409e347aee7364e2beb63b, type: 3}
+    - time: 0.65
+      value: {fileID: 21300000, guid: d79efc14283590445ad51f492b8c7009, type: 3}
+    - time: 0.73333335
+      value: {fileID: 21300000, guid: d79efc14283590445ad51f492b8c7009, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
   m_SampleRate: 60
   m_WrapMode: 0
   m_Bounds:
     m_Center: {x: 0, y: 0, z: 0}
     m_Extent: {x: 0, y: 0, z: 0}
   m_ClipBindingConstant:
-    genericBindings: []
-    pptrCurveMapping: []
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 21300000, guid: d79efc14283590445ad51f492b8c7009, type: 3}
+    - {fileID: 21300000, guid: dcbdecfe12ed64f4190509769f59a854, type: 3}
+    - {fileID: 21300000, guid: 9f8cad957c409e347aee7364e2beb63b, type: 3}
+    - {fileID: 21300000, guid: 193cf3751a55a274583e1a7b5ceef109, type: 3}
+    - {fileID: 21300000, guid: 9f8cad957c409e347aee7364e2beb63b, type: 3}
+    - {fileID: 21300000, guid: d79efc14283590445ad51f492b8c7009, type: 3}
+    - {fileID: 21300000, guid: d79efc14283590445ad51f492b8c7009, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 1
+    m_StopTime: 0.75
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

Assets/Resources/Animations/explosionGlovesAttack2.anim

@@ -16,21 +16,57 @@ AnimationClip:
   m_PositionCurves: []
   m_ScaleCurves: []
   m_FloatCurves: []
-  m_PPtrCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 21300000, guid: bee689990b979ad4f8f902629e287049, type: 3}
+    - time: 0.06666667
+      value: {fileID: 21300000, guid: 94d731c9238da4143850c4ea44790f8b, type: 3}
+    - time: 0.13333334
+      value: {fileID: 21300000, guid: 36857243fea529a46bbb51636f6d60bb, type: 3}
+    - time: 0.2
+      value: {fileID: 21300000, guid: 4c0923c9c173916408c9df68c2d719f3, type: 3}
+    - time: 0.26666668
+      value: {fileID: 21300000, guid: f5695e8b5d2a12b47a93f638d11ba722, type: 3}
+    - time: 0.33333334
+      value: {fileID: 21300000, guid: df7b92361713fd14aaad465840904392, type: 3}
+    - time: 0.4
+      value: {fileID: 21300000, guid: 0ee2c5ef6e2dfb847b392eaa523b3f6d, type: 3}
+    - time: 0.46666667
+      value: {fileID: 21300000, guid: 1cdcf973fa01be4429fceef5025134f5, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
   m_SampleRate: 60
   m_WrapMode: 0
   m_Bounds:
     m_Center: {x: 0, y: 0, z: 0}
     m_Extent: {x: 0, y: 0, z: 0}
   m_ClipBindingConstant:
-    genericBindings: []
-    pptrCurveMapping: []
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 21300000, guid: bee689990b979ad4f8f902629e287049, type: 3}
+    - {fileID: 21300000, guid: 94d731c9238da4143850c4ea44790f8b, type: 3}
+    - {fileID: 21300000, guid: 36857243fea529a46bbb51636f6d60bb, type: 3}
+    - {fileID: 21300000, guid: 4c0923c9c173916408c9df68c2d719f3, type: 3}
+    - {fileID: 21300000, guid: f5695e8b5d2a12b47a93f638d11ba722, type: 3}
+    - {fileID: 21300000, guid: df7b92361713fd14aaad465840904392, type: 3}
+    - {fileID: 21300000, guid: 0ee2c5ef6e2dfb847b392eaa523b3f6d, type: 3}
+    - {fileID: 21300000, guid: 1cdcf973fa01be4429fceef5025134f5, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 1
+    m_StopTime: 0.48333332
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

Assets/Resources/Prefabs/Projectiles/ExplosionMark.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1270346964017414}
+  m_IsPrefabAsset: 1
+--- !u!1 &1270346964017414
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4512451330785556}
+  - component: {fileID: 212330497428044150}
+  - component: {fileID: 95003775514478758}
+  - component: {fileID: 61663821715901510}
+  - component: {fileID: 114415441047994350}
+  m_Layer: 15
+  m_Name: ExplosionMark
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4512451330785556
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1270346964017414}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -6.3689156, y: 1.7248498, z: 0.0022971113}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &61663821715901510
+BoxCollider2D:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1270346964017414}
+  m_Enabled: 0
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 0.75, y: 0.75}
+    newSize: {x: 0.75, y: 0.75}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.75, y: 0.75}
+  m_EdgeRadius: 0
+--- !u!95 &95003775514478758
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1270346964017414}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: db8fa37224335b949b055eb078405f95, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &114415441047994350
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1270346964017414}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 64f948f7c7aacab409fe963a6f9e0d2a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  damage: 15
+  knockBackMultiplier: 1
+  debuffTime:
+  - 0
+  - 0
+  - 0
+  - 0
+  - 0
+  projectileType: 0
+  enemyLayer:
+    serializedVersion: 2
+    m_Bits: 65536
+  vanishLayer:
+    serializedVersion: 2
+    m_Bits: 0
+  stopLayer:
+    serializedVersion: 2
+    m_Bits: 0
+  attackCombo: 
+--- !u!212 &212330497428044150
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1270346964017414}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: -1016753049
+  m_SortingLayer: 3
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: ab87abd0fd4dfd242bb9b3db61be4682, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 0.75, y: 0.75}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Resources/Prefabs/Projectiles/ExplosionMark.prefab.meta

+fileFormatVersion: 2
+guid: 4614dd4479c1db94b9034017ff2801d5
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Items/bamboo spear.png.meta

-fileFormatVersion: 2
-guid: 1c5da66e44f95ed478fe2db14e5e57f1
-TextureImporter:
-  fileIDToRecycleName: {}
-  externalObjects: {}
-  serializedVersion: 6
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 0
-    aniso: -1
-    mipBias: -100
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - serializedVersion: 2
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 7e861dd4e8841304a92c1bda6e1ad6c7
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/Sprites/Items/Frost Shield.png.meta → Assets/Resources/Sprites/Items/bit sword.png.meta

 fileFormatVersion: 2
-guid: fa7b9b8ea6f73b44eb55190c40490181
+guid: 8421f67c57e6d7d4d9a22ab34a171fc7
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -86,7 +86,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 27019d24c73a0384db9b4fff79fb085c
+    spriteID: 57e7d2fa07f62be4cad9b7c1a431a77f
     vertices: []
     indices: 
     edges: []

Assets/Resources/Sprites/Items/Baculus.png.meta → Assets/Resources/Sprites/Items/bit sword_border.png.meta

 fileFormatVersion: 2
-guid: c861074ba5487a843a34c259666e850a
+guid: c3ee316eb0b7ad5439ea415cda91a811
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -86,7 +86,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 8f0d2befb9249d841b803b3eeb14ae74
+    spriteID: 2c870fa09d4bfc941aeec8fba3ad04d8
     vertices: []
     indices: 
     edges: []

Assets/Resources/Sprites/Items/bow_border.png.meta

@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 0
     aniso: -1
     mipBias: -100
     wrapU: 1
@@ -63,7 +63,18 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0

Assets/Resources/Sprites/Items/chain sickle.png.meta

-fileFormatVersion: 2
-guid: 7d7635f3ffe619f408bda78523171a17
-TextureImporter:
-  fileIDToRecycleName: {}
-  externalObjects: {}
-  serializedVersion: 6
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 0
-    aniso: -1
-    mipBias: -100
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - serializedVersion: 2
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 1a909235efe8d1f4aba444857f363fd4
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/Sprites/Items/explosion gloves.png.meta

@@ -86,7 +86,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 7218ccb96957720468751d73704613d9
+    spriteID: 29ed88a4cb109b4419cd5d479089097d
     vertices: []
     indices: 
     edges: []

Assets/Resources/Sprites/Items/Morgenstern.png.meta → Assets/Resources/Sprites/Items/explosion gloves_border.png.meta

 fileFormatVersion: 2
-guid: 3e4a5599624d00449a6659fd48258377
+guid: ace6eedb1917b224788f945f05e75473
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -86,7 +86,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 311c9097ee6b1f54782e5b2d36ae307f
+    spriteID: 4bf31425b3ef52544b0e6745ba91eb8c
     vertices: []
     indices: 
     edges: []

Assets/Resources/Sprites/Items/Festo.png.meta → Assets/Resources/Sprites/Items/feather fan.png.meta

 fileFormatVersion: 2
-guid: 871bb9b59e5e3e74186def5f024dd689
+guid: 7216a2a3761f38e4382a121896bf4d9e
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -86,7 +86,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: 67225dd4b8f4a7549a7150feb3a07266
+    spriteID: 84a76d4fdb03c1644bf74e60ffc0d58e
     vertices: []
     indices: 
     edges: []

Assets/Resources/Sprites/Items/feather fan_border.png.meta

+fileFormatVersion: 2
+guid: 2ed227bc1495f6141896962385115a34
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 6
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: c0b09b39feac2f741878ed032c98967a
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Items/ksanife.png.meta

-fileFormatVersion: 2
-guid: b0d7cea3fcb24274aadf1b76f2a7d5a7
-TextureImporter:
-  fileIDToRecycleName: {}
-  externalObjects: {}
-  serializedVersion: 6
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 0
-    aniso: -1
-    mipBias: -100
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - serializedVersion: 2
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5a1813ab014106943a63b32f4e4736b2
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/Sprites/Items/meteor sword.png.meta

-fileFormatVersion: 2
-guid: b8f5b875ed01cb342bcc205d16a78d2f
-TextureImporter:
-  fileIDToRecycleName: {}
-  externalObjects: {}
-  serializedVersion: 6
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 0
-    aniso: -1
-    mipBias: -100
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - serializedVersion: 2
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: c0a0107787d925a4db851581832f9824
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Resources/Sprites/Items/oil cask.png.meta

+fileFormatVersion: 2
+guid: 43c3c886150368a45a20705739dafed1
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 6
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: cee6d743e29d7f245b8192151159b584
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Items/oil cask_border.png.meta

+fileFormatVersion: 2
+guid: ecf63b486e4175a48beed7ffa64e48ed
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 6
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: e72d3959188add64e96dbd2afe27d38a
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Items/shock stick.png.meta

+fileFormatVersion: 2
+guid: 7fc647bb11b755540b3afd9aaef8095a
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 6
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5867c58572681de42a76fbdb9cd57186
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Items/shock stick_border.png.meta

+fileFormatVersion: 2
+guid: f6cf573aad9413748918df144ae09b63
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 6
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: af508687a6fe50840a6c17e5ec16fed5
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Characters/Enemy/Enemy.cs

@@ -202,6 +202,7 @@ public abstract class Enemy : MonoBehaviour {
     {
         fireDuration = duration;
         float dotGap = 1.0f;
+        float damageMultiplier = 1f;
 
         while (true)
         {
@@ -217,7 +218,12 @@ public abstract class Enemy : MonoBehaviour {
                 fireDuration = 0.0f;
                 break;
             }
-            GetDamaged(lifeStoneManager.lifeStoneRowNum * 0.3f);
+
+            damageMultiplier = 1f;
+            foreach (Item item in inventoryManager.itemList)
+                damageMultiplier *= item.GlobalFireDamageMultiplier();
+
+            GetDamaged(lifeStoneManager.lifeStoneRowNum * 0.3f * damageMultiplier);
             EffectManager.Instance.StartNumber(0, gameObject.transform.parent.position, lifeStoneManager.lifeStoneRowNum * 0.3f);
         }
         debuffState[(int)EnemyDebuffCase.Fire] = DebuffState.Off;

Assets/Scripts/Characters/PlayerAttack.cs

@@ -146,19 +146,22 @@ public class PlayerAttack : MonoBehaviour {
             for(int i=0; i< item.skillNum; i++)
             {
                 if(item.combo[i].Equals(comboArray))
+                {
+                    if (item.ComboAction(i))
                     {
                         aoc["PlayerAttackAnim"] = item.animation[i];
                         anim.SetTrigger("attack");
-                    item.ComboAction(i);
+
                         playingSkill = true;
                         if (playerController.playerState != PlayerState.GoingUp && playerController.playerState != PlayerState.GoingDown)
-                        GetComponent<Rigidbody2D>().velocity = new Vector2(Mathf.Clamp(GetComponent<Rigidbody2D>().velocity.x,-0.5f,0.5f), GetComponent<Rigidbody2D>().velocity.y);
+                            GetComponent<Rigidbody2D>().velocity = new Vector2(Mathf.Clamp(GetComponent<Rigidbody2D>().velocity.x, -0.5f, 0.5f), GetComponent<Rigidbody2D>().velocity.y);
                         playerController.playerState = PlayerState.Attack;
 
                         return;
                     }
                 }
             }
+        }
         
         aoc["PlayerAttackAnim"] = normalAttack[comboArray[comboArray.Length - 1] - 'A'];
         anim.SetTrigger("attack");

Assets/Scripts/Item/DroppedItem.cs

@@ -14,9 +14,17 @@ public class DroppedItem : DroppedObject, IPlayerInteraction
     Rigidbody2D rb2D;
     BoxCollider2D bc2D;
     SpriteRenderer sprt;
+    Color[] qualityColor = new Color[4]
+    {
+        new Color(102 / 255f, 65 / 255f, 48 / 255f),
+        new Color( 15 / 255f,  2 / 255f,  8 / 255f),
+        new Color(  3 / 255f, 93 / 255f, 65 / 255f),
+        new Color(173 / 255f, 26 / 255f, 38 / 255f), 
+    };
+
     public void Init(Item _item, Vector3 pos)
     {
-        inventoryManager = GameObject.Find("InventoryManager").GetComponent<InventoryManager>();
+        inventoryManager = InventoryManager.Instance;
         item = _item;
         itemAddon = false;
         rb2D = GetComponent<Rigidbody2D>();
@@ -26,6 +34,7 @@ public class DroppedItem : DroppedObject, IPlayerInteraction
         transform.position = pos;
         sprt.sprite = item.sprite;
         highlight.GetComponent<SpriteRenderer>().sprite = item.highlight;
+        highlight.GetComponent<SpriteRenderer>().color = qualityColor[(int)item.quality];
         highlight.SetActive(false);
         bc2D.size = sprt.size;
         transform.localScale = new Vector3((item.sizeInventory.x * itemSizeMultiplier) / sprt.size.x, (item.sizeInventory.y * itemSizeMultiplier) / sprt.size.y, 1);
@@ -42,6 +51,7 @@ public class DroppedItem : DroppedObject, IPlayerInteraction
         transform.position = pos;
         sprt.sprite = addon.sprite;
         highlight.GetComponent<SpriteRenderer>().sprite = addon.highlight;
+        highlight.GetComponent<SpriteRenderer>().color = qualityColor[(int)addon.quality];
         highlight.SetActive(false);
         bc2D.size = sprt.size;
         transform.localScale = new Vector3((addon.sizeInventory.x * itemSizeMultiplier) / sprt.size.x, (addon.sizeInventory.y * itemSizeMultiplier) / sprt.size.y, 1);

Assets/Scripts/Item/InventoryManager.cs

@@ -36,11 +36,13 @@ public class InventoryManager : Singleton<InventoryManager> {
         itemPool[0].Add("Bow");
         itemPool[0].Add("Dagger");
         
-        //itemPool[1].Add("ExplosionGloves");
+        itemPool[1].Add("ExplosionGloves");
+        itemPool[1].Add("OilCask");
 
-        //itemPool[2].Add("Ksanife");
+        itemPool[2].Add("ShockStick");
+        itemPool[2].Add("FeatherFan");
 
-        //itemPool[3].Add("");
+        itemPool[3].Add("BitSword");
 
 
         addonPool[0].Add("ParchmentPiece");
@@ -78,29 +80,19 @@ public class InventoryManager : Singleton<InventoryManager> {
     }
     IEnumerator TestCoroutine()
     {
-        ItemInstantiate(ItemQuality.Study, player.transform.position, 1f);
+        ItemInstantiate("FeatherFan", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
-        ItemInstantiate(ItemQuality.Study, player.transform.position, 1f);
+        ItemInstantiate("Dagger", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
-        AddonInstantiate(ItemQuality.Study, player.transform.position, 1f);
+        ItemInstantiate("Bow", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
-        AddonInstantiate(ItemQuality.Study, player.transform.position, 1f);
+        ItemInstantiate("OilCask", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
-        AddonInstantiate(ItemQuality.Ordinary, player.transform.position, 1f);
+        ItemInstantiate("ExplosionGloves", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
-        AddonInstantiate(ItemQuality.Ordinary, player.transform.position, 1f);
+        ItemInstantiate("BitSword", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
-        AddonInstantiate(ItemQuality.Ordinary, player.transform.position, 1f);
-        yield return new WaitForSeconds(0.3f);
-        AddonInstantiate(ItemQuality.Ordinary, player.transform.position, 1f);
-        yield return new WaitForSeconds(0.3f);
-        AddonInstantiate(ItemQuality.Ordinary, player.transform.position, 1f);
-        yield return new WaitForSeconds(0.3f);
-        AddonInstantiate(ItemQuality.Superior, player.transform.position, 1f);
-        yield return new WaitForSeconds(0.3f);
-        AddonInstantiate(ItemQuality.Superior, player.transform.position, 1f);
-        yield return new WaitForSeconds(0.3f);
-        AddonInstantiate(ItemQuality.Superior, player.transform.position, 1f);
+        AddonInstantiate("GlowingHerb", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
     }
 

Assets/Scripts/Item/InventoryUI.cs

@@ -155,6 +155,7 @@ public class InventoryUI : MonoBehaviour {
                 {
                     comboStringFrame[i].SetActive(true);
                     comboNameFrame[i].SetActive(true);
+                    comboNameFrame[i].GetComponent<Text>().text = itemList[selectedItem].comboName[i];
                     float tmpx = 0;
                     for (int j = 0; j < 8; j++)
                     {
@@ -165,16 +166,18 @@ public class InventoryUI : MonoBehaviour {
                             comboChars[i, j].GetComponent<RectTransform>().sizeDelta = comboCharPrefab[itemList[selectedItem].combo[i][j] - 'A'].GetComponent<RectTransform>().sizeDelta;
                             comboChars[i, j].GetComponent<RectTransform>().localPosition = new Vector3(tmpx, 0, 0);
                             tmpx += comboChars[i, j].GetComponent<RectTransform>().sizeDelta.x + pixelBetweenChar;
-                            comboNameFrame[i].GetComponent<Text>().text = itemList[selectedItem].comboName[i];
+                            
                         }
                         else
                         {
                             comboChars[i, j].SetActive(false);
+                            
                         }
                     }
                 }
                 else
                 {
+                    comboNameFrame[i].GetComponent<Text>().text = "";
                     comboStringFrame[i].SetActive(false);
                 }
             }

Assets/Scripts/Item/Item.cs

@@ -16,6 +16,8 @@ public abstract class Item {
     public Vector2 sizeInventory;
     public string itemInfo;
     public string[] comboName = new string[3];
+    public float[] comboCool = new float[3];
+    public float[] comboCurrentCool = new float[3];
 
     public bool ComboAction(string currentCombo)
     {
@@ -23,6 +25,10 @@ public abstract class Item {
         {
             if (combo[i].Equals(currentCombo))
             {
+                if (comboCurrentCool[i] < comboCool[i]) return false;
+
+                comboCurrentCool[i] = 0;
+
                 if (i == 0) PlaySkill1();
                 else if (i == 1) PlaySkill2();
                 else if (i == 2) PlaySkill3();
@@ -37,6 +43,11 @@ public abstract class Item {
                     }
                 }
 
+                foreach (Item item in InventoryManager.Instance.itemList)
+                {
+                    item.GlobalOtherEffect(currentCombo);
+                }
+
                 return true;
             }
         }
@@ -44,10 +55,30 @@ public abstract class Item {
     }
     public bool ComboAction(int currenSkill)
     {
+
         return ComboAction(combo[currenSkill]);
     }
+
+    public bool IsCool(string currentCombo)
+    {
+        for (int i = 0; i < skillNum; i++)
+        {
+            if (combo[i].Equals(currentCombo))
+            {
+                return comboCurrentCool[i] >= comboCool[i];
+            }
+        }
+        return false;
+    }
+    public bool IsCool(int currenSkill)
+    {
+        return IsCool(combo[currenSkill]);
+    }
+
     public Item()
     {
+        comboCool = new float[3] { 0, 0, 0 };
+        comboCurrentCool = new float[3] { 0, 0, 0 };
         Declare();
     }
     public virtual void Declare()
@@ -121,6 +152,11 @@ public abstract class Item {
             }
         }
 
+        foreach (Item item in InventoryManager.Instance.itemList)
+        {
+            attackInfo.knockBackMultiplier *=  item.GlobalKnockBackMultiplier(originInfo, enemyInfo, combo);
+        }
+
         //FinalAdder
         attackInfo.damage += DamageFinalAdder(originInfo, enemyInfo, combo);
         attackInfo.knockBackMultiplier += KnockBackFinalAdder(originInfo, enemyInfo, combo);
@@ -202,5 +238,17 @@ public abstract class Item {
     public virtual void OtherEffect(string combo)
     {
 
+    }
+    public virtual float GlobalFireDamageMultiplier()
+    {
+        return 1f;
+    }
+    public virtual float GlobalKnockBackMultiplier(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
+    {
+        return 1f;
+    }
+    public virtual void GlobalOtherEffect(string combo)
+    {
+
     }
 }

Assets/Scripts/Item/Items/Baculus.cs

-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-/// <summary>
-/// 아이템명: 바쿨루스
-/// 번호: 15
-/// </summary>
-public class Baculus : Item
-{
-    public override void Declare()
-    {
-        id = 15; name = "바쿨루스";
-        quality = ItemQuality.Ordinary;
-        skillNum = 2;
-        combo = new string[3] { "BCB", "ACBC", "" };
-        attachable = new bool[4] { true, true, false, true };
-        sprite = Resources.Load<Sprite>("Sprites/Items/Baculus");
-        highlight = Resources.Load<Sprite>("Sprites/Items/Baculus");
-        animation[0] = Resources.Load<AnimationClip>("Animations/baculusAttack1");
-        animation[1] = Resources.Load<AnimationClip>("Animations/baculusAttack2");
-        animation[2] = null;
-        sizeInventory = new Vector2(90, 160);
-        itemInfo = "신을 숭배하는 자들이 들고 있던 청백색의 주교 지팡이. 영험한 힘이 느껴진다.";
-        comboName = new string[3] { "기도", "징벌", "" };
-    }
-}

Assets/Scripts/Item/Items/BambooSpear.cs

-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-/// <summary>
-/// 아이템명: 죽창
-/// 번호: 26
-/// </summary>
-public class BambooSpear : Item
-{
-    public override void Declare()
-    {
-        id = 26; name = "bamboo spear";
-        quality = ItemQuality.Ordinary;
-        skillNum = 2;
-        combo = new string[3] { "BAA", "BAC", "" };
-        attachable = new bool[4] { true, false, true, true };
-        sprite = Resources.Load<Sprite>("Sprites/Items/bamboo spear");
-        highlight = Resources.Load<Sprite>("Sprites/Items/bamboo spear");
-        animation[0] = Resources.Load<AnimationClip>("Animations/bambooSpearAttack1");
-        animation[1] = Resources.Load<AnimationClip>("Animations/bambooSpearAttack2");
-        animation[2] = null;
-        sizeInventory = new Vector2(90, 160);
-    }
-}

Assets/Scripts/Item/Items/BitSword.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+/// <summary>
+/// 아이템명: 비트 검
+/// 번호: 43
+/// </summary>
+public class BitSword: Item
+{
+
+    public override void Declare()
+    {
+        id = 43; name = "비트 검";
+        quality = ItemQuality.Masterpiece;
+        skillNum = 1;
+        combo = new string[3] { "A", "", "" };
+        attachable = new bool[4] { false, false, false, false };
+        sprite = Resources.Load<Sprite>("Sprites/Items/bit sword");
+        highlight = Resources.Load<Sprite>("Sprites/Items/bit sword_border");
+        animation[0] = Resources.Load<AnimationClip>("Animations/bitSwordAttack1");
+        animation[1] = null;
+        animation[2] = null;
+        sizeInventory = new Vector2(135f, 135f);
+        itemInfo = "";
+        comboName = new string[3] { "I", "", "" };
+        comboCool = new float[3] { 50, 0, 0 };
+        comboCurrentCool = new float[3] { 50, 0, 0 };
+    }
+
+    public override void GlobalOtherEffect(string combo)
+    {
+        List<Item> itemList = InventoryManager.Instance.itemList;
+
+        if (MapManager.currentRoom.isRoomCleared)
+        {
+            for (int i = combo.Length; i >= 1; i--)
+            {
+                if (combo[i - 1] == 'A') comboCurrentCool[0]++;
+
+                foreach (Item item in itemList)
+                {
+                    for (int j = 0; j < item.skillNum; j++)
+                        if (item.combo[j].Equals(combo.Substring(0, i - 1))) return;
+                }
+            }
+        }
+    }
+}

Assets/Scripts/Item/Items/BambooSpear.cs.meta → Assets/Scripts/Item/Items/BitSword.cs.meta

 fileFormatVersion: 2
-guid: fbe0c76081d909e4ea1c811110cb3fec
+guid: 1d96c5ee6a2941c44bf9703ebb6744a8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Scripts/Item/Items/Bow.cs

@@ -36,7 +36,7 @@ public class Bow : Item {
     IEnumerator Shoot1()
     {
         yield return new WaitForSeconds(0.3f);
-        GameObject tmpObj = Object.Instantiate(arrow, player.transform.position, Quaternion.identity);
+        GameObject tmpObj = Object.Instantiate(arrow, player.transform.position - new Vector3(0.7f * Mathf.Sign(player.transform.localScale.x), 0), Quaternion.identity);
         tmpObj.transform.localScale = new Vector3(Mathf.Sign(player.transform.localScale.x), 1, 1);
         tmpObj.GetComponent<Rigidbody2D>().velocity = new Vector2(-15f * Mathf.Sign(player.transform.localScale.x), 0f);
         tmpObj.GetComponent<AttackProperty>().Init(combo[0]);
@@ -48,7 +48,7 @@ public class Bow : Item {
     IEnumerator Shoot2()
     {
         yield return new WaitForSeconds(0.3f);
-        GameObject tmpObj = Object.Instantiate(arrow, player.transform.position, Quaternion.Euler(0, 0, -90f));
+        GameObject tmpObj = Object.Instantiate(arrow, player.transform.position - new Vector3(0.5f * Mathf.Sign(player.transform.localScale.x), -0.8f), Quaternion.Euler(0, 0, -90f));
         tmpObj.GetComponent<Rigidbody2D>().velocity = new Vector2(0f,15f);
         tmpObj.GetComponent<AttackProperty>().Init(combo[1]);
     }

Assets/Scripts/Item/Items/ChainSickle.cs

-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-/// <summary>
-/// 아이템명: 사슬낫
-/// 번호: 3
-/// </summary>
-public class ChainSickle : Item
-{
-    public override void Declare()
-    {
-        id = 3; name = "chain sickle";
-        quality = ItemQuality.Ordinary;
-        skillNum = 2;
-        combo = new string[3] { "AAB", "AABC", "" };
-        attachable = new bool[4] { true, false, true, true };
-        sprite = Resources.Load<Sprite>("Sprites/Items/chain sickle");
-        highlight = Resources.Load<Sprite>("Sprites/Items/chain sickle");
-        animation[0] = Resources.Load<AnimationClip>("Animations/chainSickleAttack1");
-        animation[1] = Resources.Load<AnimationClip>("Animations/chainSickleAttack2");
-        animation[2] = null;
-        sizeInventory = new Vector2(90, 160);
-    }
-}

Assets/Scripts/Item/Items/Dagger.cs

@@ -9,7 +9,7 @@ public class Dagger : Item
 {
     public override void Declare()
     {
-        id = 1; name = "단검(Sweet Sword)";
+        id = 1; name = "단검";
         quality = ItemQuality.Study;
         skillNum = 2;
         combo = new string[3] { "A", "AA", "" };

Assets/Scripts/Item/Items/ExplosionGloves.cs

@@ -7,6 +7,10 @@ using UnityEngine;
 /// </summary>
 public class ExplosionGloves : Item
 {
+    GameObject markPrefab;
+    GameObject mark;
+    GameObject player;
+
     public override void Declare()
     {
         id = 21; name = "폭탄마의 장갑";
@@ -15,10 +19,56 @@ public class ExplosionGloves : Item
         combo = new string[3] { "CAC", "CA", "" };
         attachable = new bool[4] { true, false, true, true };
         sprite = Resources.Load<Sprite>("Sprites/Items/explosion gloves");
-        highlight = Resources.Load<Sprite>("Sprites/Items/explosion gloves");
+        highlight = Resources.Load<Sprite>("Sprites/Items/explosion gloves_border");
         animation[0] = Resources.Load<AnimationClip>("Animations/explosionGlovesAttack1");
         animation[1] = Resources.Load<AnimationClip>("Animations/explosionGlovesAttack2");
         animation[2] = null;
-        sizeInventory = new Vector2(90, 160);
+        sizeInventory = new Vector2(115f, 117.5f);
+        itemInfo = "보기보다 강력한 폭발을 일으킨다. 폭발을 일으킬때마다 장갑이 떨리는게 느껴진다.";
+        comboName = new string[3] { "설치", "폭파", "" };
+        markPrefab = Resources.Load<GameObject>("Prefabs/Projectiles/ExplosionMark");
+        InitMark();
+        player = GameManager.Instance.player;
+    }
+
+    void InitMark()
+    {
+        mark = Object.Instantiate(markPrefab);
+        mark.SetActive(false);
+        mark.GetComponent<AttackProperty>().Init("CA");
+    }
+    
+    protected override void PlaySkill1()
+    {
+        if (mark == null)
+            InitMark();
+        GameManager.Instance.StartCoroutine(Plant());
+    }
+    IEnumerator Plant()
+    {
+        yield return new WaitForSeconds(0.25f);
+        if (!mark.activeSelf)
+        {
+            mark.transform.position = player.transform.position - new Vector3(0.7f * Mathf.Sign(player.transform.localScale.x), -0.2f);
+            mark.transform.SetParent(MapManager.currentRoom.transform);
+            mark.GetComponent<BoxCollider2D>().enabled = false;
+            mark.SetActive(true);
+            mark.GetComponent<Animator>().SetTrigger("plant");
+        }
+    }
+
+    protected override void PlaySkill2()
+    {
+        if (mark == null)
+            InitMark();
+        GameManager.Instance.StartCoroutine(Explode());
+    }
+    IEnumerator Explode()
+    {
+        yield return new WaitForSeconds(0.1f);
+        if (mark.activeSelf)
+        {
+            mark.GetComponent<Animator>().SetTrigger("explode");
+        }
     }
 }

Assets/Scripts/Item/Items/FeatherFan.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+/// <summary>
+/// 아이템명: 백익 부채
+/// 번호: 37
+/// </summary>
+public class FeatherFan : Item
+{
+
+    public override void Declare()
+    {
+        id = 37; name = "백익 부채";
+        quality = ItemQuality.Superior;
+        skillNum = 0;
+        combo = new string[3] { "", "", "" };
+        attachable = new bool[4] { false, false, false, false };
+        sprite = Resources.Load<Sprite>("Sprites/Items/feather fan");
+        highlight = Resources.Load<Sprite>("Sprites/Items/feather fan_border");
+        animation[0] = null;
+        animation[1] = null;
+        animation[2] = null;
+        sizeInventory = new Vector2(140f, 140f);
+        itemInfo = "";
+        comboName = new string[3] { "", "", "" };
+    }
+
+    public override float GlobalKnockBackMultiplier(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
+    {
+        return 10f;
+    }
+}

Assets/Scripts/Item/Items/ChainSickle.cs.meta → Assets/Scripts/Item/Items/FeatherFan.cs.meta

 fileFormatVersion: 2
-guid: 7f31f39ad4ce7e6478233fca8fdebf51
+guid: b66ce3d282dde56438c849980f7a2a2c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Scripts/Item/Items/Festo.cs.meta

-fileFormatVersion: 2
-guid: afa0dccf7be57a349b1de5e120f77bd5
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Item/Items/FrostShield.cs

-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-/// <summary>
-/// 아이템명: 서리방패
-/// 번호: 27
-/// </summary>
-public class FrostShield : Item
-{
-    public override void Declare()
-    {
-        id = 27; name = "FrostSheild";
-        quality = ItemQuality.Ordinary;
-        skillNum = 1;
-        combo = new string[3] { "C", "", "" };
-        attachable = new bool[4] { true, true, true, false };
-        sprite = Resources.Load<Sprite>("Sprites/Items/frost shield");
-        highlight = Resources.Load<Sprite>("Sprites/Items/frost shield");
-        animation[0] = Resources.Load<AnimationClip>("Animations/frostShieldAttack1");
-        animation[1] = null;
-        animation[2] = null;
-        sizeInventory = new Vector2(90, 160);
-    }
-}

Assets/Scripts/Item/Items/FrostShield.cs.meta

-fileFormatVersion: 2
-guid: a698a0aa3865d354a805d7c62c4dba8f
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Item/Items/Ksanife.cs

-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-/// <summary>
-/// 아이템명: 활
-/// 번호: 7
-/// </summary>
-public class Ksanife : Item
-{
-    public override void Declare()
-    {
-        id = 2; name = "ksanife";
-        quality = ItemQuality.Superior;
-        skillNum = 2;
-        combo = new string[3] { "A", "AABAA", "" };
-        attachable = new bool[4] { true, true, false, false };
-        sprite = Resources.Load<Sprite>("Sprites/Items/ksanife");
-        highlight = Resources.Load<Sprite>("Sprites/Items/ksanife");
-        animation[0] = Resources.Load<AnimationClip>("Animations/ksanifeAttack1");
-        animation[1] = Resources.Load<AnimationClip>("Animations/ksanifeAttack2");
-        animation[2] = null;
-        sizeInventory = new Vector2(160, 160);
-    }
-}

Assets/Scripts/Item/Items/Ksanife.cs.meta

-fileFormatVersion: 2
-guid: c4fb4b21420011043b38f8d0cf8bc425
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Item/Items/MeteorSword.cs

-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-/// <summary>
-/// 아이템명: 운석검
-/// 번호: 32
-/// </summary>
-public class MeteorSword : Item
-{
-    public override void Declare()
-    {
-        id = 32; name = "meteor sword";
-        quality = ItemQuality.Superior;
-        skillNum = 2;
-        combo = new string[3] { "ABAAC", "ABACC", "" };
-        attachable = new bool[4] { true, false, false, false };
-        sprite = Resources.Load<Sprite>("Sprites/Items/meteor sword");
-        highlight = Resources.Load<Sprite>("Sprites/Items/meteor sword");
-        animation[0] = Resources.Load<AnimationClip>("Animations/meteorSwordAttack1");
-        animation[1] = Resources.Load<AnimationClip>("Animations/meteorSwordAttack2");
-        animation[2] = null;
-        sizeInventory = new Vector2(90, 160);
-    }
-}

Assets/Scripts/Item/Items/MeteorSword.cs.meta

-fileFormatVersion: 2
-guid: e47c030949f5cdd498f32dcc7024ecd9
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Item/Items/Morgenstern.cs

-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-/// <summary>
-/// 아이템명: 모닝스타
-/// 번호: 16
-/// </summary>
-public class Morgenstern : Item
-{
-    public override void Declare()
-    {
-        id = 16; name = "모닝스타";
-        quality = ItemQuality.Superior;
-        skillNum = 2;
-        combo = new string[3] { "BBCAA", "BBB", "" };
-        attachable = new bool[4] { false, true, false, true };
-        sprite = Resources.Load<Sprite>("Sprites/Items/Morgenstern");
-        highlight = Resources.Load<Sprite>("Sprites/Items/Morgenstern");
-        animation[0] = Resources.Load<AnimationClip>("Animations/morgensternAttack1");
-        animation[1] = Resources.Load<AnimationClip>("Animations/morgensternAttack2");
-        animation[2] = null;
-        sizeInventory = new Vector2(90, 160);
-    }
-}

Assets/Scripts/Item/Items/Morgenstern.cs.meta

-fileFormatVersion: 2
-guid: 6968b9dedda89a543895c20c73c65a4c
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/Item/Items/Festo.cs → Assets/Scripts/Item/Items/OilCask.cs

@@ -2,20 +2,31 @@
 using System.Collections.Generic;
 using UnityEngine;
 /// <summary>
-/// 아이템명: 명석이
-/// 번호: 47
+/// 아이템명: 기름 통
+/// 번호: 36
 /// </summary>
-public class Festo : Item
+public class OilCask : Item
 {
+
     public override void Declare()
     {
-        id = 47; name = "Festo";
+        id = 36; name = "기름 통";
         quality = ItemQuality.Ordinary;
         skillNum = 0;
         combo = new string[3] { "", "", "" };
-        attachable = new bool[4] { true, true, false, false };
-        sprite = Resources.Load<Sprite>("Sprites/Items/Festo");
-        highlight = Resources.Load<Sprite>("Sprites/Items/Festo");
-        sizeInventory = new Vector2(90, 160);
+        attachable = new bool[4] { false, false, false, false };
+        sprite = Resources.Load<Sprite>("Sprites/Items/oil cask");
+        highlight = Resources.Load<Sprite>("Sprites/Items/oil cask_border");
+        animation[0] = null;
+        animation[1] = null;
+        animation[2] = null;
+        sizeInventory = new Vector2(105f, 127.5f);
+        itemInfo = "";
+        comboName = new string[3] { "", "", "" };
+    }
+
+    public override float GlobalFireDamageMultiplier()
+    {
+        return 2f;
     }
 }

Assets/Scripts/Item/Items/OilCask.cs.meta

+fileFormatVersion: 2
+guid: 176550650da42a6429c9b1c4d057fd27
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Item/Items/ElectricShockRod.cs → Assets/Scripts/Item/Items/ShockStick.cs

@@ -5,21 +5,21 @@ using UnityEngine;
 /// 아이템명: 감전봉
 /// 번호: 52
 /// </summary>
-public class ElectricShockRod : Item {
+public class ShockStick : Item {
 
     public override void Declare()
     {
-        id = 52; name = "감전봉";
+        id = 52; name = "감전 봉";
         quality = ItemQuality.Masterpiece;
         skillNum = 2;
         combo = new string[3] { "ABA", "CBABB", "" };
         attachable = new bool[4] { false, false, true, true };
-        sprite = Resources.Load<Sprite>("Sprites/Items/electric shock rod");
-        highlight = Resources.Load<Sprite>("Sprites/Items/electric shock rod");
-        animation[0] = Resources.Load<AnimationClip>("Animations/electricShockRodAttack1");
-        animation[1] = Resources.Load<AnimationClip>("Animations/electricShockRodAttack2");
+        sprite = Resources.Load<Sprite>("Sprites/Items/shock stick");
+        highlight = Resources.Load<Sprite>("Sprites/Items/shock stick_border");
+        animation[0] = Resources.Load<AnimationClip>("Animations/shockStickAttack1");
+        animation[1] = Resources.Load<AnimationClip>("Animations/shockStickAttack2");
         animation[2] = null;
-        sizeInventory = new Vector2(90, 160);
+        sizeInventory = new Vector2(140f, 140f);
         itemInfo = "몸이 타는 것 같은 수준으로 아프다. 명령을 내릴 때 효과적일 것 같다.";
         comboName = new string[3] { "충전", "방전", "" };
     }

Assets/Sprites/Player/attack/bitSword.meta

+fileFormatVersion: 2
+guid: 1f61c7005460d064db7270656e9a3575
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: