Переглянути джерело

删除变身后所有预制体的刚体

SZAND\msx_2 1 рік тому
батько
коміт
ac246e7734

+ 18 - 20
ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Assassin.prefab

@@ -48,6 +48,7 @@ MonoBehaviour:
   owner: {fileID: 0}
   isCook: 0
   trigObjList: []
+  cook: {fileID: 0}
   needToChange: 0
   maxLen: 0
   minLen: 0
@@ -146,7 +147,6 @@ GameObject:
   - component: {fileID: 2437299196472462364}
   - component: {fileID: 4121013642250487013}
   - component: {fileID: 2437299196472462353}
-  - component: {fileID: 2437299196472462355}
   m_Layer: 7
   m_Name: Trans_Assassin
   m_TagString: Demonic
@@ -185,7 +185,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveSpeed: 25
-  rb: {fileID: 2437299196472462355}
+  rb: {fileID: 0}
   demonic: {fileID: 2437299196472462353}
   isDash: 1
   time: 0
@@ -209,12 +209,11 @@ MonoBehaviour:
   - {fileID: 6526817785665782971}
   - {fileID: 8769150919382874379}
   cookNum: 6
-  cooks: []
   mecanim: {fileID: 5617185463097218335}
   meshRenderer: {fileID: 0}
   ani: {fileID: 6496896669866891404}
   aniCollider: {fileID: 7460010523729932468}
-  rb: {fileID: 2437299196472462355}
+  rb: {fileID: 0}
   bodyTrans: {fileID: 2730232521377132808}
   beSearchTrigger: {fileID: 1317309795988277421}
   uiHp: {fileID: 6433555643392153575}
@@ -282,8 +281,23 @@ MonoBehaviour:
   minRotateSpeed: 0
   floatTime: 20
   floatState: 0
+  spinee: {fileID: 0}
+  mesh: {fileID: 0}
+  mats: []
   outlineMats:
   - {fileID: 2100000, guid: eb0e26c1a9cf9a14799273e742b98d21, type: 2}
+  playerMe: {fileID: 0}
+  playerAni: {fileID: 0}
+  playerCol: {fileID: 0}
+  playerTran: {fileID: 0}
+  playerBst: {fileID: 0}
+  playerBullet: {fileID: 0}
+  playerST: {fileID: 0}
+  playerFoot: {fileID: 0}
+  playerSpinee: {fileID: 0}
+  playerMesh: {fileID: 0}
+  playerMats: []
+  playerOut: []
   id: 0
   costMp: 1
   totalSummonTime: 0.5
@@ -298,22 +312,6 @@ MonoBehaviour:
   sortingOrder: 1000
   playerID: 0
   hasEffect: 0
---- !u!54 &2437299196472462355
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2437299196472462361}
-  serializedVersion: 2
-  m_Mass: 20
-  m_Drag: 0.1
-  m_AngularDrag: 0.05
-  m_UseGravity: 1
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 120
-  m_CollisionDetection: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0

+ 26 - 19
ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Cook.prefab

@@ -748,7 +748,6 @@ GameObject:
   m_Component:
   - component: {fileID: 5440846222648032754}
   - component: {fileID: 5440846222648032767}
-  - component: {fileID: 5440846222648032765}
   m_Layer: 0
   m_Name: Trans_Cook
   m_TagString: Demonic
@@ -789,13 +788,13 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c1bedfb340186164dbac1499b49b879e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  HitCols: []
   cookNum: 10
-  cooks: []
   mecanim: {fileID: 7573527827155227431}
   meshRenderer: {fileID: 0}
   ani: {fileID: 3333436509305836838}
   aniCollider: {fileID: 2776251058442384869}
-  rb: {fileID: 5440846222648032765}
+  rb: {fileID: 0}
   bodyTrans: {fileID: 6459001683917408033}
   beSearchTrigger: {fileID: 4259433079752244006}
   uiHp: {fileID: 3402650366513594425}
@@ -821,6 +820,7 @@ MonoBehaviour:
   invincibleTime: 0
   totalInvincibleTime: 0
   targetCharacter: {fileID: 0}
+  beTargetCharacter: []
   searchTrigger: {fileID: 2932762729738363159}
   targetTypes: 
   canHitFly: 0
@@ -851,37 +851,39 @@ MonoBehaviour:
   minRotateSpeed: 0
   floatTime: 0
   floatState: 0
+  spinee: {fileID: 0}
+  mesh: {fileID: 0}
+  mats: []
   outlineMats:
   - {fileID: 2100000, guid: 30969c92738eb7d4da3885e08f1ec2f0, type: 2}
   - {fileID: 2100000, guid: 98fc94309ab120b4c83b2cebb9226222, type: 2}
   - {fileID: 2100000, guid: 30969c92738eb7d4da3885e08f1ec2f0, type: 2}
+  playerMe: {fileID: 0}
+  playerAni: {fileID: 0}
+  playerCol: {fileID: 0}
+  playerTran: {fileID: 0}
+  playerBst: {fileID: 0}
+  playerBullet: {fileID: 0}
+  playerST: {fileID: 0}
+  playerFoot: {fileID: 0}
+  playerSpinee: {fileID: 0}
+  playerMesh: {fileID: 0}
+  playerMats: []
+  playerOut: []
   id: 0
   costMp: 1
   totalSummonTime: 0.5
   searchState: 0
   attackDistance: 0
