Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang

xiaofang/Assets/Scenes/Tmap 1.unity

@@ -6828,8 +6828,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: eccdd1a2db5ba4848bcb2eea6ed8ddb8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  Peidianpoint: {fileID: 498545215}
   cha: {fileID: 0}
   xfs: {fileID: 0}
+  Dian: {fileID: 5829951506323790359, guid: ee1ef26bc5ed0d14c967b009bd53f4aa, type: 3}
 --- !u!114 &382802822
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -8157,6 +8159,52 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 427500, guid: 6e17dbb9cc1686d45a12d7c945a8cb1a, type: 3}
   m_PrefabInstance: {fileID: 480915455}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &481467055
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 481467057}
+  - component: {fileID: 481467056}
+  m_Layer: 0
+  m_Name: BurstCollisionWorld
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &481467056
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 481467055}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  cellSpans:
+    m_AlignBytes: 16
+--- !u!4 &481467057
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 481467055}
+  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: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 38
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &488892242
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -8269,12 +8317,69 @@ PrefabInstance:
       propertyPath: m_ConstrainProportionsScale
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: -4889777935105907924, guid: 454dc3d5cb346c148b640203a8bc1174, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.1031
+      objectReference: {fileID: 0}
+    - target: {fileID: -4889777935105907924, guid: 454dc3d5cb346c148b640203a8bc1174, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.0566
+      objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 454dc3d5cb346c148b640203a8bc1174, type: 3}
       propertyPath: m_Name
       value: peidian
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 454dc3d5cb346c148b640203a8bc1174, type: 3}
+--- !u!1 &498545212 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 454dc3d5cb346c148b640203a8bc1174, type: 3}
+  m_PrefabInstance: {fileID: 498545211}
+  m_PrefabAsset: {fileID: 0}
+--- !u!65 &498545213
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498545212}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.15308039, y: 0.18075465, z: 0.22980995}
+  m_Center: {x: 0.0012868581, y: 0.096283115, z: -0.039017044}
+--- !u!114 &498545214
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498545212}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 40e47dfa9e7f7404f931bb3b454b9b22, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &498545215 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 9135837714299811909, guid: 454dc3d5cb346c148b640203a8bc1174, type: 3}
+  m_PrefabInstance: {fileID: 498545211}
+  m_PrefabAsset: {fileID: 0}
+--- !u!136 &498545216
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 498545212}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  m_Radius: 0.4
+  m_Height: 1
+  m_Direction: 1
+  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &509858615
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -10872,7 +10977,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!136 &810501277
 CapsuleCollider:
   m_ObjectHideFlags: 0

xiaofang/Assets/Script/Character/CharacterInturn.cs

@@ -15,10 +15,10 @@ public class CharacterInturn : MonoBehaviour
     private CharacterAin Characterain;
 
     private int XfsStep = 0;
-
+    public GameObject Peidianpoint;
     public GameObject cha;
     public GameObject xfs;
-
+    public GameObject Dian;
     private GameObject timer;
     // Start is called before the first frame update
     void Start()
@@ -63,8 +63,13 @@ public class CharacterInturn : MonoBehaviour
 
     void disClick()//ÅäµçÏä²Ù×÷
     {
-
-
+        GameObject ob = Instantiate(Dian);
+        ob.transform.SetParent(Peidianpoint.transform);
+        ob.transform.localPosition = new Vector3(0, 0, 0);
+        StartCoroutine(AnimTimeSuccefful(6f));
+        Characterain.SetSkillAin(CharacterSkill.OperateSuccess);
+        Destroy(disbtn.gameObject);
+        Destroy(ob,6f);
     }
 
     void CgunClick()//Á¬½Óˮǹ²Ù×÷

xiaofang/Assets/yhj/prefabs/Ef_ElectroDamage_01.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ee1ef26bc5ed0d14c967b009bd53f4aa
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: