Bläddra i källkod

变身后的预制体中刚体需去掉

SZAND\msx_2 1 år sedan
förälder
incheckning
9d74b5a2e2

+ 16 - 24
ActionTowerDefense/Assets/Resources/Prefab/Transfiguration/Trans_Float.prefab

@@ -929,7 +929,6 @@ GameObject:
   - component: {fileID: 8639832132491289354}
   - component: {fileID: 3290368322717680010}
   - component: {fileID: 8639832132491289351}
-  - component: {fileID: 8639832132491289349}
   m_Layer: 7
   m_Name: Trans_Float
   m_TagString: Demonic
@@ -989,7 +988,7 @@ MonoBehaviour:
   meshRenderer: {fileID: 0}
   ani: {fileID: 5978259926173120695}
   aniCollider: {fileID: 6864986857343475389}
-  rb: {fileID: 8639832132491289349}
+  rb: {fileID: 0}
   bodyTrans: {fileID: 5769591908339262981}
   beSearchTrigger: {fileID: 316813748882225178}
   uiHp: {fileID: 3586716274361854270}
@@ -1047,12 +1046,6 @@ 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
@@ -1075,10 +1068,25 @@ MonoBehaviour:
   minRotateSpeed: 4
   floatTime: 5
   floatState: 0
+  spinee: {fileID: 0}
+  mesh: {fileID: 0}
+  mats: []
   outlineMats:
   - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, type: 2}
   - {fileID: 2100000, guid: 0d24ea357a09df448b788aed95b96541, type: 2}
   - {fileID: 2100000, guid: b89f4b5b01e92784ab27611e2b014a10, 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
@@ -1093,19 +1101,3 @@ MonoBehaviour:
   sortingOrder: 2000
   playerID: 0
   hasEffect: 0
---- !u!54 &8639832132491289349
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8639832132491289359}
-  serializedVersion: 2
-  m_Mass: 10
-  m_Drag: 0.1
-  m_AngularDrag: 0.05
-  m_UseGravity: 0
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 124
-  m_CollisionDetection: 0

+ 1 - 19
ActionTowerDefense/Assets/Scripts/Character.cs

@@ -50,7 +50,7 @@ public class Character : MonoBehaviour
 {
     public GameObject[] HitCols;
 
-    public int cookNum;   //能做多少串
+    public int cookNum;   //能做多少串
 
     public SkeletonMecanim mecanim;
     public Skeleton skeleton;
@@ -104,24 +104,6 @@ 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)

+ 39 - 8
ActionTowerDefense/Assets/Scripts/MoveCharacter.cs

@@ -1,3 +1,5 @@
+using Spine.Unity;
+using Spine;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -52,25 +54,54 @@ public class MoveCharacter : Character
 
     public int floatState; //0:不漂浮;1:漂浮中;2:飘着;3:掉下去
 
-    private GameObject spine;
-    private MeshRenderer mesh;
-    private Material[] mats;
+    public GameObject spinee;
+    public MeshRenderer mesh;
+    public Material[] mats;
     public Material[] outlineMats;
 
+    public SkeletonMecanim playerMe;
+    public Animator playerAni;
+    public Animator playerCol;
+    public Transform playerTran;
+    public BeSearchTrigger playerBst;
+    public GameObject playerBullet;
+    public SearchTrigger playerST;
+    public Foot playerFoot;
+    public GameObject playerSpinee;
+    public MeshRenderer playerMesh;
+    public Material[] playerMats;
+    public Material[] playerOut;
+
     private void Awake()
     {
-        spine = transform.GetChild(0).GetChild(0).gameObject;
-        mesh = spine.GetComponent<MeshRenderer>();
+        spinee = bodyTrans.GetChild(0).gameObject;
+        mesh = spinee.GetComponent<MeshRenderer>();
         mats = mesh.materials;
         origY = transform.position.y;
     }
 
+    private void Start()
+    {
+        playerMe = mecanim;
+        playerAni = ani;
+        playerCol = aniCollider;
+        playerTran = bodyTrans;
+        playerBst = beSearchTrigger;
+        playerBullet = bulletPrefab;
+        playerST = searchTrigger;
+        playerFoot = foot;
+        playerSpinee = spinee;
+        playerMesh = mesh;
+        playerMats = mats;
+        playerOut = outlineMats;
+    }
+
     private void ChangeMat(int state)
     {
-        if (spine == null || mesh == null || mats == null)
+        if (spinee == null || mesh == null || mats == null)
         {
-            spine = transform.GetChild(0).GetChild(0).gameObject;
-            mesh = spine.GetComponent<MeshRenderer>();
+            spinee = transform.GetChild(0).GetChild(0).gameObject;
+            mesh = spinee.GetComponent<MeshRenderer>();
             mats = mesh.materials;
         }
         if (state == 0)

+ 14 - 2
ActionTowerDefense/Assets/Scripts/PlayerController.cs

@@ -1327,9 +1327,15 @@ public class PlayerController : MoveCharacter
         mecanim = dem.mecanim;
         ani = dem.ani;
         aniCollider = dem.aniCollider;
-        rb = dem.rb;
         bodyTrans = dem.bodyTrans;
         beSearchTrigger = dem.beSearchTrigger;
+        bulletPrefab = dem.bulletPrefab;
+        searchTrigger = dem.searchTrigger;
+        foot = dem.foot;
+        spinee = dem.spinee;
+        mesh = dem.mesh;
+        mats = dem.mats;
+        outlineMats = dem.outlineMats;
         /*  ·¨Ê¦³ö³¡ÊͷŸ¡¿Õ³¡
         if (id == 3)
         {
@@ -1353,9 +1359,15 @@ public class PlayerController : MoveCharacter
         mecanim = playerMe;
         ani = playerAni;
         aniCollider = playerCol;
-        rb = playerRb;
         bodyTrans = playerTran;
         beSearchTrigger = playerBst;
+        playerBullet = bulletPrefab;
+        playerST = searchTrigger;
+        playerFoot = foot;
+        playerSpinee = spinee;
+        playerMesh = mesh;
+        playerMats = mats;
+        playerOut = outlineMats;
         bodyTrans.gameObject.SetActive(true);
         spiritObj.transform.parent = null;
         spiritObj.SetActive(false);