Merge remote-tracking branch 'origin/item'

# Conflicts:
#	Assets/Scripts/Characters/Enemy/Enemy.cs
#	Assets/Scripts/Item/InventoryManager.cs

Assets/Animation/Effect/EffectPrefab.controller.meta

 fileFormatVersion: 2
-guid: 01e9a9d984d5f904daeaa1db1b5be12f
+guid: 6cb700dae53143a49adb757f0a780a7f
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 9100000
+  mainObjectFileID: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Animation/Effect/EffectPrefab2.overrideController

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!221 &22100000
+AnimatorOverrideController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: EffectPrefab2
+  m_Controller: {fileID: 9100000, guid: 6cb700dae53143a49adb757f0a780a7f, type: 2}
+  m_Clips:
+  - m_OriginalClip: {fileID: 7400000, guid: 1b64fff068a68574b8834f0693d71c0a, type: 2}
+    m_OverrideClip: {fileID: 7400000, guid: 97b152c8a81e2c846adb3732ec17001f, type: 2}

Assets/Animation/Effect/EffectPrefab2.overrideController.meta

+fileFormatVersion: 2
+guid: f940c4227b3b0ea4cac55bc2a7d2a404
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 22100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animation/Effect/HitAnimation2.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: HitAnimation2
+  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: 1b55f30aa76d49c4daefa113d830183c, type: 3}
+    - time: 0.033333335
+      value: {fileID: 21300000, guid: a77510ff326affa4087fc82cd36c2ed7, type: 3}
+    - time: 0.06666667
+      value: {fileID: 21300000, guid: 672d23d37eea2b549a3846867a0d6eed, type: 3}
+    - time: 0.1
+      value: {fileID: 21300000, guid: 5ca582c787ed55143baedcbe609ad4e9, type: 3}
+    - time: 0.13333334
+      value: {fileID: 21300000, guid: 3ce8775ddbc5b1a42aca64a68cb0adf4, type: 3}
+    - time: 0.16666667
+      value: {fileID: 21300000, guid: 397b1c95beac9374792aa3587a2d692f, type: 3}
+    - time: 0.2
+      value: {fileID: 21300000, guid: 123aedca1ff715f44add86db8a2c10fa, type: 3}
+    - time: 0.23333333
+      value: {fileID: 21300000, guid: 540d7969c3c725f4daf0b659b8e4d948, type: 3}
+    - time: 0.26666668
+      value: {fileID: 21300000, guid: 633aa06231933c444b86c6ad53b6138d, type: 3}
+    - time: 0.3
+      value: {fileID: 21300000, guid: 7285f0be1f36a5142a8666bf2a19464c, type: 3}
+    - time: 0.33333334
+      value: {fileID: 21300000, guid: 1b55f30aa76d49c4daefa113d830183c, 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: 1b55f30aa76d49c4daefa113d830183c, type: 3}
+    - {fileID: 21300000, guid: a77510ff326affa4087fc82cd36c2ed7, type: 3}
+    - {fileID: 21300000, guid: 672d23d37eea2b549a3846867a0d6eed, type: 3}
+    - {fileID: 21300000, guid: 5ca582c787ed55143baedcbe609ad4e9, type: 3}
+    - {fileID: 21300000, guid: 3ce8775ddbc5b1a42aca64a68cb0adf4, type: 3}
+    - {fileID: 21300000, guid: 397b1c95beac9374792aa3587a2d692f, type: 3}
+    - {fileID: 21300000, guid: 123aedca1ff715f44add86db8a2c10fa, type: 3}
+    - {fileID: 21300000, guid: 540d7969c3c725f4daf0b659b8e4d948, type: 3}
+    - {fileID: 21300000, guid: 633aa06231933c444b86c6ad53b6138d, type: 3}
+    - {fileID: 21300000, guid: 7285f0be1f36a5142a8666bf2a19464c, type: 3}
+    - {fileID: 21300000, guid: 1b55f30aa76d49c4daefa113d830183c, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.35000002
+    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/Effect/HitAnimation2.anim.meta

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

Assets/Animation/Item/ExplosionMark/Explode.anim

@@ -19,21 +19,17 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300000, guid: ab87abd0fd4dfd242bb9b3db61be4682, type: 3}
-    - time: 0.033333335
-      value: {fileID: 21300000, guid: 65b190c5d8486764dbb4f0f0e7b3f695, type: 3}
+      value: {fileID: 21300000, guid: 208a7e998cba60e40a7ee8a78ed1f026, type: 3}
     - time: 0.06666667
-      value: {fileID: 21300000, guid: ab87abd0fd4dfd242bb9b3db61be4682, type: 3}
-    - time: 0.1
-      value: {fileID: 21300000, guid: 65b190c5d8486764dbb4f0f0e7b3f695, type: 3}
+      value: {fileID: 21300000, guid: 36780e5081cf56a4bad95e22cf29c044, type: 3}
     - time: 0.13333334
-      value: {fileID: 21300000, guid: ab87abd0fd4dfd242bb9b3db61be4682, type: 3}
-    - time: 0.16666667
-      value: {fileID: 21300000, guid: 65b190c5d8486764dbb4f0f0e7b3f695, type: 3}
+      value: {fileID: 21300000, guid: db3fe51c091be5141aa96181c5bd51f3, type: 3}
     - time: 0.2
-      value: {fileID: 21300000, guid: ab87abd0fd4dfd242bb9b3db61be4682, type: 3}
-    - time: 0.23333333
-      value: {fileID: 21300000, guid: 65b190c5d8486764dbb4f0f0e7b3f695, type: 3}
+      value: {fileID: 21300000, guid: 42680db5c332fa04fa956767f3fcf180, type: 3}
+    - time: 0.25
+      value: {fileID: 21300000, guid: 4ea4fb69c624e284f959924600d561aa, type: 3}
+    - time: 0.28333333
+      value: {fileID: 21300000, guid: 4ea4fb69c624e284f959924600d561aa, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
@@ -53,20 +49,18 @@ AnimationClip:
       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}
