Browse Source

鞭子攻击!居合斩!

SZAND\msx_2 3 months ago
parent
commit
5514b73df0

+ 1 - 1
ActionTowerDefense/Assets/Resources/Animation/Braid_Uv.controller

@@ -59,7 +59,7 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -3969772839982801465}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 230, y: 50, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

+ 4 - 4
ActionTowerDefense/Assets/Resources/Animation/eff_Braid.anim

@@ -56,7 +56,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 35
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -65,7 +65,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.26666668
-        value: 1
+        value: 35
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -286,7 +286,7 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 1
+        value: 35
         inSlope: 0
         outSlope: 0
         tangentMode: 136
@@ -295,7 +295,7 @@ AnimationClip:
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 0.26666668
-        value: 1
+        value: 35
         inSlope: 0
         outSlope: 0
         tangentMode: 136

+ 5 - 7
ActionTowerDefense/Assets/Resources/Prefab/Boss/WaterSprite/Boss_Braid.prefab

@@ -72,12 +72,12 @@ MonoBehaviour:
   bodyCollider: {fileID: 8400492028059296288}
   uiHp: {fileID: 5564430144159709496}
   beHitTrigger: {fileID: 7297311890656358082}
-  attackController: {fileID: 0}
+  attackController: {fileID: 7709371616461963}
   platform: {fileID: 0}
   mecanim: {fileID: 2486044303211473488}
   meshRenderer: {fileID: 0}
   ani: {fileID: 7338643810545314897}
-  totalDieKeepTime: 2
+  totalDieKeepTime: 13.066668
   totalAttack_summonTime: 0.5
   totalAttack_marchTime: 0.5
   showInjuryNum: 0
@@ -167,10 +167,10 @@ MonoBehaviour:
   maxHeight: 4
   minLength: 4
   maxLength: 8
-  umbrellaPrefab: {fileID: 0}
+  umbrellaPrefab: {fileID: 5733499164336919437, guid: 203a26064d258d74683c81fbfee9f135, type: 3}
   umbrellaOrigPos: {fileID: 0}
   umbrellaBackPos: {fileID: 0}
-  hairPrefab: {fileID: 0}
+  hairPrefab: {fileID: 431104053419175321, guid: 6cee5822ea2b0004dbc5f8064b71ab88, type: 3}
 --- !u!114 &7709371616461963
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -237,8 +237,6 @@ MonoBehaviour:
     isDemSummon: 0
   addAttackEffect: {fileID: 0}
   skill: {fileID: 0}
-  attackEffect: {fileID: 0}
-  effect: {fileID: 0}
   attackDistance: 0
   attackTrigger: {fileID: 0}
   isAttackTriggerOn: 0
@@ -308,7 +306,6 @@ MonoBehaviour:
     maxDownAngle: 0
     shootTrack: 0
     shootAlwaysTrack: 0
-    skillPrefab: {fileID: 0}
     skill: {fileID: 0}
 --- !u!1 &7709371692908228
 GameObject:
@@ -370,6 +367,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   rb: {fileID: 0}
   moveCharacter: {fileID: 0}
+  canOnGiant: 0
   haveGravity: 1
   trigGroundList: []
   platform: {fileID: 0}

+ 0 - 0
ActionTowerDefense/Assets/Resources/Prefab/FX/EFFCT_Braid_Uv.prefab → ActionTowerDefense/Assets/Resources/Prefab/Boss/WaterSprite/EFFCT_Braid_Uv.prefab


+ 1 - 1
ActionTowerDefense/Assets/Resources/Prefab/FX/EFFCT_Braid_Uv.prefab.meta → ActionTowerDefense/Assets/Resources/Prefab/Boss/WaterSprite/EFFCT_Braid_Uv.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f6dc4f0f4d230b447892c0659c8a75b8
+guid: d8523b7275cfa544fa83013a1365005a
 PrefabImporter:
   externalObjects: {}
   userData: 

+ 0 - 0
ActionTowerDefense/Assets/Resources/Prefab/FX/Effc_Aimline.prefab → ActionTowerDefense/Assets/Resources/Prefab/Boss/WaterSprite/Effc_Aimline.prefab


+ 0 - 0
ActionTowerDefense/Assets/Resources/Prefab/FX/Effc_Aimline.prefab.meta → ActionTowerDefense/Assets/Resources/Prefab/Boss/WaterSprite/Effc_Aimline.prefab.meta


+ 142 - 56
ActionTowerDefense/Assets/Resources/Prefab/Boss/WaterSprite/hair.prefab

