SZAND\msx_2 1 жил өмнө
parent
commit
aca22e7b77

+ 9 - 3
ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Float.prefab

@@ -578,6 +578,7 @@ MonoBehaviour:
   owner: {fileID: 0}
   isCook: 0
   trigObjList: []
+  cook: {fileID: 0}
   needToChange: 0
   maxLen: 0
   minLen: 0
@@ -744,7 +745,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &152626645726552729
 RectTransform:
   m_ObjectHideFlags: 0
@@ -975,7 +976,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8639832132491289359}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: c1bedfb340186164dbac1499b49b879e, type: 3}
   m_Name: 
@@ -984,7 +985,6 @@ MonoBehaviour:
   - {fileID: 5388987656270167698}
   - {fileID: 1190225091429982147}
   cookNum: 3
-  cooks: []
   mecanim: {fileID: 3354085511906294621}
   meshRenderer: {fileID: 0}
   ani: {fileID: 5978259926173120695}
@@ -1047,6 +1047,12 @@ MonoBehaviour:
   rope: {fileID: 0}
   hasHpUp: 0
   beLarger: 0
+  playerMe: {fileID: 0}
+  playerAni: {fileID: 0}
+  playerCol: {fileID: 0}
+  playerRb: {fileID: 0}
+  playerTran: {fileID: 0}
+  playerBst: {fileID: 0}
   canMove: 1
   foot: {fileID: 8639832132450015562}
   extraRiseGravity: -28.8

+ 18 - 0
ActionTowerDefense/Assets/Scripts/Character.cs

@@ -104,6 +104,24 @@ public class Character : MonoBehaviour
     private Vector3 speed = new Vector3(1, 1, 0);
     public bool beLarger = false;
 
+
+    public SkeletonMecanim playerMe;
+    public Animator playerAni;
+    public Animator playerCol;
+    public Rigidbody playerRb;
+    public Transform playerTran;
+    public BeSearchTrigger playerBst;
+
+    private void Start()
+    {
+        playerMe = mecanim;
+        playerAni = ani;
+        playerCol = aniCollider;
+        playerRb = rb;
+        playerTran = bodyTrans;
+        playerBst = beSearchTrigger;
+    }
+
     public virtual void Init()
     {
         if (!mecanim)

+ 15 - 1
ActionTowerDefense/Assets/Scripts/PlayerController.cs

@@ -519,7 +519,7 @@ public class PlayerController : MoveCharacter
             }
             if (excludeState != CharacterState.Transfiguration)
             {
-                if (CheckSummon())
+                if (isTransfiguration)
                 {
                     return true;
                 }
@@ -1324,6 +1324,12 @@ public class PlayerController : MoveCharacter
                 dem.Turn();
             }
         }
+        mecanim = dem.mecanim;
+        ani = dem.ani;
+        aniCollider = dem.aniCollider;
+        rb = dem.rb;
+        bodyTrans = dem.bodyTrans;
+        beSearchTrigger = dem.beSearchTrigger;
         /*  ·¨Ê¦³ö³¡ÊͷŸ¡¿Õ³¡
         if (id == 3)
         {
@@ -1338,10 +1344,18 @@ public class PlayerController : MoveCharacter
         }
         */
         endChange = id + 3;
+        isTransfiguration = false;
+        ChangeState(CharacterState.Idle);
     }
 
     public void EndTransfiguration(int id)
     {
+        mecanim = playerMe;
+        ani = playerAni;
+        aniCollider = playerCol;
+        rb = playerRb;
+        bodyTrans = playerTran;
+        beSearchTrigger = playerBst;
         bodyTrans.gameObject.SetActive(true);
         spiritObj.transform.parent = null;
         spiritObj.SetActive(false);