+    - {fileID: 21300000, guid: 208a7e998cba60e40a7ee8a78ed1f026, type: 3}
+    - {fileID: 21300000, guid: 36780e5081cf56a4bad95e22cf29c044, type: 3}
+    - {fileID: 21300000, guid: db3fe51c091be5141aa96181c5bd51f3, type: 3}
+    - {fileID: 21300000, guid: 42680db5c332fa04fa956767f3fcf180, type: 3}
+    - {fileID: 21300000, guid: 4ea4fb69c624e284f959924600d561aa, type: 3}
+    - {fileID: 21300000, guid: 4ea4fb69c624e284f959924600d561aa, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.25
+    m_StopTime: 0.3
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0

Assets/Prefabs/Characters/menuParticle.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: 1677711941143746}
+  m_IsPrefabAsset: 1
+--- !u!1 &1677711941143746
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4884325733084706}
+  - component: {fileID: 212226314909932334}
+  - component: {fileID: 50937607185269280}
+  - component: {fileID: 60914165090394070}
+  - component: {fileID: 114427124532726354}
+  m_Layer: 19
+  m_Name: menuParticle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4884325733084706
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1677711941143746}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.10124648, y: -0.1585421, z: 0}
+  m_LocalScale: {x: 6, y: 6, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!50 &50937607185269280
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1677711941143746}
+  m_BodyType: 0
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDrag: 0
+  m_AngularDrag: 0.05
+  m_GravityScale: 1
+  m_Material: {fileID: 6200000, guid: 8eb863c9985dc5b41b4c04efa93b6bad, type: 2}
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 1
+  m_Constraints: 0
+--- !u!60 &60914165090394070
+PolygonCollider2D:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1677711941143746}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 6200000, guid: 8eb863c9985dc5b41b4c04efa93b6bad, type: 2}
+  m_IsTrigger: 0
+  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.09375, y: 0.09375}
+    newSize: {x: 0.09375, y: 0.09375}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  m_Points:
+    m_Paths:
+    - - {x: 0.015850458, y: 0.04676413}
+      - {x: -0.015704429, y: 0.046965715}
+      - {x: -0.01560602, y: 0.031580765}
+      - {x: -0.031261414, y: 0.031526238}
+      - {x: -0.031180996, y: 0.016339913}
+      - {x: -0.04717206, y: 0.016206669}
+      - {x: -0.046856616, y: -0.01584689}
+      - {x: -0.03135604, y: -0.015454656}
+      - {x: -0.031499572, y: -0.03111196}
+      - {x: -0.015743466, y: -0.031173434}
+      - {x: -0.015640447, y: -0.046347085}
+      - {x: 0.015645683, y: -0.046696942}
+      - {x: 0.015327629, y: -0.00025501102}
+      - {x: 0.04655298, y: 0.0003018938}
+      - {x: 0.046568148, y: 0.015638411}
+      - {x: 0.031674653, y: 0.01564565}
+      - {x: 0.031250402, y: 0.031235235}
+      - {x: 0.015960451, y: 0.031578735}
+--- !u!114 &114427124532726354
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1677711941143746}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 735bd2e0c35f60c48a65bdffcf071f6f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!212 &212226314909932334
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1677711941143746}
+  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: -2078941185
+  m_SortingLayer: 8
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: eb676d99ecaac0c42b288324bd919674, 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.09375, y: 0.09375}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Prefabs/Characters/menuParticle.prefab.meta

+fileFormatVersion: 2
+guid: 0fb69e2b035e012489d2a22c907aff80
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Effect/EffectPrefab.prefab → Assets/Prefabs/Effect/EffectPrefab1.prefab

@@ -22,7 +22,7 @@ GameObject:
   - component: {fileID: 212967503221820828}
   - component: {fileID: 95997641238677140}
   m_Layer: 0
-  m_Name: EffectPrefab
+  m_Name: EffectPrefab1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -50,7 +50,7 @@ Animator:
   m_GameObject: {fileID: 1383143382242174}
   m_Enabled: 1
   m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 01e9a9d984d5f904daeaa1db1b5be12f, type: 2}
+  m_Controller: {fileID: 9100000, guid: 6cb700dae53143a49adb757f0a780a7f, type: 2}
   m_CullingMode: 0
   m_UpdateMode: 0
   m_ApplyRootMotion: 0

Assets/Prefabs/Effect/EffectPrefab2.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: 1792889817873322}
+  m_IsPrefabAsset: 1
+--- !u!1 &1792889817873322
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4236916543986778}
+  - component: {fileID: 212495592335083274}
+  - component: {fileID: 95038887191384536}
+  m_Layer: 0
+  m_Name: EffectPrefab2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4236916543986778
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1792889817873322}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -5.175062, y: 2.3469377, z: 0.02898876}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!95 &95038887191384536
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1792889817873322}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 01e9a9d984d5f904daeaa1db1b5be12f, 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!212 &212495592335083274
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1792889817873322}
+  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: -1453652901
+  m_SortingLayer: 12
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1.64, y: 1.5}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 0
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Prefabs/Effect/EffectPrefab2.prefab.meta

+fileFormatVersion: 2
+guid: 4c9a1e1dd2cd7834bafe3e590b0223ca
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/EffectManager.prefab

@@ -51,8 +51,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: afab5fa6167b5074aa04e9f006748fde, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  effectPrefab: {fileID: 1383143382242174, guid: 157414a270281184c8a674facfeadfdc,
-    type: 2}
+  effectPrefab: []
   numberPrefab: {fileID: 1166884881890714, guid: b6f24b3e481cfd84bae3488e627b28be,
     type: 2}
   numberCanvasPrefab: {fileID: 1312675998778534, guid: 8729c9b5e4968d747a9e080c137fe850,

Assets/Prefabs/LifeStoneManager.prefab

@@ -34,7 +34,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1420923890547556}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -6.9766555, y: 2.569394, z: 0.0049343775}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -66,6 +66,8 @@ MonoBehaviour:
     type: 2}
   goldPotionPrefab: {fileID: 1778675533210814, guid: 57c0f65ad47e39943a69b5b0a6fa0e47,
     type: 2}
+  droppedFramePrefab: {fileID: 1356237453793910, guid: a142a989cdc2e0c4ba0aabbcde26010e,
+    type: 2}
   vibrationVariable: 0.1
   droppedLifeStonePrefab: {fileID: 1149595688849768, guid: 8255a117a93935941b32b4aed9b299a0,
     type: 2}

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

@@ -1269,10 +1269,10 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 81778bb508bfec649a5df19c4d050170, type: 3}
-    m_FontSize: 22
+    m_FontSize: 35
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -1302,10 +1302,10 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 81778bb508bfec649a5df19c4d050170, type: 3}
-    m_FontSize: 22
+    m_FontSize: 35
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -2137,10 +2137,10 @@ MonoBehaviour:
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: 81778bb508bfec649a5df19c4d050170, type: 3}
-    m_FontSize: 22
+    m_FontSize: 35
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0