@@ -9,7 +9,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6508795287431129629}
-  - component: {fileID: 6508795287431129628}
   - component: {fileID: -9063241122368130818}
   - component: {fileID: 7868394034830028542}
   m_Layer: 0
@@ -28,64 +27,13 @@ Transform:
   m_GameObject: {fileID: 6508795287431129626}
   m_LocalRotation: {x: -0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 30, y: 0.20996803, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1651553653373316177}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &6508795287431129628
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6508795287431129626}
-  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: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 1
-  m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, 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 &-9063241122368130818
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -112,5 +60,143 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 1, y: 0.99999994, z: 0.2}
+  m_Size: {x: 500, y: 1, z: 0.2}
   m_Center: {x: 0, y: 0, z: 0}
+--- !u!1001 &8327826012882774260
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 6508795287431129629}
+    m_Modifications:
+    - target: {fileID: 7311909480536285040, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_Layer
+      value: 23
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909480536285047, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909480536285047, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909480536285047, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481383926547, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: InitialModule.startColor.maxColor.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481383926557, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481383926557, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481383926557, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481383926558, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_Layer
+      value: 23
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481383926558, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481690039461, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481690039461, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481690039461, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481690039461, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481690039461, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481690039461, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481690039461, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481690039461, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481690039461, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481690039461, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481690039461, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481690039461, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481690039461, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481690039462, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_Name
+      value: EFFCT_Braid_Uv
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481690039462, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_Layer
+      value: 23
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481819585252, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_DrawMode
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481819585252, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_SortingLayer
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481819585252, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_SortingLayerID
+      value: -1730265859
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481819585253, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481819585253, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7311909481819585254, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+      propertyPath: m_Layer
+      value: 23
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+--- !u!4 &1651553653373316177 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7311909481690039461, guid: d8523b7275cfa544fa83013a1365005a, type: 3}
+  m_PrefabInstance: {fileID: 8327826012882774260}
+  m_PrefabAsset: {fileID: 0}

+ 2 - 1
ActionTowerDefense/Assets/Resources/Prefab/Boss/WaterSprite/hairController.prefab

@@ -49,10 +49,11 @@ MonoBehaviour:
   damage: 100
   hairPre: {fileID: 6508795287431129626, guid: 48ef6e9b8d784c64cb695d3b9b3a5f99, type: 3}
   warningPre: {fileID: 6508795287431129626, guid: e195fa890bd3aae43bd00260529e2372, type: 3}
+  hairColPre: {fileID: 0}
   aims: []
   ws: {fileID: 0}
   aimChas: []
-  warningTime: 0.1
+  warningTime: 1
   existTime: 2
   searchTime: 0.1
   singleChuaTime: 0.2

+ 84 - 54
ActionTowerDefense/Assets/Resources/Prefab/Boss/WaterSprite/hairWarning.prefab

@@ -9,8 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6508795287431129629}
-  - component: {fileID: 6508795287431129628}
-  m_Layer: 0
+  m_Layer: 23
   m_Name: hairWarning
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -26,61 +25,92 @@ Transform:
   m_GameObject: {fileID: 6508795287431129626}
   m_LocalRotation: {x: -0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 30, y: 0.07, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 9123485833469614611}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &6508795287431129628
