Merge pull request 'dev-0924-2' (#39) from dev-0924-2 into dev-0524

Reviewed-on: #39
1 year ago · 2537b6800a
37 changed files with 15070 additions and 189 deletions
--- a/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: def5e5aec3c1ae342bcc27fb14a80fa1
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7b89c32765b707e429893e5a7c977482
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong/Idle.anim
+++ b/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong/Idle.anim
@ -0,0 +1,373 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Idle
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0, y: 0.34, z: 0.071}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.5
+        value: {x: 0.0189, y: 0.3336, z: 0.0584}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 1
+        value: {x: 0, y: 0.34, z: 0.071}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_ScaleCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.06, y: 0.06, z: 0.06}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.5
+        value: {x: 0.057426, y: 0.058512, z: 0.06}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 1
+        value: {x: 0.06, y: 0.06, z: 0.06}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  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: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 0
+      attribute: 3
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    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:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0.0189
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.x
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.34
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0.3336
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0.34
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.071
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0.0584
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0.071
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.z
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.06
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0.057426
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0.06
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.x
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.06
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0.058512
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0.06
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.y
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.06
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0.06
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 0.06
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalScale.z
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 1
+  m_HasMotionFloatCurves: 0
+  m_Events: []
--- a/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong/Idle.anim.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong/Idle.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0e87c9aef47c91b44ac9549c00927c51
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong/Move.anim
+++ b/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong/Move.anim
@ -0,0 +1,213 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Move
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0, y: 0.34, z: 0.071}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.25
+        value: {x: 0, y: 0.34, z: 0.26}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.5
+        value: {x: 0, y: 0.34, z: 0.071}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  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: 1
+      script: {fileID: 0}
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.5
+    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:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.x
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.34
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 0.34
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0.34
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.y
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.071
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 0.26
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0.071
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalPosition.z
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 1
+  m_HasMotionFloatCurves: 0
+  m_Events: []
--- a/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong/Move.anim.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong/Move.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5975c194a2b5a6b47aad2c768e139902
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong/Shoot.anim
+++ b/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong/Shoot.anim
@ -0,0 +1,249 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Shoot
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 63, y: 0, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.25
+        value: {x: 63, y: 0, z: -180}
+        inSlope: {x: 0, y: 0, z: -720}
+        outSlope: {x: 0, y: 0, z: -720}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      - serializedVersion: 3
+        time: 0.5
+        value: {x: 63, y: 0, z: -360}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, y: 0, z: 0}
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  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: 4
+      script: {fileID: 0}
+      typeID: 4
+      customType: 4
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.5
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 63
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 63
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 63
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.x
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 16
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.y
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 16
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: -180
+        inSlope: -720
+        outSlope: -720
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: -360
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.z
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 16
+  m_EulerEditorCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.x
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.y
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.z
+    path: 
+    classID: 4
+    script: {fileID: 0}
+    flags: 0
+  m_HasGenericRootTransform: 1
+  m_HasMotionFloatCurves: 0
+  m_Events: []
--- a/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong/Shoot.anim.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong/Shoot.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5780db35fe8521e4499ab1d1598e6cd8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong/XiaoHuanXiong.controller
+++ b/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong/XiaoHuanXiong.controller
@ -0,0 +1,243 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-8822689546686828766
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: move
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1597058461011214336}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.5
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &-7409683841035764507
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Move
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -8822689546686828766}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 5975c194a2b5a6b47aad2c768e139902, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &-5839656332097386376
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: move
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -7409683841035764507}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-3788350402365597331
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 1597058461011214336}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: XiaoHuanXiong
+  serializedVersion: 5
+  m_AnimatorParameters:
+  - m_Name: shoot
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: move
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 3164021810435256263}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &1597058461011214336
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Idle
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 4732715435223012505}
+  - {fileID: -5839656332097386376}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 0e87c9aef47c91b44ac9549c00927c51, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1107 &3164021810435256263
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 3210104485385683045}
+    m_Position: {x: 30, y: 360, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 1597058461011214336}
+    m_Position: {x: 30, y: 220, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -7409683841035764507}
+    m_Position: {x: 304, y: 218, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 1597058461011214336}
+--- !u!1102 &3210104485385683045
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Shoot
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -3788350402365597331}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 5780db35fe8521e4499ab1d1598e6cd8, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &4732715435223012505
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: shoot
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 3210104485385683045}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
--- a/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong/XiaoHuanXiong.controller.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Image/Servant/ServantAnim/XiaoHuanXiong/XiaoHuanXiong.controller.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7904a6190d26a9341917bdc159f8daf2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f9b15352bf0260441a3f10b83e7e5daa
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/Bullet.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/Bullet.prefab
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/Bullet.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/Bullet/Bullet.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2a85b0846e771b641a6ebc4150663c15
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v02-Legendary.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v02-Legendary.prefab
@ -102,15 +102,15 @@ RectTransform:
  m_GameObject: {fileID: 573666602360100646}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: -0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 8417263142375954454}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.3000244, y: -46.10003}
-  m_SizeDelta: {x: 89.549, y: 56.809}
+  m_AnchoredPosition: {x: -0.3000244, y: -23.7187}
+  m_SizeDelta: {x: 89.549, y: 31.4643}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &224970991088968270
 CanvasRenderer:
@ -142,12 +142,12 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 10
+    m_FontSize: 18
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 1
    m_MaxSize: 40
-    m_Alignment: 1
+    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
    m_HorizontalOverflow: 0
@ -333,15 +333,15 @@ RectTransform:
  m_GameObject: {fileID: 2430536320784909734}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: -0.0000048067}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 4327911362163307378}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -2, y: -48.7}
