地图选项重做

ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/AttackShort.anim

@@ -14,35 +14,44 @@ AnimationClip:
   m_RotationCurves: []
   m_CompressedRotationCurves: []
   m_EulerCurves: []
-  m_PositionCurves: []
+  m_PositionCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0.319, y: 0.185, z: 0.38}
+        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.33333334
+        value: {x: 0.319, y: 0.77, z: 0.38}
+        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.6666667
+        value: {x: 0.319, y: 0.185, z: 0.38}
+        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:
-  - serializedVersion: 2
-    curve:
-    - time: 0
-      value: {fileID: 21300000, guid: a42b63ef21b40a44188d10ccba5f8a13, type: 3}
-    - time: 0.11666667
-      value: {fileID: 21300000, guid: 1f671c9075dd43a42aaaa0a1fb47f7ac, type: 3}
-    - time: 0.25
-      value: {fileID: 21300000, guid: 084d501d700b53a4cbcf7cbf423e67d7, type: 3}
-    - time: 0.41666666
-      value: {fileID: 21300000, guid: d9673e81d5dbef745bcb63be76b8e000, type: 3}
-    - time: 0.46666667
-      value: {fileID: 21300000, guid: 1d4ba1b6112198142a185ded66277a64, type: 3}
-    - time: 0.51666665
-      value: {fileID: 21300000, guid: 678cca87b106cc14590858c1340709fe, type: 3}
-    - time: 0.5833333
-      value: {fileID: 21300000, guid: 3dbf4b665e51a804187aa2b0f09c58a0, type: 3}
-    - time: 0.71666664
-      value: {fileID: 21300000, guid: fcb87208a15c34143bf685c3e3f9e1e7, type: 3}
-    - time: 0.8833333
-      value: {fileID: 21300000, guid: 49f20f73a6b13914ba24d8e3a33752a9, type: 3}
-    attribute: m_Sprite
-    path: 
-    classID: 212
-    script: {fileID: 0}
-    flags: 2
+  m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
   m_Bounds:
@@ -52,29 +61,20 @@ AnimationClip:
     genericBindings:
     - serializedVersion: 2
       path: 0
-      attribute: 0
+      attribute: 1
       script: {fileID: 0}
-      typeID: 212
-      customType: 23
-      isPPtrCurve: 1
+      typeID: 4
+      customType: 0
+      isPPtrCurve: 0
       isIntCurve: 0
       isSerializeReferenceCurve: 0
-    pptrCurveMapping:
-    - {fileID: 21300000, guid: a42b63ef21b40a44188d10ccba5f8a13, type: 3}
-    - {fileID: 21300000, guid: 1f671c9075dd43a42aaaa0a1fb47f7ac, type: 3}
-    - {fileID: 21300000, guid: 084d501d700b53a4cbcf7cbf423e67d7, type: 3}
-    - {fileID: 21300000, guid: d9673e81d5dbef745bcb63be76b8e000, type: 3}
-    - {fileID: 21300000, guid: 1d4ba1b6112198142a185ded66277a64, type: 3}
-    - {fileID: 21300000, guid: 678cca87b106cc14590858c1340709fe, type: 3}
-    - {fileID: 21300000, guid: 3dbf4b665e51a804187aa2b0f09c58a0, type: 3}
-    - {fileID: 21300000, guid: fcb87208a15c34143bf685c3e3f9e1e7, type: 3}
-    - {fileID: 21300000, guid: 49f20f73a6b13914ba24d8e3a33752a9, type: 3}
+    pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 0.9
+    m_StopTime: 0.6666667
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -89,15 +89,125 @@ AnimationClip:
     m_KeepOriginalPositionXZ: 0
     m_HeightFromFeet: 0
     m_Mirror: 0
-  m_EditorCurves: []
+  m_EditorCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0.319
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.33333334
+        value: 0.319
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6666667
+        value: 0.319
+        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.185
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.33333334
+        value: 0.77
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6666667
+        value: 0.185
+        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.38
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.33333334
+        value: 0.38
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.6666667
+        value: 0.38
+        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: 0
+  m_HasGenericRootTransform: 1
   m_HasMotionFloatCurves: 0
-  m_Events:
-  - time: 0.36666667
-    functionName: AttackVoicePlayer
-    data: 
-    objectReferenceParameter: {fileID: 0}
-    floatParameter: 0
-    intParameter: 0
-    messageOptions: 0
+  m_Events: []

ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/none.anim