Assets/Prefabs/UI/In-Game UI/LifeStoneUI/DroppedLifeStoneFrame.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: 1356237453793910}
+  m_IsPrefabAsset: 1
+--- !u!1 &1356237453793910
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4387049952693582}
+  - component: {fileID: 114577193537719982}
+  - component: {fileID: 50953534370353754}
+  - component: {fileID: 61125896331842320}
+  m_Layer: 13
+  m_Name: DroppedLifeStoneFrame
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4387049952693582
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1356237453793910}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!50 &50953534370353754
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1356237453793910}
+  m_BodyType: 0
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDrag: 0
+  m_AngularDrag: 0.05
+  m_GravityScale: 3
+  m_Material: {fileID: 0}
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 1
+  m_Constraints: 4
+--- !u!61 &61125896331842320
+BoxCollider2D:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1356237453793910}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  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, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1}
+  m_EdgeRadius: 0
+--- !u!114 &114577193537719982
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1356237453793910}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b1d770c3b9f80dc448346abfdd29ae88, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  price: 0
+  priceTag: {fileID: 0}
+  priceSign: {fileID: 0}
+  frames:
+  - {fileID: 1366103144126518, guid: 830ffee34763ed741ab4a375a0dbac22, type: 2}
+  - {fileID: 1690566668189580, guid: deaaed06a4e2692439983f8416ddd232, type: 2}
+  - {fileID: 1976803328805560, guid: a7f047a9f533d4c448d09f13f288eb2f, type: 2}

Assets/Prefabs/UI/In-Game UI/LifeStoneUI/DroppedLifeStoneFrame.prefab.meta

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

Assets/Prefabs/UI/In-Game UI/LifeStoneUI/FrameUnitBody.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: 1690566668189580}
+  m_IsPrefabAsset: 1
+--- !u!1 &1690566668189580
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4406385520630980}
+  - component: {fileID: 212625986191130400}
+  m_Layer: 13
+  m_Name: FrameUnitBody
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4406385520630980
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1690566668189580}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.094, y: 0.463, z: 0}
+  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!212 &212625986191130400
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1690566668189580}
+  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: 2145601713
+  m_SortingLayer: 11
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300002, guid: eff441d843b9c664e97a81fcb39d8410, 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.68, y: 0.2}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Prefabs/UI/In-Game UI/LifeStoneUI/FrameUnitBody.prefab.meta

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

Assets/Prefabs/UI/In-Game UI/LifeStoneUI/FrameUnitBottom.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: 1366103144126518}
+  m_IsPrefabAsset: 1
+--- !u!1 &1366103144126518
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4888577510525666}
+  - component: {fileID: 212368658095750096}
+  m_Layer: 13
+  m_Name: FrameUnitBottom
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4888577510525666
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1366103144126518}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.094, y: 0.463, z: 0}
+  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!212 &212368658095750096
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1366103144126518}
+  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: 2145601713
+  m_SortingLayer: 11
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300004, guid: eff441d843b9c664e97a81fcb39d8410, 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.68, y: 0.2}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Prefabs/UI/In-Game UI/LifeStoneUI/FrameUnitBottom.prefab.meta

+fileFormatVersion: 2
+guid: 830ffee34763ed741ab4a375a0dbac22
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/UI/In-Game UI/LifeStoneUI/FrameUnitTop.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: 1976803328805560}
+  m_IsPrefabAsset: 1
+--- !u!1 &1976803328805560
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4556766450459136}
+  - component: {fileID: 212289992576129152}
+  m_Layer: 13
+  m_Name: FrameUnitTop
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4556766450459136
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1976803328805560}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.094, y: 0.463, z: 0}
+  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!212 &212289992576129152
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1976803328805560}
+  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: 2145601713
+  m_SortingLayer: 11
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: eff441d843b9c664e97a81fcb39d8410, 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.68, y: 0.2}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Prefabs/UI/In-Game UI/LifeStoneUI/FrameUnitTop.prefab.meta

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

Assets/Resources/Animations/explosionGlovesAttack2.anim.meta

 fileFormatVersion: 2
-guid: 8577ae016a412764684fcba81af639cb
+guid: f0e3b19ee969d4f429ee9d8430bb4a58
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000

Assets/Resources/Animations/shockStickAttack1.anim

@@ -134,7 +134,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 7
+        value: 13
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 0
@@ -170,7 +170,7 @@ AnimationClip:
         inWeight: 0
         outWeight: 0
       - serializedVersion: 3
-        time: 0.65
+        time: 0.6333333
         value: 0
         inSlope: Infinity
         outSlope: Infinity
@@ -198,7 +198,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0
       - serializedVersion: 3
-        time: 0.6333333
+        time: 0.5833333
         value: 0
         inSlope: 0
         outSlope: 0
@@ -444,7 +444,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 7
+        value: 13
         inSlope: Infinity
         outSlope: Infinity
         tangentMode: 0
@@ -480,7 +480,7 @@ AnimationClip:
         inWeight: 0
         outWeight: 0
       - serializedVersion: 3
-        time: 0.65
+        time: 0.6333333
         value: 0
         inSlope: Infinity
         outSlope: Infinity
@@ -508,7 +508,7 @@ AnimationClip:
         inWeight: 0.33333334
         outWeight: 0
       - serializedVersion: 3
-        time: 0.6333333
+        time: 0.5833333
         value: 0
         inSlope: 0
         outSlope: 0

Assets/Resources/Sprites/Addons/bit memory.png.meta

+fileFormatVersion: 2
+guid: 5649ef203df468b4cbb72811520c9f51
+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: 445b1a656dd60644e92dce4dd2f3b2e5
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Addons/bit memory_border.png.meta

+fileFormatVersion: 2
+guid: 78467e2ea11696e4f92091bba6323a62
+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: 64adf33e81021e24cb28e472c62fad28
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/PlayScene.unity

@@ -909,6 +909,10 @@ Prefab:
       propertyPath: ui
       value:
       objectReference: {fileID: 1206751492}
+    - target: {fileID: 1083421967201116, guid: e6794ab8e2e4c6340a23b382e9497cbb, type: 2}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e6794ab8e2e4c6340a23b382e9497cbb, type: 2}
   m_IsPrefabAsset: 0

Assets/Scenes/TitleScene.unity

@@ -252,6 +252,67 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &480314788
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 480314790}
+  - component: {fileID: 480314789}
+  m_Layer: 8
+  m_Name: Slope
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!60 &480314789
+PolygonCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 480314788}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  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, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  m_Points:
+    m_Paths:
+    - - {x: 0.26914883, y: -5.8408723}
+      - {x: 2.5344863, y: -5.7735853}
+      - {x: -13.392362, y: 6.114853}
+      - {x: -11.832088, y: 10.193672}
+      - {x: -15.192834, y: 7.2824817}
+      - {x: -9.963144, y: 0.46944082}
+      - {x: -10.223035, y: -3.0743551}
+      - {x: -10.532637, y: -5.9486995}
+--- !u!4 &480314790
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 480314788}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &937519332
 GameObject:
   m_ObjectHideFlags: 0