+  maxAttackDis: 0
+  minAttackDis: 0
+  needToChange: 0
   canFly: 0
   flyHeight: 0
   flyUpSpeed: 10
   sortingOrder: 0
   playerID: 0
   hasEffect: 0
---- !u!54 &5440846222648032765
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5440846222648032759}
-  serializedVersion: 2
-  m_Mass: 50
-  m_Drag: 0.1
-  m_AngularDrag: 0.05
-  m_UseGravity: 1
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 120
-  m_CollisionDetection: 0
 --- !u!1 &6026815487321357762
 GameObject:
   m_ObjectHideFlags: 0
@@ -1005,7 +1007,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   owner: {fileID: 0}
+  isCook: 0
   trigObjList: []
+  cook: {fileID: 0}
+  needToChange: 0
+  maxLen: 0
+  minLen: 0
 --- !u!65 &826799689842861252
 BoxCollider:
   m_ObjectHideFlags: 0

+ 18 - 20
ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Invisible.prefab

@@ -48,6 +48,7 @@ MonoBehaviour:
   owner: {fileID: 0}
   isCook: 0
   trigObjList: []
+  cook: {fileID: 0}
   needToChange: 0
   maxLen: 0
   minLen: 0
@@ -132,7 +133,6 @@ GameObject:
   - component: {fileID: 2437299196472462364}
   - component: {fileID: 6801157681521274923}
   - component: {fileID: 2437299196472462353}
-  - component: {fileID: 2437299196472462355}
   m_Layer: 12
   m_Name: Trans_Invisible
   m_TagString: Demonic
@@ -182,7 +182,7 @@ MonoBehaviour:
   beSearchTrigger: {fileID: 0}
   UI: {fileID: 0}
   playerController: {fileID: 0}
-  rb: {fileID: 2437299196472462355}
+  rb: {fileID: 0}
   speed: 20
 --- !u!114 &2437299196472462353
 MonoBehaviour:
@@ -200,12 +200,11 @@ MonoBehaviour:
   - {fileID: 6526817785665782971}
   - {fileID: 8769150919382874379}
   cookNum: 0
-  cooks: []
   mecanim: {fileID: 5617185463097218335}
   meshRenderer: {fileID: 0}
   ani: {fileID: 6496896669866891404}
   aniCollider: {fileID: 7460010523729932468}
-  rb: {fileID: 2437299196472462355}
+  rb: {fileID: 0}
   bodyTrans: {fileID: 2730232521377132808}
   beSearchTrigger: {fileID: 1317309795988277421}
   uiHp: {fileID: 6433555643392153575}
@@ -273,7 +272,22 @@ MonoBehaviour:
   minRotateSpeed: 5
   floatTime: 20
   floatState: 0
+  spinee: {fileID: 0}
+  mesh: {fileID: 0}
+  mats: []
   outlineMats: []
+  playerMe: {fileID: 0}
+  playerAni: {fileID: 0}
+  playerCol: {fileID: 0}
+  playerTran: {fileID: 0}
+  playerBst: {fileID: 0}
+  playerBullet: {fileID: 0}
+  playerST: {fileID: 0}
+  playerFoot: {fileID: 0}
+  playerSpinee: {fileID: 0}
+  playerMesh: {fileID: 0}
+  playerMats: []
+  playerOut: []
   id: 0
   costMp: 1
   totalSummonTime: 0.5
@@ -288,22 +302,6 @@ MonoBehaviour:
   sortingOrder: 1000
   playerID: 0
   hasEffect: 0
---- !u!54 &2437299196472462355
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2437299196472462361}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 0
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 120
-  m_CollisionDetection: 0
 --- !u!1 &2437299196663985757
 GameObject:
   m_ObjectHideFlags: 0

+ 7 - 3
ActionTowerDefense/Assets/Scripts/PlayerController.cs

@@ -418,6 +418,10 @@ public class PlayerController : MoveCharacter
 
     public bool CheckSummon()
     {
+        if (isTransfiguration)
+        {
+            return false;
+        }
         if (cacheSummonTime > 0)
         {
             Summon(cacheSummonId);
@@ -519,7 +523,7 @@ public class PlayerController : MoveCharacter
             }
             if (excludeState != CharacterState.Transfiguration)
             {
-                if (isTransfiguration)
+                if (CheckSummon())
                 {
                     return true;
                 }
@@ -1285,7 +1289,7 @@ public class PlayerController : MoveCharacter
             Debug.LogError("δÅäÖÃ" + id + "ºÅ±äÉí");
             return;
         }
-        if (id == 6 && isInvisible)
+        if (id == 3 && isInvisible)
         {
             isInvisible = false;
             return;
@@ -1350,12 +1354,12 @@ public class PlayerController : MoveCharacter
         }
         */
         endChange = id + 3;
-        isTransfiguration = false;
         ChangeState(CharacterState.Idle);
     }
 
     public void EndTransfiguration(int id)
     {
+        isTransfiguration = false;
         mecanim = playerMe;
         ani = playerAni;
         aniCollider = playerCol;