@@ -0,0 +1,53 @@
+%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: none
+  serializedVersion: 7
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  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: []
+    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: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/none.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 19e2b78de33bc07478716f340f1df20f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/playerAni.controller

@@ -11,7 +11,6 @@ AnimatorState:
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
-  - {fileID: -2631735499208187108}
   - {fileID: -2740206605776522904}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
@@ -22,7 +21,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: aeef1255bc1df8c48a9bdb1051c749e8, type: 2}
+  m_Motion: {fileID: 7400000, guid: 19e2b78de33bc07478716f340f1df20f, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
@@ -53,31 +52,6 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
---- !u!1101 &-2631735499208187108
-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: 3713776644712451186}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.75409836
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
 --- !u!1102 &-2580958152059753047
 AnimatorState:
   serializedVersion: 6
@@ -86,7 +60,7 @@ AnimatorState:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: AttackShort
-  m_Speed: 1
+  m_Speed: 2
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 5696496716602928511}
@@ -119,13 +93,13 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   - m_Name: attack
     m_Type: 9
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -150,13 +124,13 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -6036269737509403969}
-    m_Position: {x: 0, y: 260, z: 0}
+    m_Position: {x: 40, y: 250, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -2580958152059753047}
-    m_Position: {x: 310, y: 260, z: 0}
+    m_Position: {x: 320, y: 250, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 3713776644712451186}
-    m_Position: {x: 120, y: 350, z: 0}
+    m_Position: {x: 40, y: 360, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -177,8 +151,7 @@ AnimatorState:
   m_Name: Move
   m_Speed: 1
   m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 5940797015065165906}
+  m_Transitions: []
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -208,36 +181,11 @@ AnimatorStateTransition:
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 0.25
+  m_TransitionDuration: 0
   m_TransitionOffset: 0
-  m_ExitTime: 0.75409836
+  m_ExitTime: 1
   m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1101 &5940797015065165906
-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: -6036269737509403969}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.75409836
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
+  m_HasFixedDuration: 0
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1

ColorlessWorld-2024-4-2/Assets/Image/新选关/未命名作品(52).png.meta

@@ -138,8 +138,8 @@ TextureImporter:
         y: 299
         width: 502
         height: 568
-      alignment: 0
-      pivot: {x: 0.5, y: 0.5}
+      alignment: 9
+      pivot: {x: 0.48820016, y: 0.30185232}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []

ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SkullGuardian.prefab

@@ -154,6 +154,104 @@ MonoBehaviour:
   speed: 0.005
   currentdisappearTime: 0
   aimGamgObject: {fileID: 0}
+--- !u!1 &1314556980751243917
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2109013878162462771}
+  - component: {fileID: 6455667115297943236}
+  - component: {fileID: 8242089696254415575}
+  m_Layer: 9
+  m_Name: Square
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2109013878162462771
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1314556980751243917}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.19320382, y: 0.42019618, z: -0.10795913, w: 0.88002974}
+  m_LocalPosition: {x: 0.055, y: 0.694, z: -0.02}
+  m_LocalScale: {x: 0.055, y: 0.0552475, z: 0.055}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 4158766577167906083}
+  m_LocalEulerAnglesHint: {x: 25.517, y: 50.649, z: -1.756}
+--- !u!212 &6455667115297943236
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1314556980751243917}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  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_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: e69f8bdf1b6fb814794e42cac08d7549, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &8242089696254415575
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1314556980751243917}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f71de549a026fec48b8f116e81d3ff61, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _camera: {fileID: 0}
 --- !u!1 &1880325291853289959
 GameObject:
   m_ObjectHideFlags: 0
@@ -186,8 +284,9 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 322596807654122222}
+  - {fileID: 2109013878162462771}
   - {fileID: 8098012657445599304}
+  - {fileID: 322596807654122222}
   - {fileID: 5661943736827879434}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -242,6 +341,7 @@ MonoBehaviour:
   followPoint: {fileID: 8098012657445599304}
   bone: {fileID: 6928223977781211758, guid: 5a133951e41a4ec43a57bc107e44f87e, type: 3}
   bone_Re: {fileID: 0}
+  lasteHp: 0
   canMove: 0
   planAction: 2
 --- !u!114 &8412139385272254344