-  m_SizeDelta: {x: 89.549, y: 56.809}
+  m_AnchoredPosition: {x: -1.2001, y: -47.54894}
+  m_SizeDelta: {x: 161.8084, y: 103.672}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &626272348365664036
 CanvasRenderer:
@ -373,7 +373,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 10
+    m_FontSize: 18
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 1
@ -661,15 +661,15 @@ RectTransform:
  m_GameObject: {fileID: 4434340823566726060}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 8417263142375954454}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.44727564, y: -9.500006}
-  m_SizeDelta: {x: 95.387, y: 19.2492}
+  m_AnchoredPosition: {x: 0.5819, y: -7.4081}
+  m_SizeDelta: {x: 192.0364, y: 29.633}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6521733443206888108
 CanvasRenderer:
@ -701,7 +701,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 15
+    m_FontSize: 25
    m_FontStyle: 1
    m_BestFit: 0
    m_MinSize: 1
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Common.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Common.prefab
@ -27,15 +27,15 @@ RectTransform:
  m_GameObject: {fileID: 573666602360100646}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 8417263142375954454}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1.6000122, y: -26.699976}
-  m_SizeDelta: {x: 40, y: 25}
+  m_AnchoredPosition: {x: 1.2001, y: -19.5043}
+  m_SizeDelta: {x: 81.6237, y: 26.7101}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &224970991088968270
 CanvasRenderer:
@ -67,12 +67,12 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 10
+    m_FontSize: 20
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 1
    m_MaxSize: 40
-    m_Alignment: 1
+    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
    m_HorizontalOverflow: 0
@ -159,8 +159,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -1.1527, y: -50.77}
-  m_SizeDelta: {x: 97.69, y: 91.58}
+  m_AnchoredPosition: {x: -0.4893, y: -3.3254}
+  m_SizeDelta: {x: 123.0809, y: 198.5893}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7499988351518322326
 CanvasRenderer:
@ -190,7 +190,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: -2127625255, guid: 1157d7960c3fe124b81605d8493a59ad, type: 3}
+  m_Sprite: {fileID: 2056361523, guid: 6ee9c76a053e25e498141299eb240f19, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -227,15 +227,15 @@ RectTransform:
  m_GameObject: {fileID: 2430536320784909734}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: -0.0000048067}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 4327911362163307378}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -2, y: -48.7}
-  m_SizeDelta: {x: 89.549, y: 56.809}
+  m_AnchoredPosition: {x: 0.00032043, y: -55.77752}
+  m_SizeDelta: {x: 186.77, y: 120.1379}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &626272348365664036
 CanvasRenderer:
@ -267,7 +267,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 10
+    m_FontSize: 17
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 1
@ -555,15 +555,15 @@ RectTransform:
  m_GameObject: {fileID: 4434340823566726060}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: -0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 8417263142375954454}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1.5473123, y: -5.0999813}
-  m_SizeDelta: {x: 95.387, y: 19.2492}
+  m_AnchoredPosition: {x: 2.8823, y: -5.1453}
+  m_SizeDelta: {x: 196.7175, y: 32.7559}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6521733443206888108
 CanvasRenderer:
@ -595,7 +595,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 15
+    m_FontSize: 25
    m_FontStyle: 1
    m_BestFit: 0
    m_MinSize: 1
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Legendary.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Legendary.prefab
@ -27,15 +27,15 @@ RectTransform:
  m_GameObject: {fileID: 573666602360100646}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 8417263142375954454}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1.1000122, y: -26.899975}
-  m_SizeDelta: {x: 40, y: 25}
+  m_AnchoredPosition: {x: 0.1536, y: -20.3415}
+  m_SizeDelta: {x: 81.6379, y: 26.2358}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &224970991088968270
 CanvasRenderer:
@ -67,12 +67,12 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 10
+    m_FontSize: 20
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 1
    m_MaxSize: 40
-    m_Alignment: 1
+    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
    m_HorizontalOverflow: 0
@ -159,8 +159,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -1.1527, y: -50.77}
-  m_SizeDelta: {x: 97.69, y: 91.58}
+  m_AnchoredPosition: {x: 0.434, y: -3.4489}
+  m_SizeDelta: {x: 123.1215, y: 197.2631}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7499988351518322326
 CanvasRenderer:
@ -190,7 +190,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: -2127625255, guid: 1157d7960c3fe124b81605d8493a59ad, type: 3}
+  m_Sprite: {fileID: 2056361523, guid: 6ee9c76a053e25e498141299eb240f19, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -227,15 +227,15 @@ RectTransform:
  m_GameObject: {fileID: 2430536320784909734}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: -0.0000048067}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 4327911362163307378}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -2, y: -48.7}
-  m_SizeDelta: {x: 89.549, y: 56.809}
+  m_AnchoredPosition: {x: -0.00060081, y: -55.594}
+  m_SizeDelta: {x: 187.53, y: 119.37}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &626272348365664036
 CanvasRenderer:
@ -267,7 +267,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 10
+    m_FontSize: 17
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 1
@ -555,15 +555,15 @@ RectTransform:
  m_GameObject: {fileID: 4434340823566726060}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: -0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 8417263142375954454}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1.5473123, y: -5.0999813}
-  m_SizeDelta: {x: 95.387, y: 19.2492}
+  m_AnchoredPosition: {x: 2.1958, y: -4.7993}
+  m_SizeDelta: {x: 197.637, y: 30.851}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6521733443206888108
 CanvasRenderer:
@ -595,7 +595,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 15
+    m_FontSize: 25
    m_FontStyle: 1
    m_BestFit: 0
    m_MinSize: 1
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Rare.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Rare.prefab
@ -80,8 +80,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -1.1527, y: -50.77}
-  m_SizeDelta: {x: 97.69, y: 91.58}
+  m_AnchoredPosition: {x: -0.1875, y: -3.629}
+  m_SizeDelta: {x: 121.6493, y: 198.1219}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7499988351518322326
 CanvasRenderer:
@ -111,7 +111,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: -2127625255, guid: 1157d7960c3fe124b81605d8493a59ad, type: 3}
+  m_Sprite: {fileID: 2056361523, guid: 6ee9c76a053e25e498141299eb240f19, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -148,15 +148,15 @@ RectTransform:
  m_GameObject: {fileID: 2430536320784909734}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: -0.0000048067}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 4327911362163307378}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -2, y: -48.7}
-  m_SizeDelta: {x: 89.549, y: 56.809}
+  m_AnchoredPosition: {x: 0.00041389, y: -55.75}
+  m_SizeDelta: {x: 187.64, y: 119.78}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &626272348365664036
 CanvasRenderer:
@ -188,7 +188,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 10
+    m_FontSize: 17
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 1
@ -476,15 +476,15 @@ RectTransform:
  m_GameObject: {fileID: 4434340823566726060}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: -0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 8417263142375954454}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1.5473123, y: -5.0999813}
-  m_SizeDelta: {x: 95.387, y: 19.2492}
+  m_AnchoredPosition: {x: 2.8999, y: -4.8826}
+  m_SizeDelta: {x: 195.8584, y: 28.6037}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6521733443206888108
 CanvasRenderer:
@ -516,7 +516,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 15
+    m_FontSize: 25
    m_FontStyle: 1
    m_BestFit: 0
    m_MinSize: 1
@ -649,15 +649,15 @@ RectTransform:
  m_GameObject: {fileID: 5236091805905574404}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 8417263142375954454}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1.1000122, y: -19.8}
-  m_SizeDelta: {x: 40, y: 25}
+  m_AnchoredPosition: {x: 0.9679, y: -20.2336}
+  m_SizeDelta: {x: 82.5116, y: 28.7572}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &717817782204063160
 CanvasRenderer:
@ -689,7 +689,7 @@ MonoBehaviour:
      m_Calls: []
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 10
+    m_FontSize: 20
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 1
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v03-Common(Look).prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v03-Common(Look).prefab
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v03-Common(Look).prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v03-Common(Look).prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c4b04e27becccc345ac55ffc92eaeee1
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v03-Legendary(Look).prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v03-Legendary(Look).prefab
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v03-Legendary(Look).prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v03-Legendary(Look).prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8188ea5e502ff334a8f8302961864e06
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v03-Rare.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v03-Rare.prefab
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v03-Rare.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v03-Rare.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 65d1471389706104e96e171fef0e4cdf
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullGuardian.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullGuardian.prefab
@ -166,6 +166,7 @@ GameObject:
  - component: {fileID: 3428195215565293398}
  - component: {fileID: 1337528727456485653}
  - component: {fileID: 8412139385272254344}
+  - component: {fileID: 8195393732516912303}
  m_Layer: 9
  m_Name: SkullGuardian
  m_TagString: Enemy
@ -261,6 +262,33 @@ MonoBehaviour:
    m_Bits: 0
  time: 0.2
  moveSpeed: 4
+--- !u!54 &8195393732516912303
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1880325291853289959}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 0
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 112
+  m_CollisionDetection: 0
 --- !u!1 &2778471538238530486
 GameObject:
  m_ObjectHideFlags: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas.prefab
@ -26,7 +26,7 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 2194590160913072063}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.0208}
+  m_LocalPosition: {x: 0, y: 0, z: 0.0186}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -35,8 +35,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0.2452, y: 0.0941}
-  m_SizeDelta: {x: 0.7464, y: 0.15}
+  m_AnchoredPosition: {x: 0.1557, y: 0.094}
+  m_SizeDelta: {x: 0.9071, y: 0.15}
  m_Pivot: {x: 0, y: 0}
 --- !u!222 &8015560330595815544
 CanvasRenderer:
@ -190,8 +190,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0, y: 0.075}
-  m_SizeDelta: {x: 0.9286, y: 0.147}
+  m_AnchoredPosition: {x: -0.0034, y: 0.097}
+  m_SizeDelta: {x: 0.8822, y: 0.147}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &596458534884467603
 CanvasRenderer:
@ -251,8 +251,8 @@ MonoBehaviour:
  m_ChildAlignment: 0
  m_StartCorner: 0
  m_StartAxis: 0
-  m_CellSize: {x: 0.15, y: 0.15}
-  m_Spacing: {x: 0, y: 0}
+  m_CellSize: {x: 0.2, y: 0.2}
+  m_Spacing: {x: -0.03, y: -0.03}
  m_Constraint: 0
  m_ConstraintCount: 2
 --- !u!1 &4259688268534563184
@ -289,7 +289,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 0.5}
  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -0.82899857, y: 0}
+  m_AnchoredPosition: {x: -0.69, y: -0.35}
  m_SizeDelta: {x: 34.0209, y: 39.967}
  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &3358310386134918242
@ -313,7 +313,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 0
@ -448,7 +448,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.2676, y: 0.5011}
+  m_AnchoredPosition: {x: -0.341, y: 0.5012}
  m_SizeDelta: {x: 0.1498, y: 0.2056}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &142189490626178573
@ -514,16 +514,16 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 5182406318465782228}
-  m_LocalRotation: {x: 0.0000046396613, y: -0.0000036954875, z: 0.7014898, w: 0.7126795}
+  m_LocalRotation: {x: 0.000008044486, y: -0.0000033321348, z: 0.38268343, w: 0.92387956}
  m_LocalPosition: {x: 0, y: 0, z: 0.005}
  m_LocalScale: {x: 0.22, y: 0.22, z: 0.22}
  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 1490550147990237706}
-  m_LocalEulerAnglesHint: {x: 0.001, y: 0, z: 89.093}
+  m_LocalEulerAnglesHint: {x: 0.001, y: 0, z: 45}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0.34600067, y: -0.22899628}
+  m_AnchoredPosition: {x: 0.39, y: -0.38}
  m_SizeDelta: {x: 0.2343, y: 2.2703}
  m_Pivot: {x: 0, y: 1}
 --- !u!222 &1090588325986817612
@ -547,7 +547,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.19215687, g: 0.19215687, b: 0.19215687, a: 1}
  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 0
@ -733,7 +733,7 @@ MonoBehaviour:
  m_FallbackScreenDPI: 96
  m_DefaultSpriteDPI: 96
  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
+  m_PresetInfoIsWorld: 0
 --- !u!114 &1982414028823000266
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -909,7 +909,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0.5}
  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 0.288, y: -0}
+  m_AnchoredPosition: {x: 0.24, y: -0.33}
  m_SizeDelta: {x: 1.81, y: 1.8}
  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6800910659500918712
@ -1089,7 +1089,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0.19245279, g: 0.19245279, b: 0.19245279, a: 1}
+  m_Color: {r: 0.19245279, g: 0.19245279, b: 0.19245279, a: 0}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
@ -1166,7 +1166,7 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7821050203446451649}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -0.0004}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -1174,8 +1174,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.077, y: -0.005}
-  m_SizeDelta: {x: -0.1944, y: 0}
+  m_AnchoredPosition: {x: 0.0593, y: -0.005}
+  m_SizeDelta: {x: -0.1591, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5804159073066982953
 CanvasRenderer:
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
@ -1315,7 +1315,7 @@ Canvas:
  m_AdditionalShaderChannelsFlag: 0
  m_UpdateRectTransformForStandalone: 0
  m_SortingLayerID: 144399565
-  m_SortingOrder: 0
+  m_SortingOrder: 1
  m_TargetDisplay: 0
 --- !u!1 &111044418
 GameObject:
@ -4254,7 +4254,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 0}
  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -1.135, y: -0.04}
+  m_AnchoredPosition: {x: -0.817, y: -0.04}
  m_SizeDelta: {x: 0.2337, y: 0.2056}
  m_Pivot: {x: 1, y: 0}
 --- !u!114 &315369331
@ -5124,8 +5124,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -0.2455, y: -0}
-  m_SizeDelta: {x: 1.4096, y: 0.1244}
+  m_AnchoredPosition: {x: 0.1298, y: 0}
+  m_SizeDelta: {x: 0.8439, y: 0.1244}
  m_Pivot: {x: 0, y: 0}
 --- !u!114 &359854922
 MonoBehaviour:
@ -5279,8 +5279,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.116, y: -0.231}
-  m_SizeDelta: {x: 0.9286, y: 0.1142}
+  m_AnchoredPosition: {x: -0.0231, y: -0.2098}
+  m_SizeDelta: {x: 0.8654, y: 0.1566}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &365854626
 MonoBehaviour:
@ -5303,7 +5303,7 @@ MonoBehaviour:
  m_StartCorner: 0
  m_StartAxis: 0
  m_CellSize: {x: 0.2, y: 0.2}
-  m_Spacing: {x: 0, y: 0}
+  m_Spacing: {x: -0.03, y: -0.03}
  m_Constraint: 0
  m_ConstraintCount: 2
 --- !u!114 &365854627
@ -8333,7 +8333,7 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 517249484}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0.000000018078}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -8341,8 +8341,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.12125, y: 0}
-  m_SizeDelta: {x: 1.1671, y: 0.1243}
+  m_AnchoredPosition: {x: 0.059, y: -0.0016}
+  m_SizeDelta: {x: 0.6939, y: 0.0932}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &517249486
 MonoBehaviour:
@ -9446,7 +9446,7 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 608009376}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -9455,8 +9455,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -0.2455, y: -0}
-  m_SizeDelta: {x: 1.4096, y: 0.1244}
+  m_AnchoredPosition: {x: 0.0763, y: 0}
+  m_SizeDelta: {x: 0.9464, y: 0.1244}
  m_Pivot: {x: 0, y: 0}
 --- !u!114 &608009378
 MonoBehaviour:
@ -15408,7 +15408,7 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1093559904}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -15416,8 +15416,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.1094, y: -0}
-  m_SizeDelta: {x: 1.1434, y: 0.1244}
+  m_AnchoredPosition: {x: 0.0656, y: -0}
+  m_SizeDelta: {x: 0.7534, y: 0.1244}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1093559906
 MonoBehaviour:
@ -15508,8 +15508,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  cardList: 
  cardGameObjectList: []
-  lookCardPrefab: {fileID: 1620241905568773253, guid: 5537996c2537a6d4daacc1d4ff899078,
-    type: 3}
+  cardScale: {x: 1.15, y: 1.15, z: 1.15}
 --- !u!114 &1093866096
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -15523,7 +15522,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Padding:
-    m_Left: 45
+    m_Left: 32
    m_Right: 0
    m_Top: 30
    m_Bottom: 0
@ -15531,7 +15530,7 @@ MonoBehaviour:
  m_StartCorner: 0
  m_StartAxis: 0
  m_CellSize: {x: 131, y: 197}
-  m_Spacing: {x: 20, y: 20}
+  m_Spacing: {x: 25, y: 50}
  m_Constraint: 0
  m_ConstraintCount: 2
 --- !u!1 &1094316938
@ -16418,9 +16417,9 @@ Animator:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1148505998}
-  m_Enabled: 0
+  m_Enabled: 1
  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: f6dd374739cf95b4f9c87536c4106a36, type: 2}
+  m_Controller: {fileID: 9100000, guid: 7904a6190d26a9341917bdc159f8daf2, type: 2}
  m_CullingMode: 0
  m_UpdateMode: 0
  m_ApplyRootMotion: 0
@ -17530,7 +17529,7 @@ MonoBehaviour:
    serializedVersion: 2
    m_Bits: 192
  movePath: []
-  anim: {fileID: 0}
+  anim: {fileID: 1148506001}
  speed: 2
  stepIconCount: -1
  StepIconFather: {fileID: 1259659850}
@ -17544,24 +17543,45 @@ MonoBehaviour:
    value: 3
    throwRange: 3
    effectRange: 1
+    coolDown: 1
+    useTimes: 1
+    storageTimes: 1
+    currentCoolDown: 0
+    currentUseTimes: 1
+    currentStorageTimes: 1
    skillType: 4
    Icon: {fileID: -1029742972, guid: 702e3230b1367444d9d459f02db67668, type: 3}
+    coolDownIcon: {fileID: 1361041433, guid: 702e3230b1367444d9d459f02db67668, type: 3}
  - name: shoot
    disdescription: "\u653B\u51FB\u529B\u4E0D\u9AD8\u7684\u666E\u901A\u5C04\u51FB"
    effectIndex: 1
    value: 6
    throwRange: 5
    effectRange: 1
+    coolDown: 1
+    useTimes: 1
+    storageTimes: 1
+    currentCoolDown: 0
+    currentUseTimes: 1
+    currentStorageTimes: 1
    skillType: 0
    Icon: {fileID: 158022059, guid: 702e3230b1367444d9d459f02db67668, type: 3}
+    coolDownIcon: {fileID: 1361041433, guid: 702e3230b1367444d9d459f02db67668, type: 3}
  - name: magic
    disdescription: "\u67D3\u8272\u7684\u9B54\u6CD5"
    effectIndex: 2
    value: 6
    throwRange: 3
    effectRange: 1
+    coolDown: 1
+    useTimes: 1
+    storageTimes: 1
+    currentCoolDown: 0
+    currentUseTimes: 1
+    currentStorageTimes: 1
    skillType: 2
    Icon: {fileID: 158022059, guid: 702e3230b1367444d9d459f02db67668, type: 3}
+    coolDownIcon: {fileID: 1361041433, guid: 702e3230b1367444d9d459f02db67668, type: 3}
  skillNodeList: []
  skillUIPos: []
  SkillUIPrefab: {fileID: 7216391201375852461, guid: 3a10c2662334fdd459c890a6dba99b1a,
@ -17571,6 +17591,8 @@ MonoBehaviour:
  startAngle: 0
  pathNodeNum: 5
  currentSkillInex: -1
+  bulletPrefab: {fileID: 6908092495586497889, guid: 2a85b0846e771b641a6ebc4150663c15,
+    type: 3}
 --- !u!114 &1202010109
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -19477,7 +19499,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 1, y: 0}
  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -1.135, y: -0.04}
+  m_AnchoredPosition: {x: -0.86, y: -0.04}
  m_SizeDelta: {x: 0.2337, y: 0.2056}
  m_Pivot: {x: 1, y: 0}
 --- !u!114 &1302517662
@ -22366,7 +22388,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 59.43, y: 0.3, z: 0.1}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0.158, y: 0.113}
+  m_AnchoredPosition: {x: 0.12, y: 0.113}
  m_SizeDelta: {x: 1.1641, y: 0.2986}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1533829699
@ -24273,6 +24295,12 @@ MonoBehaviour:
  levelDevelopData: {fileID: 11400000, guid: 587726a845a2bc7498172485a1bd194b, type: 2}
  cardDeck: {fileID: 11400000, guid: 1126a56dae0a1ab40821c18c251900ef, type: 2}
  relicList: {fileID: 11400000, guid: 0ccbda8ca8e9a4146aebd15491d3b067, type: 2}
+  commonCardForLook: {fileID: 8332382776685856903, guid: c4b04e27becccc345ac55ffc92eaeee1,
+    type: 3}
+  legendaryCardForLook: {fileID: 8237041268464934762, guid: 8188ea5e502ff334a8f8302961864e06,
+    type: 3}
+  rareCardForLook: {fileID: 3765913717623810826, guid: 65d1471389706104e96e171fef0e4cdf,
+    type: 3}
 --- !u!4 &1690695890
 Transform:
  m_ObjectHideFlags: 0
@ -24510,7 +24538,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0.19300002, y: -0.003999993}
+  m_AnchoredPosition: {x: 0.289, y: -0.003999993}
  m_SizeDelta: {x: 0.3, y: 0.3}
  m_Pivot: {x: 0, y: 0}
 --- !u!114 &1716463893
@ -25134,9 +25162,9 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingLayerID: 1267351179
+  m_SortingLayer: -2
+  m_SortingOrder: 12
  m_Sprite: {fileID: 21300000, guid: 48ef24ba9c4b2bf4e82e671e33eb713e, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@ -25637,7 +25665,7 @@ Canvas:
  m_AdditionalShaderChannelsFlag: 0
  m_UpdateRectTransformForStandalone: 0
  m_SortingLayerID: 801241541
-  m_SortingOrder: 0
+  m_SortingOrder: 2
  m_TargetDisplay: 0
 --- !u!1 &1755253523
 GameObject:
@ -26371,7 +26399,7 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1782416708}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@ -26379,8 +26407,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.116, y: -0.231}
-  m_SizeDelta: {x: 0.9286, y: 0.1142}
+  m_AnchoredPosition: {x: -0.0296, y: -0.2123}
+  m_SizeDelta: {x: 0.7893, y: 0.1515}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1782416710
 MonoBehaviour:
@ -26403,7 +26431,7 @@ MonoBehaviour:
  m_StartCorner: 0
  m_StartAxis: 0
  m_CellSize: {x: 0.2, y: 0.2}
-  m_Spacing: {x: 0, y: 0}
+  m_Spacing: {x: -0.03, y: -0.03}
  m_Constraint: 0
  m_ConstraintCount: 2
 --- !u!114 &1782416711
@ -28758,7 +28786,7 @@ RectTransform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1954493343}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
@ -28769,7 +28797,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0.19300002, y: -0.003999993}
+  m_AnchoredPosition: {x: 0.3, y: -0.003999993}
  m_SizeDelta: {x: 0.3, y: 0.3}
  m_Pivot: {x: 0, y: 0}
 --- !u!114 &1954493345
@ -28974,7 +29002,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 59.43, y: 0.3, z: 0.1}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0.158, y: 0.113}
+  m_AnchoredPosition: {x: 0.13, y: 0.113}
  m_SizeDelta: {x: 1.1641, y: 0.2986}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1974423748
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Bullet.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Bullet.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9aab15b35f76dc84e945f5cf7ad63a1e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Bullet/BulletMove.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Bullet/BulletMove.cs
@ -0,0 +1,46 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BulletMove : MonoBehaviour
+{
+    public Vector3 destination;//Ä¿µÄµØ
+    float time=0;
+    Vector3 startPoint;
+    [Header("ËÙ¶È")]
+    public float speed = 2f;
+
+    private void Start()
+    {
+        startPoint = transform.position;
+
+        Vector3 direction = destination - startPoint;
+        float angle = Vector3.SignedAngle(transform.forward, direction, transform.up);
+        transform.Rotate(new Vector3(0, angle, 0));
+    }
+    private  void Update()
+    {
+        MoveToDestination();
+    }
+
+    public void MoveToDestination()
+    {
+       transform .position = Vector3.Lerp(startPoint, destination, time += Time.deltaTime * speed);
+
+        if(Vector3 .Distance (this .transform .position ,destination )<0.1f)
+        {
+            Destroy(this.gameObject);
+        }
+    }
+    private void OnTriggerEnter(Collider other)
+    {
+        if (other.transform.tag == "Enemy")
+        {
+          //  Destroy(this.gameObject);
+        }
+    }
+    private void OnCollisionEnter(Collision collision)
+    {
+        
+    }
+}
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Bullet/BulletMove.cs.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Bullet/BulletMove.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ec9656599a9a8604fbc9f1c74367605c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/InFightLookCardManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/InFightLookCardManager.cs
@ -6,8 +6,8 @@ public class InFightLookCardManager : MonoBehaviour
 {
    public List<int> cardList = new List<int>();
    public List<GameObject> cardGameObjectList = new List<GameObject>();
-    public GameObject lookCardPrefab;

+    public Vector3 cardScale = new Vector3 (1,1,1);//ż¨ĹĆ´óĐĄËőˇĹ
    public void ShowDeckCard()
    {
        for (int i = 0; i < cardGameObjectList.Count; i++)
@ -25,8 +25,8 @@ public class InFightLookCardManager : MonoBehaviour

        for (int i = 0; i < cardList.Count; i++)
        {
-            var currentCard = Instantiate(lookCardPrefab, this.transform);
-            currentCard.GetComponent<CardEntity>().createCard(cardList[i], i);
+            var currentCard = TurnMaster.Instance.CreateCardWithIDForLook(cardList[i], transform);
+            currentCard.transform.localScale = cardScale;
            cardGameObjectList.Add(currentCard);
        }
    }
@ -48,8 +48,8 @@ public class InFightLookCardManager : MonoBehaviour

        for (int i = 0; i < cardList.Count; i++)
        {
-            var currentCard = Instantiate(lookCardPrefab, this.transform);
-            currentCard.GetComponent<CardEntity>().createCard(cardList[i], i);
+            var currentCard = TurnMaster.Instance.CreateCardWithIDForLook(cardList[i], transform);
+            currentCard.transform.localScale = cardScale;
            cardGameObjectList.Add(currentCard);
        }
    }
@ -71,8 +71,8 @@ public class InFightLookCardManager : MonoBehaviour

        for (int i = 0; i < cardList.Count; i++)
        {
-            var currentCard = Instantiate(lookCardPrefab, this.transform);
-            currentCard.GetComponent<CardEntity>().createCard(cardList[i], i);
+            var currentCard = TurnMaster.Instance.CreateCardWithIDForLook(cardList[i], transform);
+            currentCard.transform.localScale = cardScale;
            cardGameObjectList.Add(currentCard);
        }
    }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/LookCardManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/LookCardManager.cs
