Ver Fonte

boss暂存

SZAND\msx_2 há 1 ano atrás
pai
commit
c9582b0aab

+ 103 - 26
ActionTowerDefense/Assets/Resources/Prefab/Boss/YuMenGuan/Boss_YuMenGuan.prefab

@@ -557,7 +557,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1862015034700648751}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.42, y: 3.2, z: 0}
+  m_LocalPosition: {x: -1.29, y: 0.7, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -588,7 +588,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1965879309165884714}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 7.02, y: 3.2, z: 0}
+  m_LocalPosition: {x: 2.76, y: 0.7, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -898,13 +898,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2878654454710598881}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 9.55, y: 13.83, z: -3.63}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalRotation: {x: 0.037584346, y: -0.90285814, z: -0.08067339, w: 0.4206261}
+  m_LocalPosition: {x: 1.61, y: -0.69, z: 4.84}
+  m_LocalScale: {x: 2, y: 2, z: 2}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7907975740392708805}
-  m_RootOrder: 3
+  m_Father: {fileID: 2615558516803081595}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!108 &2878654454710598883
 Light:
@@ -918,8 +918,8 @@ Light:
   m_Type: 2
   m_Shape: 0
   m_Color: {r: 0.9245283, g: 0.56256676, b: 0.56256676, a: 1}
-  m_Intensity: 2
-  m_Range: 13
+  m_Intensity: 1
+  m_Range: 8
   m_SpotAngle: 30
   m_InnerSpotAngle: 21.80208
   m_CookieSize: 10
@@ -998,7 +998,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7907975740392708805}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 131.84601, y: -21.865997, z: -28.312012}
 --- !u!108 &2878654455075685573
 Light:
@@ -20742,7 +20742,8 @@ Transform:
   m_LocalPosition: {x: 0.16124326, y: 9.169865, z: 4.260413}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 2878654454710598882}
   m_Father: {fileID: 7652881806103649629}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -21913,7 +21914,7 @@ Transform:
   - {fileID: 6713198738227080425}
   - {fileID: 2987500950580286168}
   m_Father: {fileID: 7907975740392708805}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 130.04, z: 0}
 --- !u!95 &7907975740994812595
 Animator:
@@ -27044,8 +27045,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 30, y: 5.953223, z: 20}
-  m_Center: {x: 0, y: 2.7524862, z: 0}
+  m_Size: {x: 40, y: 3.1635313, z: 20}
+  m_Center: {x: 0, y: 1.3576403, z: 0}
 --- !u!1 &7551100372909007610
 GameObject:
   m_ObjectHideFlags: 0
@@ -27346,9 +27347,9 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3472427944151914781}
+  - {fileID: 4689423852286470051}
   - {fileID: 7652881806103649629}
   - {fileID: 2878654455075685572}
-  - {fileID: 2878654454710598882}
   - {fileID: 2802398671586784835}
   - {fileID: 1282819543542127411}
   - {fileID: 3917619777862334838}
@@ -27404,7 +27405,7 @@ MonoBehaviour:
   invincibleTime: 0
   totalDieKeepTime: 2
   dieKeepTime: 0
-  canHitFly: 1
+  canHitFly: 0
   isNonAttack: 0
   attackTime: 0
   totalAttack1Time: 0.5
@@ -27530,31 +27531,31 @@ MonoBehaviour:
   - category: 1
     attacks:
     - attack: 5
-      weight: 1
+      weight: 3
     - attack: 4
-      weight: 1
+      weight: 7
   maxMoveDis: 2
   minMoveDis: 0.5
   wave1: {fileID: 8481532737664997307, guid: 5e9b05873d774fa4888dc4c56a1002f0, type: 3}
   wave2: {fileID: 8481532737664997307, guid: 5e9b05873d774fa4888dc4c56a1002f0, type: 3}
   wave1Damage:
-    damage: 150
+    damage: 300
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
   wave2Damage:
-  - damage: 130
+  - damage: 200
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
-  - damage: 150
+  - damage: 300
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
     repelValue: 0
-  - damage: 170
+  - damage: 400
     attackDir: {x: 0, y: 0, z: 0}
     force: 0
     changeHurt: 0
@@ -27566,16 +27567,19 @@ MonoBehaviour:
   launchDelayTime2: 1.3166667
   wave1Size: {x: 1, y: 1, z: 1}
   wave2Size:
-  - {x: 0.8, y: 1, z: 1}
-  - {x: 1, y: 1.5, z: 1}
-  - {x: 1.2, y: 2, z: 1}
-  intervalTime: 0.3
+  - {x: 1, y: 1, z: 1}
+  - {x: 1.5, y: 1.5, z: 1}
+  - {x: 2, y: 2, z: 1}
+  intervalTime: 0.5
   maxShockTimes: 5
   minShockTimes: 1
   wave1aniTime: 1.5
   wave1loopTime: 1
   wave2aniTime: 1.7666667
   waveEndTime: 1