@@ -272,13 +372,14 @@ GameObject:
   - component: {fileID: 322596807654122222}
   - component: {fileID: 278785895296680341}
   - component: {fileID: 2729846693771078170}
+  - component: {fileID: 3298301351620550330}
   m_Layer: 9
   m_Name: Enemy_1
   m_TagString: Enemy
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &322596807654122222
 Transform:
   m_ObjectHideFlags: 0
@@ -344,6 +445,19 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!114 &3298301351620550330
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2778471538238530486}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f71de549a026fec48b8f116e81d3ff61, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _camera: {fileID: 0}
 --- !u!1 &8800151131615427679
 GameObject:
   m_ObjectHideFlags: 0
@@ -367,15 +481,15 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8800151131615427679}
-  m_LocalRotation: {x: 0.19956653, y: 0.38129517, z: -0.08378536, w: 0.8987587}
-  m_LocalPosition: {x: 0, y: 0, z: -0.23}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalRotation: {x: 0.41586685, y: 0.3218321, z: -0.16021955, w: 0.8353494}
+  m_LocalPosition: {x: 0, y: 0, z: -0.273}
+  m_LocalScale: {x: 1, y: 0.99999976, z: 1.0000002}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4158766577167906083}
-  m_LocalEulerAnglesHint: {x: 25, y: 46, z: 0.1}
+  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.25, y: 0.317}
+  m_AnchoredPosition: {x: -0.371, y: 0.398}
   m_SizeDelta: {x: 1.164, y: 0.6462}
   m_Pivot: {x: 0.5, y: 0.5}

ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab

@@ -343,6 +343,7 @@ GameObject:
   - component: {fileID: 8739798778191560965}
   - component: {fileID: 8570734685845233804}
   - component: {fileID: 6055812006071397122}
+  - component: {fileID: 2423811669981212207}
   m_Layer: 10
   m_Name: EnemyInSenceCanvas(Clone)
   m_TagString: Untagged
@@ -481,7 +482,20 @@ BoxCollider:
   m_Enabled: 1
   serializedVersion: 3
   m_Size: {x: 0.7, y: 0.7, z: 0.100000024}
-  m_Center: {x: 0, y: 0.6, z: 0}
+  m_Center: {x: 0, y: 0.6, z: -0.2}
+--- !u!114 &2423811669981212207
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 964438308613443404}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f71de549a026fec48b8f116e81d3ff61, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _camera: {fileID: 0}
 --- !u!1 &1844870834168589050
 GameObject:
   m_ObjectHideFlags: 0

ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/EmptyNode.prefab

@@ -230,8 +230,12 @@ MonoBehaviour:
   nextLevelNodes: []
   lineRenderer: {fileID: 3498766877212628700, guid: 627727da82f872c4dbc2519635427a3d,
     type: 3}
+  lineOffset: 0
+  lineOffsetInFight: 30
   roomType: 0
   roomDestinationIndex: 0
+  roomIcon: {fileID: 0}
+  roomText: {fileID: 0}
 --- !u!1 &5824790460616149335
 GameObject:
   m_ObjectHideFlags: 0

ColorlessWorld-2024-4-2/Assets/Prefab/LevelPrefab/InFight/Image.prefab

@@ -58,14 +58,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 0.9150943, g: 0.9150943, b: 0.9150943, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: -1106922250, guid: 3f178ac41dab5ba4f87ae0183d99f2ff, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

ColorlessWorld-2024-4-2/Assets/Scripts/Audio/AudioManager.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using static UnityEngine.Rendering.DebugUI;
 
 public class AudioManager : Singleton<AudioManager>
 {
@@ -134,4 +135,9 @@ public class AudioManager : Singleton<AudioManager>
         enemyActionSource.clip = enemyHurtClip;
         enemyActionSource.Play();
     }
+    public IEnumerator WaitShieldVoicePlayer(int value , float time)
+    {
+        yield return new WaitForSeconds(time);
+        ShieldVoicePlayer(value);
+    }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs

@@ -138,15 +138,12 @@ public class CardEntity : MonoBehaviour
         //音效
         AudioManager.Instance.AttackVoicePlayer();
         //动画触发和角色翻转
-        if(cardOriginalData .CarType == 1)
-        {
         Player player = GameManager.Instance.player;
         player.anim.SetTrigger("attack");
-
         Vector3 dis = Input.mousePosition + Vector3.forward *15;
         Vector3 pos = Camera.main.ScreenToWorldPoint(dis);
         player.FlipLocalScale(pos);
-        }
+
         //debug卡名
         Debug.Log("打出"+cardOriginalData.ChineseName);
         //灰色地块效果

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs

@@ -152,7 +152,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
         //¼õѪÒôЧ
         if(EnemyState .currentHP < lasteHp  )
         {
-            StartCoroutine(EnemyHurtVoice(1.3f));
+            StartCoroutine(EnemyHurtVoice(0.9f));
             lasteHp = (int)EnemyState.currentHP;
         }
     }
@@ -172,6 +172,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
     {
         //this.transform.position = GameManager.Instance.X[positionX].Y[positionY].transform.position;
         GameManager.Instance.X[positionX].Y[positionY].enemyNode = this;
+        transform.SetParent(GameManager.Instance.X[positionX].Y[positionY].CylinderFloor.transform);
         if (enemyType ==EnemyType.block)
         {
             GameManager.Instance.X[positionX].Y[positionY].blocked = true;

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/SkullGuardian.cs

@@ -139,6 +139,7 @@ public class SkullGuardian : MonoBehaviour
         enemyNode.positionX = disNode.locationX;
         enemyNode.positionY = disNode.locationY;
         disNode.enemyNode = enemyNode;
+        transform.SetParent(disNode.CylinderFloor.transform);
         yield return StartCoroutine(SkeletonArcherMoveCoroutine(disNode));
     }
 

ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/InFinghtLevelMap/InFightMap.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using static LevelDevelopManager;
 
 public class InFightMap : Singleton <InFightMap>
 {
@@ -22,7 +23,14 @@ public class InFightMap : Singleton <InFightMap>
     public Sprite campfireIcon;
     public Sprite incidentIcon;
     public Sprite treasureIcon;
-
+    [Header("节点生成大小")]
+    public Vector3 mosterBig;
+    public Vector3 eliteMosterBig;
+    public Vector3 shopBig;
+    public Vector3 incidentBig;
+    public Vector3 campfireBig;
+    public Vector3 bossBig;
+    public Vector3 treasureBig;
     private void Start()
     {
         originalPoint = generatorPoint.transform.localPosition;
@@ -52,10 +60,10 @@ public class InFightMap : Singleton <InFightMap>
         {
             if (i == generatorLine - 1)
             {
-                generatorPoint.transform.localPosition = new Vector3(originalPoint.x, generatorPoint.transform.localPosition.y + columnOffset, 0);
+                generatorPoint.transform.localPosition = new Vector3(generatorPoint.transform.localPosition.x + columnOffset, originalPoint.y , 0);
                 for (int j = 0; j < generatorColumn; j++)
                 {
-                    generatorPoint.transform.localPosition = new Vector3(generatorPoint.transform.localPosition.x + lineOffset, generatorPoint.transform.localPosition.y, 0);
+                    generatorPoint.transform.localPosition = new Vector3(generatorPoint.transform.localPosition.x , generatorPoint.transform.localPosition.y + lineOffset, 0);
 
                     //var level = Instantiate(levelPrefab, generatorPoint.transform.position, this.transform.rotation);
                     //level.transform.SetParent(transform);
@@ -76,13 +84,13 @@ public class InFightMap : Singleton <InFightMap>
             {
                 for (int j = 0; j < generatorColumn; j++)
                 {
-                    generatorPoint.transform.localPosition= new Vector3(generatorPoint.transform.localPosition.x + lineOffset, generatorPoint.transform.localPosition.y, 0);
+                    generatorPoint.transform.localPosition= new Vector3(generatorPoint.transform.localPosition.x , generatorPoint.transform.localPosition.y + lineOffset, 0);
 
                     GenerateLevelNode(i, j, generatorPoint.transform.localPosition);
                 }
             }
 
-            generatorPoint.transform.localPosition = new Vector3(originalPoint.x, generatorPoint.transform.localPosition.y + columnOffset, 0);
+            generatorPoint.transform.localPosition = new Vector3(generatorPoint.transform.localPosition.x + columnOffset, originalPoint.y, 0);
         }
     }
     //根据保存的信息生成地图
@@ -100,7 +108,7 @@ public class InFightMap : Singleton <InFightMap>
             }
 
         }
-
+        SetRoomBig();
         for (int i = 0; i <levelDevelopData.levelSaveMap.Count; i++)
         {
             for (int j = 0; j < levelDevelopData.levelSaveMap[i].levelDataList.Count; j++)
@@ -122,5 +130,41 @@ public class InFightMap : Singleton <InFightMap>
 
         }
     }
+
+    //设置房间大小
+    public void SetRoomBig()
+    {
+        for (int i = 0; i < levelDevelopData.levelSaveMap.Count; i++)
+        {
+            for (int j = 0; j < levelDevelopData.levelSaveMap[i].levelDataList.Count; j++)
+            {
+                switch (levelDevelopData.levelSaveMap[i].levelDataList[j].roomType)
+                {
+                    case RoomType.monster:
+                        levelMap[i].levelColumn[j].roomIcon .transform.localScale = mosterBig;
+                        break;
+                    case RoomType.eliteMonster:
+                        levelMap[i].levelColumn[j].roomIcon.transform.localScale = eliteMosterBig;
+                        break;
+                    case RoomType.shop:
+                        levelMap[i].levelColumn[j].roomIcon.transform.localScale = shopBig;
+                        break;
+                    case RoomType.incident:
+                        levelMap[i].levelColumn[j].roomIcon.transform.localScale = incidentBig;
+                        break;
+                    case RoomType.treasure:
+                        levelMap[i].levelColumn[j].roomIcon.transform.localScale = treasureBig;
+                        break;
+                    case RoomType.boss:
+                        levelMap[i].levelColumn[j].roomIcon.transform.localScale = bossBig;
+                        break;
+                    case RoomType.campfire:
+                        levelMap[i].levelColumn[j].roomIcon.transform.localScale = campfireBig;
+                        break;
+                }
+            }
+
+        }
+    }
 } 
 