@@ -525,6 +586,67 @@ CanvasRenderer:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1450769623}
   m_CullTransparentMesh: 0
+--- !u!1 &1469117864
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1469117866}
+  - component: {fileID: 1469117865}
+  m_Layer: 10
+  m_Name: Refresh
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!60 &1469117865
+PolygonCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1469117864}
+  m_Enabled: 1
+  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, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  m_Points:
+    m_Paths:
+    - - {x: 8.789909, y: 13.0300255}
+      - {x: 6.1649437, y: 9.005848}
+      - {x: 6.2352858, y: 0.82056713}
+      - {x: -9.458838, y: 0.5586457}
+      - {x: -4.717751, y: -2.2025642}
+      - {x: 6.009948, y: -2.303913}
+      - {x: 10.227739, y: -1.8409414}
+      - {x: 10.341184, y: 3.661518}
+--- !u!4 &1469117866
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1469117864}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 3.72, y: -11.97, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1616470254
 GameObject:
   m_ObjectHideFlags: 0
@@ -620,6 +742,34 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0}
+--- !u!1 &2001908950
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2001908951}
+  m_Layer: 8
+  m_Name: Spawn
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2001908951
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2001908950}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -11.39, y: 6.64, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2009518874
 GameObject:
   m_ObjectHideFlags: 0
@@ -660,3 +810,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c29f8fff47d4559458612f7f39d777aa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  particlePrefab: {fileID: 1677711941143746, guid: 0fb69e2b035e012489d2a22c907aff80,
+    type: 2}
+  spawnPosition: {fileID: 2001908950}

Assets/Scripts/Characters/AttackProperty.cs

@@ -31,6 +31,14 @@ public class AttackProperty : MonoBehaviour {
             debuffTime[3] = debuffTime3;
             debuffTime[4] = debuffTime4;
         }
+        else
+        {
+            for(int i = 0; i < (int)EnemyDebuffCase.END_POINTER; i++)
+            {
+                debuffTime[i] = 0;
+            }
+                
+        }
     }
 
     private void Awake()

Assets/Scripts/Characters/Enemy/Enemy.cs

@@ -212,8 +212,8 @@ public class Enemy : MonoBehaviour {
             foreach (Item item in inventoryManager.itemList)
                 damageMultiplier *= item.GlobalFireDamageMultiplier();
 
-            TakeDamage(lifeStoneManager.lifeStoneRowNum * 0.3f * damageMultiplier);
-            EffectManager.Instance.StartNumber(0, gameObject.transform.parent.position, lifeStoneManager.lifeStoneRowNum * 0.3f);
+            TakeDamage(lifeStoneManager.lifeStoneRowNum * 0.15f * damageMultiplier);
+            EffectManager.Instance.StartNumber(0, gameObject.transform.parent.position, lifeStoneManager.lifeStoneRowNum * 0.15f);
         }
         debuffState[(int)EnemyDebuffCase.Fire] = DebuffState.Off;
         GetComponent<SpriteRenderer>().color = Color.white;

Assets/Scripts/EffectManager.cs

