SZAND\msx_2 1 jaar geleden
bovenliggende
commit
df0b336396

+ 1 - 1
ActionTowerDefense/Assets/Resources/Prefab/FX/CooksBird.prefab

@@ -140,7 +140,7 @@ Rigidbody:
   m_GameObject: {fileID: 6827689530009399248}
   serializedVersion: 2
   m_Mass: 1
-  m_Drag: 0
+  m_Drag: 0.1
   m_AngularDrag: 0.05
   m_UseGravity: 1
   m_IsKinematic: 0

+ 66 - 4
ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Cook.prefab

@@ -699,6 +699,7 @@ Transform:
   - {fileID: 7284493059720803864}
   - {fileID: 8584174517298651636}
   - {fileID: 697789059294945267}
+  - {fileID: 730397711949894839}
   m_Father: {fileID: 6459001683917408033}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -970,7 +971,7 @@ MonoBehaviour:
   sortingOrder: 0
   playerID: 0
   hasEffect: 0
-  soulCollector: {fileID: 0}
+  soulCollector: {fileID: 8183667617015717059}
   isBack: 0
 --- !u!114 &1527607760671059063
 MonoBehaviour:
@@ -985,11 +986,11 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   controller: {fileID: 0}
-  changeTime: 5
+  changeTime: 20
   UIoffset: {x: 0, y: 2, z: 0}
   bottle: {fileID: 6827689530009399248, guid: 263e3d90178b89146933e46f2fce55df, type: 3}
   intervalTime: 0.5
-  throwForce: {x: -2, y: 1, z: 0}
+  throwForce: {x: -20, y: 0, z: 0}
   throwPos: {fileID: 4737949113454210572}
 --- !u!1 &6026815487321357762
 GameObject:
@@ -1115,8 +1116,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
   isCook: 0
+  isEnemy: 0
   trigObjList: []
-  cook: {fileID: 0}
+  eCook: {fileID: 0}
+  dCook: {fileID: 0}
   needToChange: 0
   maxLen: 0
   minLen: 0
@@ -1434,6 +1437,65 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 3.8787084, y: 1, z: 20}
   m_Center: {x: -1.2794268, y: 0, z: 0}
+--- !u!1 &7668134880740974023
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 730397711949894839}
+  - component: {fileID: 182665286776120973}
+  - component: {fileID: 8183667617015717059}
+  m_Layer: 0
+  m_Name: SoulCollector
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &730397711949894839
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7668134880740974023}
+  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: 901824162977467732}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &182665286776120973
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7668134880740974023}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 02e8744abca6d3d459e26c639743ddb7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  player: {fileID: 0}
+--- !u!65 &8183667617015717059
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7668134880740974023}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 3, y: 3, z: 20}
+  m_Center: {x: 0, y: 1, z: 0}
 --- !u!1 &8394595816922499954
 GameObject:
   m_ObjectHideFlags: 0

+ 7 - 3
ActionTowerDefense/Assets/Scripts/Spirits/Trans_Cook.cs

@@ -9,6 +9,7 @@ public class Trans_Cook : MonoBehaviour
     public Vector3 UIoffset;                //UI调整值
 
     private Demonic dem;
+    private Rigidbody demRB;
 
     [Header("J技能:撒辣椒粉")]
     public GameObject bottle;
@@ -18,6 +19,7 @@ public class Trans_Cook : MonoBehaviour
     private Rigidbody rb;
     public Vector3 throwForce;              //抛出辣椒粉调料瓶的力
     public GameObject throwPos;
+    private GameObject curBottle;
 
     private void Start()
     {
@@ -26,6 +28,7 @@ public class Trans_Cook : MonoBehaviour
         controller.uiHp.transform.position += UIoffset;
         controller.uiMp.transform.position += UIoffset;
         dem = GetComponent<Demonic>();
+        demRB = dem.GetComponentInParent<Rigidbody>();
     }
 
     private void OnDisable()
@@ -36,9 +39,10 @@ public class Trans_Cook : MonoBehaviour
 
     private void SprinklePaprika()  //J技能:撒辣椒粉
     {
-        Instantiate(bottle, throwPos.transform.position, new Quaternion(0, 0, 0, 0), null);
-        rb = bottle.GetComponent<Rigidbody>();
-        rb.AddForce(throwForce);
+        curBottle = Instantiate(bottle, throwPos.transform.position, new Quaternion(0, 0, 0, 0), null);
+        rb = curBottle.GetComponent<Rigidbody>();
+        rb.velocity = throwForce;
+        rb.AddForce(Vector3.up);
     }
 
     private void Update()