ColorlessWorld-2024-4-2/Assets/Scripts/LeveProcess/LevelNode.cs

@@ -21,13 +21,14 @@ public class LevelNode : MonoBehaviour
     public GameObject lineRenderer;
     [Header("线段偏移")]
     public float lineOffset;
+    public float lineOffsetInFight;
     [Header("房间类型")]
     public LevelDevelopManager.RoomType roomType;
     [Header("房间目的地")]
     public int roomDestinationIndex;
-
-    Image roomIcon;
-    Text roomText;
+    [Header("·¿¼ä×°Åä×ÓÎïÌå")]
+    public  Image roomIcon;
+    public Text roomText;
 
     private void OnEnable()
     {
@@ -254,7 +255,8 @@ public class LevelNode : MonoBehaviour
             //长度
             float distance = Vector3.Distance(nextLevelNodes[i].transform.localPosition  ,transform.localPosition );
             Debug.Log(distance);
-            line.GetComponent<RectTransform>().sizeDelta = new Vector2(line.GetComponent<RectTransform>().sizeDelta.x, distance);
+            line.GetComponent<RectTransform>().sizeDelta = new Vector2(line.GetComponent<RectTransform>().sizeDelta.x, distance - lineOffsetInFight * 2);
+            line.GetComponent<RectTransform>().localPosition += new Vector3 ( lineOffsetInFight,0,0);
         }
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs

@@ -194,7 +194,6 @@ public class MapManager : Singleton<MapManager>
             enemynode.positionX = enemy.locationX;
             enemynode.positionY = enemy.locationY;
             enemynode.StartPosition();   
-
         }
         yield return null;
     }

ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs

@@ -62,11 +62,11 @@ public class Usermanager : Singleton<Usermanager>
     }
     private void Update()
     {
-        if(lasteShield != shield )
+       /* if(lasteShield != shield )
         {
             if (lasteShield < shield)
             {
-                AudioManager.Instance.ShieldVoicePlayer(1);           
+                StartCoroutine(AudioManager.Instance.WaitShieldVoicePlayer(1, 0.9f));        
             }
             else
             {
@@ -74,7 +74,7 @@ public class Usermanager : Singleton<Usermanager>
             }
             lasteShield = shield;
         }
-      
+      */
     }
     //BuffÊ©¼Ó
     public void SufferPlayerAbnormalCondition(string condition, int value ,Buff buff)