@@ -4,11 +4,11 @@ using UnityEngine;
 using UnityEngine.UI;
 
 public class EffectManager : Singleton<EffectManager> {
-    public GameObject effectPrefab;
+    public GameObject[] effectPrefab;
     public GameObject numberPrefab;
     public GameObject numberCanvasPrefab;
 
-    GameObject[] effectArray;
+    GameObject[,] effectArray;
     GameObject[] numberArray;
     GameObject numberCanvas;
 
@@ -18,11 +18,15 @@ public class EffectManager : Singleton<EffectManager> {
     {
         numberCanvas = Instantiate(numberCanvasPrefab);
 
-        effectArray = new GameObject[20];
+
+        effectArray = new GameObject[effectPrefab.Length,20];
+        for (int j = 0; j < effectPrefab.Length; j++)
+        {
             for (int i = 0; i < effectArray.Length; i++)
             {
-            effectArray[i] = Instantiate(effectPrefab, transform);
-            effectArray[i].SetActive(false);
+                effectArray[j,i] = Instantiate(effectPrefab[j], transform);
+                effectArray[j,i].SetActive(false);
+            }
         }
         numberArray = new GameObject[30];
         for (int i = 0; i < numberArray.Length; i++)
@@ -38,13 +42,13 @@ public class EffectManager : Singleton<EffectManager> {
     }
     public bool StartEffect(int type, Vector3 pos)
     {
-        foreach (GameObject obj in effectArray)
+        for (int i=0; i<effectArray.GetLength(1); i++)
         {
-            if (!obj.activeSelf)
+            if (!effectArray[type,i].activeSelf)
             {
-                obj.transform.position = pos;
-                obj.SetActive(true);
-                obj.GetComponent<Animator>().SetTrigger("start");
+                effectArray[type, i].transform.position = pos;
+                effectArray[type, i].SetActive(true);
+                effectArray[type, i].GetComponent<Animator>().SetTrigger("start");
                 return true;
             }
         }

Assets/Scripts/Item/Addon.cs

@@ -10,7 +10,6 @@ public abstract class Addon {
     public Sprite sprite;
     public Sprite highlight;
     public Vector2 sizeInventory;
-    public string addonDescription;
     public string addonInfo;
 
     public Addon()
@@ -25,7 +24,6 @@ public abstract class Addon {
         sprite = null;
         highlight = null;
         sizeInventory = new Vector2(0, 0);
-        addonDescription = null;
         addonInfo = null;
     }
     public virtual float DamageAdder(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)

Assets/Scripts/Item/Addons/ApprenticesMark.cs

@@ -15,6 +15,7 @@ public class ApprenticesMark : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/apprentice's mark"); ;
         highlight = Resources.Load<Sprite>("Sprites/Addons/apprentice's mark_border"); ;
         sizeInventory = new Vector2(65, 80);
+        addonInfo = "피해량이 25% 증가한다.";
     }
 
     public override float DamageMultiplier(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)

Assets/Scripts/Item/Addons/BitMemory.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+/// <summary>
+/// 애드온명: 비트 메모리
+/// 번호: 36
+/// </summary>
+public class BitMemory : Addon
+{
+    float damageStack;
+    public override void Declare()
+    {
+        id = 36; name = "비트 메모리";
+        quality = ItemQuality.Masterpiece;
+        type = AddonType.Component;
+        sprite = Resources.Load<Sprite>("Sprites/Addons/bit memory");
+        highlight = Resources.Load<Sprite>("Sprites/Addons/bit memory_border");
+        sizeInventory = new Vector2(80, 80);
+        addonInfo = "500 = item";
+        damageStack = 0;
+    }
+
+    public override void OtherEffect(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
+    {
+        damageStack += attackInfo.damage;
+        if(damageStack >= 500)
+        {
+            MapManager.Instance.UpgradeRoom(RoomType.Item);
+            damageStack = 0;
+        }
+    }
+}

Assets/Scripts/Item/Addons/BitMemory.cs.meta

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

Assets/Scripts/Item/Addons/BlacksmithsBrooch.cs

@@ -15,6 +15,7 @@ public class BlacksmithsBrooch : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/blacksmith's brooch");
         highlight = Resources.Load<Sprite>("Sprites/Addons/blacksmith's brooch_border");
         sizeInventory = new Vector2(65, 80);
+        addonInfo = "피해량이 55% 증가한다.";
     }
 
     public override float DamageMultiplier(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)

Assets/Scripts/Item/Addons/CoollyPride.cs

@@ -15,8 +15,7 @@ public class CoollyPride : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/coolly pride");
         highlight = Resources.Load<Sprite>("Sprites/Addons/coolly pride_border");
         sizeInventory = new Vector2(55, 80);
-        addonDescription = "꺼지지 않을 것 처럼 타올랐지만, 이제는 완전히 식어버린 차숀의 긍지.";
-        addonInfo = "기본 피해량이 4 미만이면 적을 2초간 빙결시킵니다.";
+        addonInfo = "기본 피해량이 4 미만일 때, 적을 2초간 빙결시킨다.";
     }
 
     public override float[] DebuffAdder(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)

Assets/Scripts/Item/Addons/DesignofRagur.cs

@@ -15,15 +15,16 @@ public class DesignofRagur : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/design of ragur");
         highlight = Resources.Load<Sprite>("Sprites/Addons/design of ragur_border");
         sizeInventory = new Vector2(70, 80);
+        addonInfo = "콤보에 포함된 B의 개수만큼 피해량이 50% 증가한다.";
     }
 
     public override float DamageMultiplier(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
     {
         int aNum = 0;
         for (int i = 0; i < combo.Length; i++)
-            if (combo[i] == 'A')
+            if (combo[i] == 'B')
                 aNum++;
 
-        return 1f + aNum * 0.4f;
+        return 1f + aNum * 0.5f;
     }
 }

Assets/Scripts/Item/Addons/FeatherofRheA.cs

@@ -15,6 +15,7 @@ public class FeatherofRheA : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/feather of rhea"); ;
         highlight = Resources.Load<Sprite>("Sprites/Addons/feather of rhea_border"); ;
         sizeInventory = new Vector2(77.5f, 77.5f);
+        addonInfo = "체공 중에 공격할 때, 피해량이 75% 증가한다.";
     }
 
     public override float DamageMultiplier(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)

Assets/Scripts/Item/Addons/GlowingHerb.cs

@@ -15,8 +15,7 @@ public class GlowingHerb : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/glowing herb"); ;
         highlight = Resources.Load<Sprite>("Sprites/Addons/glowing herb_border"); ;
         sizeInventory = new Vector2(77.5f, 75);
-        addonDescription = "활활 타오르며 매콤한 맛이 날 것 같지만 평범하게 쓰다. - 하부 료진";
-        addonInfo = "타격시 적을 3초간 화상 상태로 만듭니다.";
+        addonInfo = "적을 2초간 불태운다.";
     }
 
     public override float[] DebuffAdder(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
@@ -24,7 +23,7 @@ public class GlowingHerb : Addon
         float[] varArray = new float[(int)EnemyDebuffCase.END_POINTER];
         for (int i = 0; i < (int)EnemyDebuffCase.END_POINTER; i++) varArray[i] = 0f;
 
-        varArray[(int)EnemyDebuffCase.Fire] = 3f;
+        varArray[(int)EnemyDebuffCase.Fire] = 2f;
 
         return varArray;
     }

Assets/Scripts/Item/Addons/Gluttony.cs

@@ -17,8 +17,7 @@ public class Gluttony : Addon
         highlight = Resources.Load<Sprite>("Sprites/Addons/gluttony_border"); ;
         sizeInventory = new Vector2(80, 80);
         lifeStoneManager = LifeStoneManager.Instance;
-        addonDescription = "식욕은 누구에게나 존재한다. - 토미 다라바.";
-        addonInfo = "적을 처치하면 생명석이 1개 회복됩니다.";
+        addonInfo = "적을 처치하면 생명석이 1개 회복된다.";
     }
     public override void OtherEffect(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
     {

Assets/Scripts/Item/Addons/JanusCoin.cs

@@ -15,6 +15,7 @@ public class JanusCoin : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/janus coin");
         highlight = Resources.Load<Sprite>("Sprites/Addons/janus coin_border");
         sizeInventory = new Vector2(75, 80);
+        addonInfo = "타격시 50% 확률로 2의 피해를 입거나 적의 현재 체력의 25%에 해당하는 추가 피해를 입힌다.";
     }
     public override float DamageFinalAdder(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
     {

Assets/Scripts/Item/Addons/ParchmentPiece.cs

@@ -15,8 +15,7 @@ public class ParchmentPiece : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/parchment piece"); ;
         highlight = Resources.Load<Sprite>("Sprites/Addons/parchment piece_border"); ;
         sizeInventory = new Vector2(70, 77.5f);
-        addonDescription = "쓸모없는 애드온";
-        addonInfo = "피해량이 3 미만이면 피해량이 100% 증가합니다.";
+        addonInfo = "피해량이 3 미만이면 피해량이 100% 증가한다.";
     }
     public override float DamageMultiplier(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
     {

Assets/Scripts/Item/Addons/Sandbag.cs

@@ -15,6 +15,7 @@ public class Sandbag : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/sandbag"); ;
         highlight = Resources.Load<Sprite>("Sprites/Addons/sandbag_border"); ;
         sizeInventory = new Vector2(80, 80);
+        addonInfo = "직후의 연계 시간이 50% 감소하지만, 피해량이 150% 증가한다.";
     }
     public override void OtherEffect(string combo)
     {
@@ -22,6 +23,6 @@ public class Sandbag : Addon
     }
     public override float DamageMultiplier(PlayerAttackInfo attackInfo, Enemy enemyInfo, string combo)
     {
-        return 2f;
+        return 2.5f;
     }
 }
\ No newline at end of file

Assets/Scripts/Item/Addons/SmallLens.cs

@@ -15,6 +15,7 @@ public class SmallLens : Addon
         sprite = Resources.Load<Sprite>("Sprites/Addons/small lens");
         highlight = Resources.Load<Sprite>("Sprites/Addons/small lens_border");
         sizeInventory = new Vector2(72.5f, 77.5f);
+        addonInfo = "직후의 연계 시간이 75% 증가한다.";
     }
 
     public override void OtherEffect(string combo)

Assets/Scripts/Item/InventoryManager.cs

@@ -66,7 +66,7 @@ public class InventoryManager : Singleton<InventoryManager> {
         addonPool[2].Add("DesignofRagur");
         addonPool[2].Add("Sandbag");
 
-        //addonPool[3].Add("");
+        addonPool[3].Add("BitMemory");
 
 
         for (int i = 0; i < 4; i++)
@@ -91,14 +91,12 @@ public class InventoryManager : Singleton<InventoryManager> {
         /*ItemInstantiate("ShockStick", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
         ItemInstantiate("BitSword", player.transform.position, 1f);
-        yield return new WaitForSeconds(0.3f);*/
-        /*ItemInstantiate("Bow", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
-        ItemInstantiate("OilCask", player.transform.position, 1f);
+        ItemInstantiate("Bow", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
-        ItemInstantiate("ExplosionGloves", player.transform.position, 1f);
+        ItemInstantiate("Dagger", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
-        ItemInstantiate("BitSword", player.transform.position, 1f);
+        ItemInstantiate("ExplosionGloves", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);
         AddonInstantiate("GlowingHerb", player.transform.position, 1f);
         yield return new WaitForSeconds(0.3f);*/
@@ -147,9 +145,9 @@ public class InventoryManager : Singleton<InventoryManager> {
         {
             return AddonInstantiate(quality, pos, popoutStrength);
         }
-        else if(quality != ItemQuality.Study)
+        else if(quality != ItemQuality.Masterpiece)
         {
-            return ItemInstantiate(quality - 1, pos, popoutStrength);
+            return ItemInstantiate(quality + 1, pos, popoutStrength);
         }
         return null;
     }
@@ -218,9 +216,9 @@ public class InventoryManager : Singleton<InventoryManager> {
         {
             return ItemInstantiate(quality, pos, popoutStrength);
         }
-        else if (quality != ItemQuality.Study)
+        else if (quality != ItemQuality.Masterpiece)
         {
-            return AddonInstantiate(quality - 1, pos, popoutStrength);
+            return AddonInstantiate(quality + 1, pos, popoutStrength);
         }
         return null;
     }
@@ -304,9 +302,17 @@ public class InventoryManager : Singleton<InventoryManager> {
             foreach (Item tmpItem in itemList)
                 for (int j = 0; j < tmpItem.skillNum; j++)
                     if (item.combo[i].Equals(tmpItem.combo[j]))
+                    {
+                        StartCoroutine(GameManager.Instance.player.GetComponent<Player>().DisplayText(tmpItem.name + "와(과) 콤보가 중복됩니다!"));
                         return false;
+                    }
 
-        if (itemList.Count > 8) return false;
+
+        if (itemList.Count > 8)
+        {
+            StartCoroutine(GameManager.Instance.player.GetComponent<Player>().DisplayText("아이템이 너무 많습니다!"));
+            return false;
+        }
 
         itemList.Add(item);
         ui.SetOnPosition(itemList, addonList);
@@ -321,7 +327,11 @@ public class InventoryManager : Singleton<InventoryManager> {
     /// <returns></returns>
     public bool PushAddon(Addon addon)
     {
-        if (addonList.Count > 8) return false;
+        if (addonList.Count > 8)
+        {
+            StartCoroutine(GameManager.Instance.player.GetComponent<Player>().DisplayText("예비 애드온이 너무 많습니다!"));
+            return false;
+        }
 
         addonList.Add(addon);
         ui.SetOnPosition(itemList, addonList);

Assets/Scripts/Item/InventoryUI.cs

@@ -38,6 +38,7 @@ public class InventoryUI : MonoBehaviour {
     GameObject addonInfo;
     public int selectedItem = -1;
     string[] qualityString = new string[4] { "습작", "범작", "수작", "걸작" };
+    string[] typeString = new string[4] { "소품", "물질", "부품", "이론" };
 
     InventoryManager inventoryManager;
 
@@ -109,7 +110,7 @@ public class InventoryUI : MonoBehaviour {
             tmpObj.SetActive(true);
             addonInfo.transform.Find("Quality").GetComponent<Text>().text = qualityString[(int)currentAddon.quality];
             addonInfo.transform.Find("Name").GetComponent<Text>().text = currentAddon.name;
-            addonInfo.transform.Find("Description").GetComponent<Text>().text = currentAddon.addonDescription;
+            addonInfo.transform.Find("Description").GetComponent<Text>().text = typeString[(int)currentAddon.type];
             addonInfo.transform.Find("Info").GetComponent<Text>().text = currentAddon.addonInfo;
         }
     }
@@ -196,7 +197,7 @@ public class InventoryUI : MonoBehaviour {
                     infoAddons[i].SetActive(true);
                     infoAddonsFrame[i].transform.Find("Quality").GetComponent<Text>().text = qualityString[(int)itemList[selectedItem].addons[i].quality];
                     infoAddonsFrame[i].transform.Find("Name").GetComponent<Text>().text = itemList[selectedItem].addons[i].name;
-                    infoAddonsFrame[i].transform.Find("Description").GetComponent<Text>().text = itemList[selectedItem].addons[i].addonDescription;
+                    infoAddonsFrame[i].transform.Find("Description").GetComponent<Text>().text = typeString[(int)itemList[selectedItem].addons[i].type];
                     infoAddonsFrame[i].transform.Find("Info").GetComponent<Text>().text = itemList[selectedItem].addons[i].addonInfo;
 
 

Assets/Scripts/Item/Items/BitSword.cs

@@ -21,10 +21,10 @@ public class BitSword: Item
         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 };
+        itemInfo = "A x 25 = i";
+        comboName = new string[3] { "i", "", "" };
+        comboCool = new float[3] { 25, 0, 0 };
+        comboCurrentCool = new float[3] { 25, 0, 0 };
         coolSprite[0] = Resources.Load<Sprite>("Sprites/Cools/bit sword_cool1");
     }
 

Assets/Scripts/Item/Items/Bow.cs

@@ -22,7 +22,7 @@ public class Bow : Item {
         animation[1] = Resources.Load<AnimationClip>("Animations/bowAttack2");
         animation[2] = null;
         sizeInventory = new Vector2(137.5f, 137.5f);
-        itemInfo = "단순한 나무활. 군더더기 없는 깔끔한 모습이지만 금방이라도 부셔질 듯이 조잡한 것을 보니 싸구려 인듯 하다.";
+        itemInfo = "무난한 원거리 무기. 화살을 쏜 후 경직시간을 조심해야 한다.";
         comboName = new string[3] { "쏘기", "위로 쏘기", "" };
 
         player = GameManager.Instance.player;

Assets/Scripts/Item/Items/Dagger.cs

@@ -20,7 +20,7 @@ public class Dagger : Item
         animation[1] = Resources.Load<AnimationClip>("Animations/daggerAttack2");
         animation[2] = null;
         sizeInventory = new Vector2(127.5f, 125);
-        itemInfo = "옛날 옛적 호랑이 담배 피던 시절부터 존재하던 단검이다.";
+        itemInfo = "가장 기본적인 무기. 그러나 준수한 콤보 공격이 가능하다.";
         comboName = new string[3] { "베기", "찌르기", "" };
     }
 }

Assets/Scripts/Item/Items/ExplosionGloves.cs

@@ -24,7 +24,7 @@ public class ExplosionGloves : Item
         animation[1] = Resources.Load<AnimationClip>("Animations/explosionGlovesAttack2");
         animation[2] = null;
         sizeInventory = new Vector2(115f, 117.5f);
-        itemInfo = "보기보다 강력한 폭발을 일으킨다. 폭발을 일으킬때마다 장갑이 떨리는게 느껴진다.";
+        itemInfo = "벽에 표식을 그린 후, 신호를 보내 폭파시켜 큰 피해를 준다.";
         comboName = new string[3] { "설치", "폭파", "" };
         markPrefab = Resources.Load<GameObject>("Prefabs/Projectiles/ExplosionMark");
         InitMark();

Assets/Scripts/Item/Items/FeatherFan.cs

@@ -21,7 +21,7 @@ public class FeatherFan : Item
         animation[1] = null;
         animation[2] = null;
         sizeInventory = new Vector2(140f, 140f);
-        itemInfo = "";
+        itemInfo = "적을 밀어내는 거리가 900% 증가한다.";
         comboName = new string[3] { "", "", "" };
     }
 

Assets/Scripts/Item/Items/OilCask.cs

@@ -21,7 +21,7 @@ public class OilCask : Item
         animation[1] = null;
         animation[2] = null;
         sizeInventory = new Vector2(105f, 127.5f);
-        itemInfo = "";
+        itemInfo = "화염 피해가 100% 증가한다.";
         comboName = new string[3] { "", "", "" };
     }
 

Assets/Scripts/Item/Items/ShockStick.cs

@@ -12,7 +12,7 @@ public class ShockStick : Item {
 
     public override void Declare()
     {
-        id = 52; name = "감전 봉";
+        id = 52; name = "감전봉";
         quality = ItemQuality.Superior;
         skillNum = 2;
         combo = new string[3] { "ABA", "CBABB", "" };
@@ -23,7 +23,7 @@ public class ShockStick : Item {
         animation[1] = Resources.Load<AnimationClip>("Animations/shockStickAttack2");
         animation[2] = null;
         sizeInventory = new Vector2(140f, 140f);
-        itemInfo = "몸이 타는 것 같은 수준으로 아프다. 명령을 내릴 때 효과적일 것 같다.";
+        itemInfo = "적을 2초간 기절시킨다. 충전 5회 적중 시 방전을 사용할 수 있다.";
         comboName = new string[3] { "충전", "방전", "" };
 
         comboCool = new float[3] { 0, 5, 0 };
@@ -63,7 +63,7 @@ public class ShockStick : Item {
         {
             if(Vector3.Distance(enemy.gameObject.transform.position,player.transform.position) <= 6f)
             {
-                PlayerAttackInfo attack = new PlayerAttackInfo(20f, 0f, new float[(int)EnemyDebuffCase.END_POINTER] { 0, 0, 2, 0, 0 });
+                PlayerAttackInfo attack = new PlayerAttackInfo(30f, 0f, new float[(int)EnemyDebuffCase.END_POINTER] { 0, 0, 2, 0, 0 });
                 AttackCalculation(attack, enemy, combo[1]);
                 enemy.GetHit(attack);
                 EffectManager.Instance.StartEffect(0, enemy.gameObject.transform.position);

Assets/Scripts/MenuManager.cs

@@ -6,6 +6,12 @@ using UnityEngine.UI;
 
 public class MenuManager : MonoBehaviour {
 
+    public GameObject particlePrefab;
+    public GameObject spawnPosition;
+
+    GameObject[] particles;
+
+
     public void StartGame()
     {
         SceneManager.LoadScene("PlayScene");
@@ -21,16 +27,16 @@ public class MenuManager : MonoBehaviour {
 		}
 	}
     
-	// Use this for initialization
 	void Start () {
+        particles = new GameObject[30];
+        for(int i=0; i<30; i++)
+        {
+            particles[i] = Instantiate(particlePrefab);
+            particles[i].GetComponent<MenuParticle>().Init(spawnPosition.transform.position);
+        }
 	}
 	
-	// Update is called once per frame
 	void Update ()
 	{
-		Camera.main.backgroundColor = new Color(Random.Range(0f, 1f), Random.Range(0f, 1f), Random.Range(0f, 1f));
-		GameObject.Find("Text").GetComponent<Text>().color = new Color(Random.Range(0f, 1f), Random.Range(0f, 1f), Random.Range(0f, 1f));
-		GameObject.Find("Title").GetComponent<Text>().color = new Color(Random.Range(0f, 1f), Random.Range(0f, 1f), Random.Range(0f, 1f));
-		GameObject.Find("Button").GetComponent<Button>().image.color = new Color(Random.Range(0f, 1f), Random.Range(0f, 1f), Random.Range(0f, 1f));
 	}
 }

Assets/Scripts/MenuParticle.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class MenuParticle : MonoBehaviour {
+
+    Vector3 spawn;
+
+    public void Init(Vector3 pos)
+    {
+        spawn = pos;
+        shoot();
+    }
+
+    void shoot()
+    {
+        Rigidbody2D rb2D = GetComponent<Rigidbody2D>();
+
+        transform.position = spawn;
+        rb2D.velocity = new Vector2(0, Random.Range(-5f, 3f));
+    }
+
+    private void OnTriggerEnter2D(Collider2D collision)
+    {
+        shoot();
+    }
+}

Assets/Scripts/MenuParticle.cs.meta

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

Assets/Scripts/UI/In-game UI/LifeStoneScript/DroppedLifeStoneFrame.cs

+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class DroppedLifeStoneFrame : DroppedObject, IPlayerInteraction
+{
+    int rowNum;
+    public GameObject[] frames;
+    Rigidbody2D rb2D;
+    BoxCollider2D bc2D;
+    GameObject[] obj;
+    public void Init(int rowNum, Vector3 pos)
+    {
+        transform.position = pos;
+        this.rowNum = rowNum;
+        rb2D = GetComponent<Rigidbody2D>();
+        bc2D = GetComponent<BoxCollider2D>();
+        obj = new GameObject[rowNum + 2];
+
+        obj[0] = Instantiate(frames[0], transform.position + new Vector3(0, frames[0].GetComponent<SpriteRenderer>().bounds.extents.y,0) , Quaternion.identity ,transform);
+
+        for(int i = 0; i<rowNum; i++)
+        {
+            obj[i+1] = Instantiate(frames[1], transform.position + new Vector3(0, frames[0].GetComponent<SpriteRenderer>().bounds.extents.y * 2 + frames[1].GetComponent<SpriteRenderer>().bounds.extents.y * (i * 2 + 1), 0), Quaternion.identity, transform);
+        }
+        obj[rowNum + 1] = Instantiate(frames[2], transform.position + new Vector3(0, frames[0].GetComponent<SpriteRenderer>().bounds.extents.y * 2 + frames[1].GetComponent<SpriteRenderer>().bounds.extents.y * rowNum * 2 + frames[2].GetComponent<SpriteRenderer>().bounds.extents.y, 0), Quaternion.identity, transform);
+
+
+        bc2D.size = new Vector2(frames[0].GetComponent<SpriteRenderer>().bounds.extents.y * 2, obj[rowNum + 1].transform.position.y - obj[0].transform.position.y + frames[0].GetComponent<SpriteRenderer>().bounds.extents.y + frames[2].GetComponent<SpriteRenderer>().bounds.extents.y);
+        bc2D.offset = new Vector2(0, bc2D.size.y / 2f);
+    }
+    public void Apply()
+    {
+        LifeStoneManager.Instance.ExpandRow(rowNum);
+        Destroy(gameObject);
+    }
+    public void HighlightSwitch(bool enabled)
+    {
+    }
+}
\ No newline at end of file

Assets/Scripts/UI/In-game UI/LifeStoneScript/DroppedLifeStoneFrame.cs.meta

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

Assets/Scripts/UI/In-game UI/LifeStoneScript/LifeStoneManager.cs

@@ -35,6 +35,7 @@ public class LifeStoneManager : Singleton<LifeStoneManager> {
 	/// </summary>
 	public GameObject lifeUnitPrefab;
     public GameObject goldPotionPrefab;
+    public GameObject droppedFramePrefab;
 	/// <summary>
 	/// strength of vibration when Lifestone falls
 	/// </summary>
@@ -70,13 +71,13 @@ public class LifeStoneManager : Singleton<LifeStoneManager> {
         lifeStoneArray = new int[50, 3];
 		lifeStoneUnit = new GameObject[50, 3];
         for (int i = 0; i < 50; i++) for (int j = 0; j < 3; j++) lifeStoneArray[i, j] = 0;
-        PushLifeStone(CreateLifeStoneInfo(new Vector2Int(3, 6), 0, 0));
+        PushLifeStone(new LifeStoneInfo(new Vector2Int(3,6),"AAAAAAAAAAAAAA A  "));
         StartCoroutine("TestEnumerator");
     }
 	IEnumerator TestEnumerator()
 	{
         yield return null;
-
+        InstantiateFrame(GameManager.Instance.player.transform.position, 3, 1f);
     }
 
     /// <summary>
@@ -88,6 +89,13 @@ public class LifeStoneManager : Singleton<LifeStoneManager> {
         lifeStoneRowNum += rowNum;
         frameSuper.GetComponent<LifeStoneFrame>().AddRow(lifeStoneRowNum);
     }
+    public GameObject InstantiateFrame(Vector3 pos, int rowNum, float popoutStrength)
+    {
+        GameObject tmpFrame = Instantiate(droppedFramePrefab);
+        tmpFrame.GetComponent<DroppedLifeStoneFrame>().Init(rowNum, pos);
+        PopoutGenerator(tmpFrame, popoutStrength);
+        return tmpFrame;
+    }
 
     public GameObject InstantiatePotion(Vector3 pos, float popoutStrength)
     {

Assets/Sprites/Effect/cleave.meta

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

Assets/Sprites/Effect/pop.meta

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

Assets/Sprites/Effect/pop/effect_one1.png.meta

+fileFormatVersion: 2
+guid: 1b55f30aa76d49c4daefa113d830183c
+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: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: ae051c6063ca10a47997e9015deee7cb
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Effect/pop/effect_one10.png.meta

+fileFormatVersion: 2
+guid: 7285f0be1f36a5142a8666bf2a19464c
+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: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 4feb619639f4a0e46bc16a6d34792857
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Effect/pop/effect_one11.png.meta

+fileFormatVersion: 2
+guid: 5266d69b06048fe4fa3de1f34e58e364
+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: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 3b95297bf18a99146b37f5ac0286badc
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Effect/pop/effect_one2.png.meta

+fileFormatVersion: 2
+guid: a77510ff326affa4087fc82cd36c2ed7
+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: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 6acef9e04371c8b42b0639bd9b6d0829
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Effect/pop/effect_one3.png.meta

+fileFormatVersion: 2
+guid: 672d23d37eea2b549a3846867a0d6eed
+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: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 53e88a5543595e147b8a71ed2363bf0a
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Effect/pop/effect_one4.png.meta

+fileFormatVersion: 2
+guid: 5ca582c787ed55143baedcbe609ad4e9
+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: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: fa9d87e19b876ff48b5527ebd759b3c3
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Effect/pop/effect_one5.png.meta

+fileFormatVersion: 2
+guid: 3ce8775ddbc5b1a42aca64a68cb0adf4
+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: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 8820e4b612eaa924e9774201bfc85d75
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Effect/pop/effect_one6.png.meta

+fileFormatVersion: 2
+guid: 397b1c95beac9374792aa3587a2d692f
+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: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 31e3e45833436944ab7629d963463f43
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Effect/pop/effect_one7.png.meta

+fileFormatVersion: 2
+guid: 123aedca1ff715f44add86db8a2c10fa
+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: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 3cc5d94358511584d86e26a7e36c5291
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Effect/pop/effect_one8.png.meta

+fileFormatVersion: 2
+guid: 540d7969c3c725f4daf0b659b8e4d948
+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: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 97c83f3098398ab429d338f0eb90c573
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Effect/pop/effect_one9.png.meta

+fileFormatVersion: 2
+guid: 633aa06231933c444b86c6ad53b6138d
+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: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 289593efbc6fe074691469931f9f8a29
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/LifeStone/lifestoneframe.png.meta

@@ -48,7 +48,7 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
+  spritePixelsToUnits: 80
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1

Assets/Sprites/Player/attack/explosionGloves/explosion1.png.meta

+fileFormatVersion: 2
+guid: 208a7e998cba60e40a7ee8a78ed1f026
+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: 64
+  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: 1660783e59348d74793725fbdb0bbd06
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: