Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks

meng_yao/Assets/Prefabs/charatar/laohu.prefab

@@ -1,5 +1,36 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2622601509586677983
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7894364588234692947}
+  m_Layer: 0
+  m_Name: StartPos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7894364588234692947
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2622601509586677983}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.236, y: 0.202, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8433650275485930555}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4599771890564645326
 GameObject:
   m_ObjectHideFlags: 0
@@ -235,7 +266,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 21300000, guid: 492e5984b518a80458cf575c0b57335c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 7e06234bd5a219a49be5fa82426e5d74, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -332,8 +363,8 @@ MonoBehaviour:
   attackCooldown: 10
   bulltes: []
   animator: {fileID: 8242226501344609213}
-  fireAni: {fileID: 0}
-  BulletStartPos: {fileID: 0}
+  fireAnis: []
+  BulletStartPos: {fileID: 7894364588234692947}
   AttackSpeed: 1
   direction: {x: 0, y: 0}
   roleBulletSpeedAdd: 0
@@ -392,6 +423,7 @@ Transform:
   - {fileID: 3572175332158307839}
   - {fileID: 8433650274046349754}
   - {fileID: 322815736230801319}
+  - {fileID: 7894364588234692947}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

meng_yao/Assets/Scenes/New/Scene_map_1.unity

@@ -1549,6 +1549,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 459650025}
+  - component: {fileID: 459650026}
   m_Layer: 0
   m_Name: ------------------------------ (3)
   m_TagString: Untagged
@@ -1571,6 +1572,20 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &459650026
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 459650024}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ea8231e49b8e6c440b4ede383765832d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PromptPrefab: {fileID: 0}
+  canvs: {fileID: 1683495817}
 --- !u!1 &530562778
 GameObject:
   m_ObjectHideFlags: 0
@@ -3580,6 +3595,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 36d8b1f23f0ec174594a18d38154925d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  retbutton: {fileID: 0}
+  ClosureObj: {fileID: 0}
   mengyaoNumber: 3
   inPlaceNumber: 0
   btnObj: {fileID: 1942153352}

meng_yao/Assets/common

@@ -1 +1 @@
-Subproject commit 8da1a9bd84b59b84fa7154c08df416dfd4091b9a
+Subproject commit cd7f839004ff7f4e4e003a19dccfa2ae1df4a928

meng_yao/Assets/script/A_Fight/FireDestroy.cs

@@ -12,6 +12,7 @@ public class FireDestroy : MonoBehaviour
 
    public void ToDestroy()
     {
+        Debug.Log("Ïú»Ù»ðÑæ");
         Destroy(Fire);
     }
 }

meng_yao/Assets/script/A_Fight/Monster_Tips.cs

@@ -21,11 +21,12 @@ public class Monster_Tips : Base
 
     void ShowTipClick()
     {
-        number++;
+         number++;
          Tipprefab.gameObject.SetActive(true);
          if (number == 2)
          {
-             gameGlobal.GamePlay();
+            Debug.Log("点两次");
+            gameGlobal.GamePlay();
          }
     }
 
@@ -52,6 +53,7 @@ public class Monster_Tips : Base
         time += Time.deltaTime;
         if (time > 3f)
         {
+            Debug.Log("倒计时结束");
             time = 0;
             gameGlobal.GamePlay();
         }

meng_yao/Assets/script/A_Fight/cardBox.cs

@@ -14,10 +14,10 @@ public class MengyaoCardData
     public GameObject cardPrefab;
 }
 
-public class cardBox : MonoBehaviour
+public class cardBox : Base
 {
     public static cardBox instance;
-    [Header("萌妖数量")] public int mengyaoNumber = 0;
+    [HideInInspector] public int mengyaoNumber = 0;//萌妖数量
     [HideInInspector] public int inPlaceNumber = 0;
     [Header("¿ªÊ¼°´Å¥obj")] public GameObject btnObj;
 
@@ -41,7 +41,7 @@ public class cardBox : MonoBehaviour
     private void Awake()
     {
         instance = this;
-
+       
 
     }
 
@@ -57,6 +57,7 @@ public class cardBox : MonoBehaviour
 
         InitializeDictionary();
         Init();
+        mengyaoNumber = Base.GlobalObj.GetComponent<gameGlobal>().CarryCardId.Count;
     }
 
     public void ChangeInPlaceNumber(int number)

meng_yao/Assets/script/A_Fight/gameGlobal.cs

@@ -35,7 +35,7 @@ public class gameGlobal : Base
     /// </summary>
     public static void GamePlay()
     {
-
+        Debug.Log("ÓÎÏ·¿ªÊ¼");
         Base.GlobalObj.GetComponent<gameGlobal>().OnGamePlay?.Invoke();
     }
 

meng_yao/Assets/script/A_Fight/infobox_skill_up.cs

@@ -39,7 +39,8 @@ public class infobox_skill_up : MonoBehaviour
         }
         else
         {
-            Debug.Log("战魂不足");
+            Promptmgr.Instance.PromptBubble("战魂不足");
+            //Debug.Log("战魂不足");
         }
     }