SZAND\msx_2 преди 1 година
родител
ревизия
a3e91424e9

+ 3 - 3
ActionTowerDefense/Assets/Scenes/SampleScene.unity

@@ -27585,7 +27585,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 104, y: 16}
-  m_SizeDelta: {x: 127, y: 110}
+  m_SizeDelta: {x: 128, y: 128}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3490440114689228960
 MonoBehaviour:
@@ -27765,7 +27765,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e40889a5e19f152448a2de0798f6b6a6, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 7c5e1ab1829cae74080d0472e6cfbd7d, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -27993,7 +27993,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e11b0e3a444e48c4a904bf2b6a8e2ae6, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 443c5ff65ec217344a2d85f838fdefdd, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 22 - 6
ActionTowerDefense/Assets/Scripts/PlayerController.cs

@@ -110,6 +110,8 @@ public class PlayerController : MoveCharacter
 
     public Vector2 moveVec;         //Íæ¼Ò²»¶¯Ê±Òƶ¯Êý¾Ý
 
+    public bool isBaseBtnOut = false;
+
 
     public bool btnJumpPress
     {
@@ -516,11 +518,18 @@ public class PlayerController : MoveCharacter
         }
         if (btnWestPress)
         {
-            if (isTransfiguration && !canTranSummon)
+            if (!isBaseBtnOut)
             {
-                return true;
+                if (isTransfiguration && !canTranSummon)
+                {
+                    return true;
+                }
+                Summon(0);
+            }
+            else
+            {
+
             }
-            Summon(0);
             return true;
         }
         if (btnSouthPress)
@@ -534,11 +543,18 @@ public class PlayerController : MoveCharacter
         }
         if (btnEastPress)
         {
-            if (isTransfiguration && !canTranSummon)
+            if (!isBaseBtnOut)
             {
-                return true;
+                if (isTransfiguration && !canTranSummon)
+                {
+                    return true;
+                }
+                Summon(2);
+            }
+            else
+            {
+
             }
-            Summon(2);
             return true;
         }
         if (btnTransfiguratePress)

+ 21 - 2
ActionTowerDefense/Assets/Scripts/Spirits/Base_Spirits.cs

@@ -4,6 +4,25 @@ using UnityEngine;
 
 public class Base_Spirits : MonoBehaviour
 {
-    public Transform XbtnPos;
-    public Transform BbtnPos;
+    public GameObject buttons;
+
+    private void OnTriggerEnter(Collider other)
+    {
+        if (other.gameObject.layer == 6)
+        {
+            PlayerController pc = other.GetComponent<PlayerController>();
+            pc.isBaseBtnOut = true;
+            buttons.SetActive(true);
+        }
+    }
+
+    private void OnTriggerExit(Collider other)
+    {
+        if (other.gameObject.layer == 6)
+        {
+            PlayerController pc = other.GetComponent<PlayerController>();
+            pc.isBaseBtnOut = false;
+            buttons.SetActive(false);
+        }
+    }
 }

Файловите разлики са ограничени, защото са твърде много
+ 205 - 205
ActionTowerDefense/Assets/TextMesh Pro/Resources/Fonts & Materials/Game Over SDF.asset


Файловите разлики са ограничени, защото са твърде много
+ 212 - 12
ActionTowerDefense/Assets/TextMesh Pro/Resources/Fonts & Materials/思源黑体SC-Heavy SDF.asset


Някои файлове не бяха показани, защото твърде много файлове са промени