@ -37,9 +37,12 @@ public class LookCardManager : MonoBehaviour

        for (int i= 0;i<cardList .Count;i++)
        {
-            var currentCard = Instantiate(lookCardPrefab, this.transform);
-            currentCard.GetComponent<CardEntity>().createCard(cardList[i],i);
+            // var currentCard = Instantiate(lookCardPrefab, this.transform);
+            //  currentCard.GetComponent<CardEntity>().createCard(cardList[i],i);
+            // currentCard.transform.localScale = cardScale;
+            // cardGameObjectList.Add(currentCard);

+            var currentCard = TurnMaster.Instance.CreateCardWithIDForLook(cardList[i], transform);
            currentCard.transform.localScale = cardScale;
            cardGameObjectList.Add(currentCard);
        }
@ -127,8 +130,7 @@ public class LookCardManager : MonoBehaviour
        {
            for (int i = 0; i < cardList.Count; i++)
            {
-                var currentCard = Instantiate(lookCardPrefab, this.transform);
-                currentCard.GetComponent<CardEntity>().createCard(cardList[i], i);
+                var currentCard = TurnMaster.Instance.CreateCardWithIDForLook(cardList[i], transform);
                currentCard.transform.localScale = cardScale;
                cardGameObjectList.Add(currentCard);
            }
@ -137,8 +139,7 @@ public class LookCardManager : MonoBehaviour
        {
            for (int i = cardList.Count-1; i >= 0; i--)
            {
-                var currentCard = Instantiate(lookCardPrefab, this.transform);
-                currentCard.GetComponent<CardEntity>().createCard(cardList[i], i);
+                var currentCard = TurnMaster.Instance.CreateCardWithIDForLook(cardList[i], transform);
                currentCard.transform.localScale = cardScale;
                cardGameObjectList.Add(currentCard);
            }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs
@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.UI;

@ -82,8 +83,8 @@ public class TurnMaster : Singleton<TurnMaster>
            GameManager.Instance.playerState.currentStepRange = Usermanager.Instance.StepRangeCalculation(GameManager.Instance.playerState.maxStepRange);
            //恢复随从体力
            RecoverServantResource();
-            
-
+            //随从技能结算
+            SettleCoolDownSkill();
            //显示敌人攻击虚线
            EnemyManager.Instance.EnemyLine_Observer();
            //回复敌人系数
@ -189,6 +190,28 @@ public class TurnMaster : Singleton<TurnMaster>
    {
        ServentStateManager.Instance.servant .SkillUI.SetActive(false);
    }
+    //随从技能冷却
+    public void SettleCoolDownSkill()
+    {
+        List<Servant.ServantSkill> skillList = ServentStateManager.Instance.servant.skillList;
+        foreach (Servant.ServantSkill skill  in skillList)
+        {
+            if(skill.currentStorageTimes<skill .storageTimes)
+            {
+                if(skill .currentCoolDown >0)
+                {
+                    skill.currentCoolDown--;
+                }
+
+                if (skill.currentCoolDown <= 0)
+                {
+                    skill.currentCoolDown = skill .coolDown;
+                    skill.currentStorageTimes++;
+                }
+            }
+            
+        }
+    }

    //老吊写的函数
    public void restoreResource(int settleTurn)
@ -423,42 +446,29 @@ public class TurnMaster : Singleton<TurnMaster>
        cardDeck.cardList.RemoveAt(cardDeck.cardList.Count - 1);
        handCard.cardEntityList.Add(cardEntity);
    }
+
+
+    public GameObject CreateCardWithIDForLook(int id,Transform cardFrather)
+    {
+        GameObject cardPrefab;
+        cardPrefab = new GameObject();
+        int cardRarity = CardOriginalDataList.Instance.cardOriginalDataList[id].Rarity;   
+        switch (cardRarity)
+        {
+            case Name.CardRarity.Legendary:
+                cardPrefab = Instantiate(PlayerStatsManager .Instance.legendaryCardForLook, cardFrather);
+                break;
+            case Name.CardRarity.Rare:
+                cardPrefab = Instantiate(PlayerStatsManager.Instance.rareCardForLook, cardFrather);
+                break;
+            case Name.CardRarity.Common:
+                cardPrefab = Instantiate(PlayerStatsManager.Instance.commonCardForLook, cardFrather);
+                break;
+        }
+        cardPrefab.GetComponent<RectTransform>().localEulerAngles = new Vector3(0, 0, 0);
+        CardEntity cardEntity = cardPrefab.GetComponent<CardEntity>();
+        cardEntity.createCard(id, 0);
+
+        return cardPrefab;
+    }
 }
-/* public void ShuffleWithoutLosingCards()
- {
-     int k = 0;
-     for (int i = 0; i < 6; i++)
-     {
-         for (int j = k; j < handCard.cardSlotList.Count; j++)
-         {
-             k++;
-             if (handCard.cardSlotList[j].transform.childCount == 0)
-             {
-                 if (cardDeck.cardList.Count > 0)
-                 {
-                     var a = Instantiate(cardDeck.cardList[cardDeck.cardList.Count - 1], handCard.cardSlotList[j].transform.position, Quaternion.identity);
-                     a.transform.SetParent(handCard.cardSlotList[j].transform);
-                     cardDeck.cardList.RemoveAt(cardDeck.cardList.Count - 1);
-                     break;
-                 }
-                 else
-                 {
-                     //Ï´ÅÆ¼ÌÐø³é
-                     for (int c = 0; c < usedCard.usedCardList.Count; c++)
-                     {
-                         cardDeck.cardList.Add(cardDeck.cardPrefab);
-                     }
-                     usedCard.usedCardList.Clear();
-                     var a = Instantiate(cardDeck.cardList[cardDeck.cardList.Count - 1], handCard.cardSlotList[j].transform.position, Quaternion.identity);
-                     a.transform.SetParent(handCard.cardSlotList[j].transform);
-                     cardDeck.cardList.RemoveAt(cardDeck.cardList.Count - 1);
-                     break;
-                 }
-
-             }
-         }
-
-     }
- }
-
-*/
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs
@ -15,6 +15,11 @@ public class PlayerStatsManager : Singleton <PlayerStatsManager>
    //遗物数据
    public RelicData_SO relicList;

+    [Header("¿¨ÅÆÔ¤ÖÆÌå")]
+    public GameObject commonCardForLook;
+    public GameObject legendaryCardForLook;
+    public GameObject rareCardForLook;
+
    private void Start()
    {

--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent/ServantBottleCat.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent/ServantBottleCat.cs
@ -5,6 +5,8 @@ using UnityEngine.InputSystem;

 public class ServantBottleCat : Servant
 {
+    [Header ("¼¼ÄÜ×ÊÔ´")]
+    public GameObject bulletPrefab;
    public override void SkillePreviewSelector(int index)
    {
        switch (index)
@ -74,10 +76,17 @@ public class ServantBottleCat : Servant
            MapUnity currentNode = raycastHit.transform.GetComponent<MapUnity>();
            if (currentNode.enemyNode != null )
            {
+                var bullet = Instantiate(bulletPrefab, this.transform.position, bulletPrefab.transform.rotation);
+                BulletMove bulletMove =  bullet.GetComponent<BulletMove>();
+                bulletMove.destination = raycastHit.transform.position;
+                bulletMove.destination.y = 0.4f;
                currentNode.enemyNode.EnemyState.currentHP -= skillList[currentSkillInex].value;
+
+                anim.SetTrigger("shoot");
            }
            
        }
+
        ResetPreView();
    }
    public void Effect_2()
@ -91,6 +100,8 @@ public class ServantBottleCat : Servant
            foreach (var node in path )
            {
                node.whoColour = MapUnity.WhoColour.playerColour;
+
+                anim.SetTrigger("shoot");
            }

        }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs
@ -224,7 +224,7 @@ public class Servant : MonoBehaviour
            MapUnity mapNode = raycastHit.collider.transform.GetComponent<MapUnity>();

            //改变缩放翻转
-           // FlipLocalScale(raycastHit.point);
+            FlipLocalScale(raycastHit.point);

            //角色移动
            if (mapNode.influenced && mapNode.blocked == false && mapNode.enemyNode == null&&mapNode .playerOn ==false )
@ -239,7 +239,7 @@ public class Servant : MonoBehaviour
                }

                //改变动画
-               // anim.SetBool("move", true);
+                anim.SetBool("move", true);

                if (GameManager.Instance.servantOn != null)
                {
@ -285,7 +285,7 @@ public class Servant : MonoBehaviour
                GameManager.Instance.servantOn = mapNode;

                //改变动画
-                //anim.SetBool("move", false);
+                anim.SetBool("move", false);

                //取消标记终点
                mapNode.markInfluenced = false;
@ -315,13 +315,18 @@ public class Servant : MonoBehaviour
    {
        if (point.x < transform.position.x)
        {
-            anim.transform.localScale = new Vector3(-0.45f, 0.45f, 0.45f);
+            anim.transform.localScale = new Vector3(-0.06f, 0.06f, 0.06f);
        }
        else
        {
-            anim.transform.localScale = new Vector3(0.45f, 0.45f, 0.45f);
+            anim.transform.localScale = new Vector3(0.06f, 0.06f, 0.06f);
        }
    }
+    public void SettleSkillCoolDown()
+    {
+
+    }
+

    [System .Serializable ]
    public class ServantSkill
@ -332,6 +337,13 @@ public class Servant : MonoBehaviour
        public int value;
        public int throwRange;
        public int effectRange;
+        public int coolDown;//冷却时间
+        public int useTimes;//一回合能用几次
+        public int storageTimes;//最高存几次使用
+        public int currentCoolDown;
+        public int currentUseTimes;
+        public int currentStorageTimes;
+
        public SkillType skillType;
        public enum SkillType
        {
@ -343,5 +355,6 @@ public class Servant : MonoBehaviour
            noneRange
        }
        public Sprite Icon;
+        public Sprite coolDownIcon;
    }
 }
--- a/ColorlessWorld-2024-4-2/ProjectSettings/DynamicsManager.asset
+++ b/ColorlessWorld-2024-4-2/ProjectSettings/DynamicsManager.asset
@ -18,7 +18,7 @@ PhysicsManager:
  m_ClothInterCollisionDistance: 0.1
  m_ClothInterCollisionStiffness: 0.2
  m_ContactsGeneration: 1
-  m_LayerCollisionMatrix: ffe0ffffffe0ffffffe0ffffffffffffffe0ffffffe0ffffffe0ffffffe1ffff88e2ffff08e1ffff08e0ffff08e0ffff08e0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_LayerCollisionMatrix: ffc0ffffffc0ffffffc0ffffffffffffffc0ffffffc0ffffffc0ffffffc1ffff88c2ffff08e1ffff08c0ffff08e0ffff08c0ffff08caffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
  m_SimulationMode: 0
  m_AutoSyncTransforms: 0
  m_ReuseCollisionCallbacks: 0
--- a/ColorlessWorld-2024-4-2/ProjectSettings/TagManager.asset
+++ b/ColorlessWorld-2024-4-2/ProjectSettings/TagManager.asset
@ -22,7 +22,7 @@ TagManager:
  - EnemyUI
  - Block
  - BackGround
-  - 
+  - PlayerBullet
  - 
  - 
  -