+  laser: {fileID: 341806172183425059}
+  eye: {fileID: 3210012278608099991}
+  weakEye: {fileID: 0}
 --- !u!1 &7912739258329108327
 GameObject:
   m_ObjectHideFlags: 0
@@ -32978,3 +32982,76 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 262311660969425103, guid: 12435a63399f44f4a919a57010981786, type: 3}
   m_PrefabInstance: {fileID: 2853510674666054114}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5136677996629937953
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 7907975740392708805}
+    m_Modifications:
+    - target: {fileID: 458535148820244610, guid: f44a237c846358e43960868bb2c04276, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 458535148820244610, guid: f44a237c846358e43960868bb2c04276, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 13.68
+      objectReference: {fileID: 0}
+    - target: {fileID: 458535148820244610, guid: f44a237c846358e43960868bb2c04276, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 9.26
+      objectReference: {fileID: 0}
+    - target: {fileID: 458535148820244610, guid: f44a237c846358e43960868bb2c04276, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -1.335948
+      objectReference: {fileID: 0}
+    - target: {fileID: 458535148820244610, guid: f44a237c846358e43960868bb2c04276, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 458535148820244610, guid: f44a237c846358e43960868bb2c04276, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 458535148820244610, guid: f44a237c846358e43960868bb2c04276, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 458535148820244610, guid: f44a237c846358e43960868bb2c04276, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 458535148820244610, guid: f44a237c846358e43960868bb2c04276, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 458535148820244610, guid: f44a237c846358e43960868bb2c04276, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 458535148820244610, guid: f44a237c846358e43960868bb2c04276, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 458535148820244611, guid: f44a237c846358e43960868bb2c04276, type: 3}
+      propertyPath: m_Name
+      value: Effc_Laser
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f44a237c846358e43960868bb2c04276, type: 3}
+--- !u!114 &341806172183425059 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4897510161191943938, guid: f44a237c846358e43960868bb2c04276, type: 3}
+  m_PrefabInstance: {fileID: 5136677996629937953}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4ea90472220bf94498f945525b445420, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &4689423852286470051 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 458535148820244610, guid: f44a237c846358e43960868bb2c04276, type: 3}
+  m_PrefabInstance: {fileID: 5136677996629937953}
+  m_PrefabAsset: {fileID: 0}

+ 75 - 32
ActionTowerDefense/Assets/Resources/Prefab/Boss/YuMenGuan/Effc_Laser.prefab

@@ -19474,11 +19474,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 458535148294465354}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 16.72, y: 2.51, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 458535148820244610}
+  m_Father: {fileID: 1808821588800398369}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!120 &458535148294465352
@@ -19522,10 +19522,7 @@ LineRenderer:
   m_SortingLayerID: -1730265859
   m_SortingLayer: 4
   m_SortingOrder: 15
-  m_Positions:
-  - {x: 0, y: 0, z: 0}
-  - {x: 0, y: 0, z: 1}
-  - {x: 21.67102, y: 5.544921, z: -9.623962}
+  m_Positions: []
   m_Parameters:
     serializedVersion: 3
     widthMultiplier: 2
@@ -24427,11 +24424,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 458535148465041684}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 16.72, y: 2.51, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 458535148820244610}
+  m_Father: {fileID: 1808821588800398369}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!120 &458535148465041898
@@ -24475,10 +24472,7 @@ LineRenderer:
   m_SortingLayerID: -1730265859
   m_SortingLayer: 4
   m_SortingOrder: -1
-  m_Positions:
-  - {x: 0, y: 0, z: 0}
-  - {x: 0, y: 0, z: 1}
-  - {x: 21.67102, y: 5.544921, z: -9.623962}
+  m_Positions: []
   m_Parameters:
     serializedVersion: 3
     widthMultiplier: 2
@@ -24572,7 +24566,7 @@ Transform:
   - {fileID: 2330615143133715721}
   - {fileID: 5511333740019560478}
   m_Father: {fileID: 458535148820244610}
-  m_RootOrder: 5
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
 --- !u!198 &458535148706196039
 ParticleSystem:
@@ -34257,11 +34251,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 458535148801797272}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 16.72, y: -1.61, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 458535148820244610}
+  m_Father: {fileID: 1808821588800398369}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!120 &458535148801797278
@@ -34305,12 +34299,7 @@ LineRenderer:
   m_SortingLayerID: -1730265859
   m_SortingLayer: 4
   m_SortingOrder: 10
-  m_Positions:
-  - {x: 0, y: 0, z: 0}
-  - {x: 0, y: 0, z: 1}
-  - {x: 21.67102, y: 5.544921, z: -9.623962}
-  - {x: 20.586199, y: -0.045887172, z: -22.93633}
-  - {x: 10.616615, y: -3.4193387, z: -23.507061}
+  m_Positions: []
   m_Parameters:
     serializedVersion: 3
     widthMultiplier: 4
@@ -34375,6 +34364,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 458535148820244610}
+  - component: {fileID: 4897510161191943938}
   m_Layer: 0
   m_Name: Effc_Laser
   m_TagString: Untagged
@@ -34394,15 +34384,36 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 458535148801797279}
-  - {fileID: 458535149421552398}
-  - {fileID: 458535148294465353}
-  - {fileID: 458535148465041899}
+  - {fileID: 1808821588800398369}
   - {fileID: 458535149499012061}
   - {fileID: 458535148706196033}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4897510161191943938
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 458535148820244611}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4ea90472220bf94498f945525b445420, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  head: {fileID: 458535149499012062}
+  end: {fileID: 458535148706196034}
+  headPos: {fileID: 0}
+  endPos: {fileID: 0}
+  lines: {fileID: 3976506043168544685}
+  lineMats:
+  - {fileID: 2100000, guid: 36c58060d3457564289dfc602e3b32a4, type: 2}
+  - {fileID: 2100000, guid: 681954b76c20d8044b6d9358177a268f, type: 2}
+  - {fileID: 2100000, guid: 2ae06d30c6a24d54888915cb07e5c9f7, type: 2}
+  minSpeed: 0
+  maxSpeed: 0
+  origSizes: []
 --- !u!1 &458535149247723208
 GameObject:
   m_ObjectHideFlags: 0
@@ -48891,11 +48902,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 458535149421552399}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 16.72, y: 7.89, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 458535148820244610}
+  m_Father: {fileID: 1808821588800398369}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!120 &458535149421552397
@@ -48939,10 +48950,7 @@ LineRenderer:
   m_SortingLayerID: -1730265859
   m_SortingLayer: 4
   m_SortingOrder: 1
-  m_Positions:
-  - {x: 0, y: 0, z: 0}
-  - {x: 0, y: 0, z: 1}
-  - {x: 21.67102, y: 5.544921, z: -9.623962}
+  m_Positions: []
   m_Parameters:
     serializedVersion: 3
     widthMultiplier: 3
@@ -53856,7 +53864,7 @@ Transform:
   - {fileID: 458535148246602362}
   - {fileID: 5915296741636774431}
   m_Father: {fileID: 458535148820244610}
-  m_RootOrder: 4
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
 --- !u!198 &458535149499012051
 ParticleSystem:
@@ -63458,6 +63466,41 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
+--- !u!1 &3976506043168544685
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1808821588800398369}
+  m_Layer: 0
+  m_Name: lines
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1808821588800398369
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3976506043168544685}
+  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_Children:
+  - {fileID: 458535148801797279}
+  - {fileID: 458535149421552398}
+  - {fileID: 458535148294465353}
+  - {fileID: 458535148465041899}
+  m_Father: {fileID: 458535148820244610}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4393888037673289716
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
ActionTowerDefense/Assets/Scripts/Boss/Boss.cs

@@ -121,7 +121,7 @@ public class Boss : MoveCharacter
     {
     }
 
-    public void Start()
+    public virtual void Start()
     {
         len = circulate.Length;
         ChangeBossState();

+ 67 - 0
ActionTowerDefense/Assets/Scripts/Boss/YuMenGuan/EyeLaser.cs

@@ -0,0 +1,67 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class EyeLaser : MonoBehaviour
+{
+    [Header("¶Ëµã")]
+    public GameObject head;
+    public GameObject end;
+    public Transform headPos;
+    public Transform endPos;
+
+    [Header("ÌØÐ§")]
+    public GameObject lines;
+    private LineRenderer[] lineRenderers = new LineRenderer[4];
+    public List<Material> lineMats = new List<Material>();
+    public float minSpeed, maxSpeed;
+    private float[] curSpeed = new float[4];
+
+    [Header("´óС")]
+    public float[] origSizes = new float[4];
+    private List<int> shaderIDs = new List<int>();
+
+    private void Start()
+    {
+        for(int i = 0; i < 4; i++)
+        {
+            lineRenderers[i] = lines.transform.GetChild(i).GetComponent<LineRenderer>();
+            origSizes[i] = lineRenderers[i].startWidth;
+            curSpeed[i] = Random.Range(minSpeed, maxSpeed);
+        }
+        foreach(Material m in lineMats)
+        {
+            shaderIDs.Add(Shader.PropertyToID(m.name));
+        }
+    }
+
+    public void DrawLine()
+    {
+        head.transform.position = headPos.position;
+        end.transform.position = endPos.position;
+        head.SetActive(true);
+        end.SetActive(true);
+        Vector3[] poses = new Vector3[2];
+        poses[0] = headPos.position;
+        poses[1] = endPos.position;
+        foreach (LineRenderer lr in lineRenderers)
+        {
+            lr.SetPositions(poses);
+        }
+    }
+
+    private void LineShine()
+    {
+        for(int i = 0; i < lineMats.Count; i++)
+        {
+            Vector2 offest = lineMats[i].mainTextureOffset;
+            offest.x -= curSpeed[i] * Time.deltaTime;
+            lineMats[i].SetTextureOffset("_MainTex", offest);
+        }
+    }
+
+    private void Update()
+    {
+        LineShine();
+    }
+}

+ 11 - 0
ActionTowerDefense/Assets/Scripts/Boss/YuMenGuan/EyeLaser.cs.meta

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

+ 30 - 5
ActionTowerDefense/Assets/Scripts/Boss/YuMenGuan/YuMenGuan.cs

@@ -77,10 +77,16 @@ public class YuMenGuan : Boss
     private bool isWave2;               //冲击波2进行中
     private bool isEndWave;
 
-    private void Start()
+    [Header("眼睛激光")]
+    public EyeLaser laser;
+    public Transform eye;
+    public GameObject weakEye;
+
+    public override void Start()
     {
         base.Start();
         hasNum = new int[3];
+        laser.headPos = eye;
     }
 
     //判断冲击波池中是否有多余的冲击波,没有则实例化新的
@@ -233,8 +239,8 @@ public class YuMenGuan : Boss
                 wave1Pool.Remove(wv2);
                 usedWave1.Add(wv1);
                 usedWave1.Add(wv2);
-                wv1.GetComponent<WaveShockDir>().IsLeft = false;
-                wv2.GetComponent<WaveShockDir>().IsLeft = true;
+                wv1.GetComponent<WaveShockDir>().IsLeft = true;
+                wv2.GetComponent<WaveShockDir>().IsLeft = false;
                 wv1.GetComponent<WaveShockDir>().CheckTurn();
                 wv2.GetComponent<WaveShockDir>().CheckTurn();
                 wv1.BeShoot(this, wave1pos.position, dir1, wave1Damage.damage, wave1Damage.force, wave1Damage.changeHurt, wave1Damage.repelValue, false);
@@ -250,8 +256,8 @@ public class YuMenGuan : Boss
                 wave2Pool.Remove(wv2);
                 usedWave2.Add(wv1);
                 usedWave2.Add(wv2);
-                wv1.GetComponent<WaveShockDir>().IsLeft = false;
-                wv2.GetComponent<WaveShockDir>().IsLeft = true;
+                wv1.GetComponent<WaveShockDir>().IsLeft = true;
+                wv2.GetComponent<WaveShockDir>().IsLeft = false;
                 wv1.GetComponent<WaveShockDir>().CheckTurn();
                 wv2.GetComponent<WaveShockDir>().CheckTurn();
                 wv1.BeShoot(this, wave1pos.position, dir1, wave2Damage[index].damage, wave2Damage[index].force, wave2Damage[index].changeHurt, wave2Damage[index].repelValue, false);
@@ -341,6 +347,12 @@ public class YuMenGuan : Boss
         }
     }
 
+    public void ShootEyeLaser(Transform lineEndPos)
+    {
+        laser.endPos = lineEndPos;
+        laser.DrawLine();
+    }
+
     //攻击
     public override void Attack()
     {
@@ -356,6 +368,11 @@ public class YuMenGuan : Boss
             case AttackMethods.shockWave2:
                 ShockWave(1);
                 break;
+            case AttackMethods.laser:
+
+                break;
+            case AttackMethods.block:
+                break;
             default:
                 break;
         }
@@ -386,6 +403,14 @@ public class YuMenGuan : Boss
                 }
                 break;
             case AttackCategories.B:
+                if (weakEye.activeSelf)
+                {
+                    curAttackType = RandomAttack(attackConfigurations[1].attacks);
+                }
+                else
+                {
+                    curAttackType = AttackMethods.block;
+                }
                 break;
             default:
                 break;

+ 1 - 1
ActionTowerDefense/Assets/material/line.mat

@@ -43,7 +43,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 53e9fd48a689b264d9a7741adfe8e9b2, type: 3}
         m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
+        m_Offset: {x: -121.03878, y: 0}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

+ 1 - 1
ActionTowerDefense/Assets/material/line_air.mat

@@ -43,7 +43,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: c8aeee0a826afe14a8bc88cc6309b437, type: 3}
         m_Scale: {x: 1, y: 1}
-        m_Offset: {x: -6.34, y: 0}
+        m_Offset: {x: -107.21562, y: 0}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

+ 1 - 1
ActionTowerDefense/Assets/material/line_back.mat

@@ -43,7 +43,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: f3e88fd2fe21e374582525302db1f9ec, type: 3}
         m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
+        m_Offset: {x: -66.15464, y: 0}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}