-SpriteRenderer:
+--- !u!1001 &7188235135964401625
+PrefabInstance:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 6508795287431129629}
+    m_Modifications:
+    - target: {fileID: 1634836478223360329, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_Layer
+      value: 23
+      objectReference: {fileID: 0}
+    - target: {fileID: 2115741587112728009, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_Name
+      value: Effc_Aimline
+      objectReference: {fileID: 0}
+    - target: {fileID: 2115741587112728009, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_Layer
+      value: 23
+      objectReference: {fileID: 0}
+    - target: {fileID: 2115741587112728010, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2115741587112728010, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2115741587112728010, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2115741587112728010, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2115741587112728010, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2115741587112728010, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2115741587112728010, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2115741587112728010, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2115741587112728010, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2115741587112728010, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2115741587112728010, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2939978492106264577, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_Layer
+      value: 23
+      objectReference: {fileID: 0}
+    - target: {fileID: 3634840498322072439, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_Layer
+      value: 23
+      objectReference: {fileID: 0}
+    - target: {fileID: 7007629674802714599, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+      propertyPath: m_Layer
+      value: 23
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+--- !u!4 &9123485833469614611 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2115741587112728010, guid: c5306d92e9fa0a94982d5079c1f8f5a8, type: 3}
+  m_PrefabInstance: {fileID: 7188235135964401625}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6508795287431129626}
-  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: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 1
-  m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
-  m_Color: {r: 1, g: 0, b: 0, 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

File diff suppressed because it is too large
+ 869 - 37
ActionTowerDefense/Assets/Scenes/Game.unity


+ 3 - 3
ActionTowerDefense/Assets/Scripts/Boss/WaterGhost/HairSprint.cs

@@ -26,6 +26,8 @@ public class HairSprint : MonoBehaviour
     public GameObject hairPre;
     [LabelText("预警预制体")]
     public GameObject warningPre;
+    [LabelText("判定预制体")]
+    public GameObject hairColPre;
 
     private GameObject[] hairIns = new GameObject[7];
     private GameObject[] warningIns = new GameObject[7];
@@ -102,7 +104,7 @@ public class HairSprint : MonoBehaviour
     private void GetAims()
     {
         aims = new Vector3[7];
-        List<Character> aimCharacters = new List<Character>(7);
+        List<Character> aimCharacters = new List<Character>();
         aimCharacters = ws.searchTrigger.GetAllTargets(ws.attackController.targetTypes, true);
         bool hasAimedPlayer = false;
         var sortedObjects = aimCharacters.OrderBy(obj => Vector3.Distance(transform.position, obj.transform.position)).ToArray();
@@ -145,7 +147,6 @@ public class HairSprint : MonoBehaviour
 
     private void Chua(int id)
     {
-        Debug.Log(id);
         //警示线出现
         warningIns[id].transform.position = aims[id];
         float ro = Random.Range(0, 360);
@@ -162,7 +163,6 @@ public class HairSprint : MonoBehaviour
         hairIns[id].transform.localEulerAngles = warningIns[id].transform.localEulerAngles;
         hairIns[id].SetActive(true);
         warningIns[id].SetActive(false);
-        print(id);
         curHairID++;
     }
 

+ 34 - 0
ActionTowerDefense/Assets/Scripts/Boss/WaterGhost/HairUIPic.cs

@@ -0,0 +1,34 @@
+using UnityEngine;
+
+public class HairUIPic : MonoBehaviour
+{
+    public SpriteRenderer spriteA;
+    public RectTransform uiImageB;
+    private Camera mainCamera;
+
+    private void Start()
+    {
+        mainCamera = Camera.main;
+    }
+
+    void Update()
+    {
+        if (spriteA == null || uiImageB == null || mainCamera == null)
+            return;
+
+        //同步位置
+        Vector3 screenPos = mainCamera.WorldToScreenPoint(spriteA.transform.position);
+        uiImageB.position = screenPos;
+
+        //同步旋转
+        uiImageB.rotation = spriteA.transform.rotation;
+        /*
+        //计算精灵A的像素尺寸
+        float pixelsPerUnit = Screen.height / (mainCamera.orthographicSize * 2f);
+        float spriteWidth = spriteA.bounds.size.x * pixelsPerUnit;
+        float spriteHeight = spriteA.bounds.size.y * pixelsPerUnit;
+
+        //设置UI图像B的尺寸
+        uiImageB.sizeDelta = new Vector2(spriteWidth, spriteHeight);*/
+    }
+}

+ 11 - 0
ActionTowerDefense/Assets/Scripts/Boss/WaterGhost/HairUIPic.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: af322eb3835078e4eaafbf634a7fd53c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
ActionTowerDefense/Assets/material/Braid_UV.mat

@@ -42,8 +42,8 @@ Material:
         m_Offset: {x: 0, y: 0}
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 46dc223b04235704e9946adcd13ad96c, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
+        m_Scale: {x: 5, y: 1}
+        m_Offset: {x: 0.16611505, y: 0}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

+ 9 - 0
ActionTowerDefense/Assets/material/light_add.mat

@@ -59,6 +59,8 @@ Material:
     m_Ints: []
     m_Floats:
     - _BumpScale: 1
+    - _ColorMask: 15
+    - _CullMode: 0
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
@@ -72,9 +74,16 @@ Material:
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
     - _UVSec: 0
+    - _UseUIAlphaClip: 0
     - _ZWrite: 1
     m_Colors:
+    - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
   m_BuildTextureStacks: []

+ 1 - 1
ActionTowerDefense/ProjectSettings/TagManager.asset

@@ -39,7 +39,7 @@ TagManager:
   - AttackTrigger
   - PlatformCollider
   - Foot
-  - 
+  - Hair
   - 
   - 
   - 

Some files were not shown because too many files changed in this diff