Merge branch 'test' of http://shu.sheziwanglo.cn:3000/wulongxiao/_TheStrongestSnail into test

TheStrongestSnail/Assets/Scenes/RacingPanel.unity

@@ -5987,6 +5987,7 @@ MonoBehaviour:
   is_Reflash: 0
   is_NOneedReflash: 0
   snailMoveNum: 0
+  racingPanel: {fileID: 394840207}
 --- !u!1 &402443204
 GameObject:
   m_ObjectHideFlags: 0
@@ -15317,10 +15318,10 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 60
+  m_fontSize: 61.45
   m_fontSizeBase: 60
   m_fontWeight: 400
-  m_enableAutoSizing: 0
+  m_enableAutoSizing: 1
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 1
@@ -24484,7 +24485,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   rectTransform: {fileID: 1705891619}
-  orginPos: {x: 0, y: 0}
+  isMove: 0
 --- !u!1 &1725087456
 GameObject:
   m_ObjectHideFlags: 0

TheStrongestSnail/Assets/Scripts/Login/UI/logoPanel.cs

@@ -95,7 +95,7 @@ public class logoPanel : Base
         //}
         loginbody body = new loginbody
         {
-            userName = "123698745",
+            userName = "541236987",
             //password = "123456",
             verifyCode = 111111
         };

TheStrongestSnail/Assets/Scripts/RacingPanel/AllManeger.cs

@@ -49,6 +49,7 @@ public class AllManeger : MonoBehaviour
     public bool is_NOneedReflash;//是否需要刷新
 
     public int snailMoveNum;//蜗牛出动数量
+    public RacingPanel racingPanel;
     // Start is called before the first frame update
     async void Start()
     {
@@ -179,27 +180,28 @@ public class AllManeger : MonoBehaviour
        
     }
 
+   
     public async void Fuck524()
     {
         knightKill524 = await queryKnightKill524.queryKnightKill(id);
-        //if (knightKill524.data.horseNoKill!="")
+        if (knightKill524.data.horseNoKill != "")
-        //{
+        {
-        //    string[] parts = knightKill524.data.horseNoKill.Split(","); // 根据 ',' 分割字符串d
+            string[] parts = knightKill524.data.horseNoKill.Split(","); // 根据 ',' 分割字符串d
-        //    KillNos = parts.Select(int.Parse).ToList();
+            KillNos = parts.Select(int.Parse).ToList();
 
-        //    foreach (int killno in KillNos)
+            foreach (int killno in KillNos)
-        //    {
+            {
-        //        Debug.Log("击杀蜗牛"+killno);
+                Debug.Log("击杀蜗牛" + killno);
-        //        foreach (HorseInfo horse in horseInfos)
+                foreach (HorseInfo horse in horseInfos)
-        //        {
+                {
-        //            if (horse.HorseNo == killno)
+                    if (horse.HorseNo == killno)
-        //            {
+                    {
-        //                Debug.Log("wwwww" + horse.HorseNo);
+                        Debug.Log("wwwww" + horse.HorseNo);
-        //                horse.snail.is_die = true;
+                        horse.snail.is_die = true;
-        //            }
+                    }
-        //        }
+                }
-        //    }
+            }
-        //}
+        }
 
         if (knightKill524.data.horseNoRemain!= "")
         {
@@ -285,34 +287,30 @@ public class AllManeger : MonoBehaviour
                 {
                     horse.snail.is_die = true;
                     horse.snail.killsnail();                          // 如果不存在于 allNos 中，设置 is_die 为 true
+                    horse.gameObject.SetActive(false);//禁用按钮
                 }
                 else
                 {
                     horse.snail.is_die = false;
                     horse.snail.killsnail();// 如果存在于 allNos 中，设置 is_die 为 false
+                    horse.gameObject.SetActive(true);//启用按钮
                 }
             }
 
 
         }
-        //if (GameKnightModel.HorseNoKill!="")
+        //if (GameKnightModel.HorseNoKill != "")//禁用按钮
         //{
         //    string[] parts = GameKnightModel.HorseNoKill.Split(","); // 根据 ',' 分割字符串d
         //    KillNos = parts.Select(int.Parse).ToList();
 
         //    foreach (int killno in KillNos)
         //    {
-        //        foreach (HorseInfo horse in horseInfos)
+        //        SetBtnHide(killno);
-        //        {
-        //            if (horse.HorseNo == killno)
-        //            {
-        //                horse.snail.is_die = true;
-        //            }
-        //        }
         //    }
         //}
 
-        //if (GameKnightModel.HorseNoRemain!="")
+        //if (GameKnightModel.HorseNoRemain != "")//解放按钮
         //{
         //    string[] parts_2 = GameKnightModel.HorseNoRemain.Split(",");
         //    WinNos = parts_2.Select(int.Parse).ToList();
@@ -320,16 +318,10 @@ public class AllManeger : MonoBehaviour
 
         //    foreach (int winno in WinNos)
         //    {
-        //        foreach (HorseInfo horse in horseInfos)
+        //        SetBtnShow(winno);
-        //        {
-        //            if (horse.HorseNo == winno)
-        //            {
-        //                horse.snail.is_victory = true;
-        //            }
-        //        }
         //    }
         //}
-        
+
     }
     public void AllMove()//所有蜗牛开跑
     {

TheStrongestSnail/Assets/Scripts/RacingPanel/snailRider.cs

@@ -58,18 +58,20 @@ public class snailRider : MonoBehaviour
         if (!is_die)
         {
             animator.SetInteger("State",1);//切换为移动动画
-            int suiji = 0;
+            float suiji = 0;//时间时间
             if (is_victory)
             {
-                suiji =  UnityEngine.Random.Range(-2, -1);
+                suiji =  UnityEngine.Random.Range(4, 6);
+                
             }
             else
             {
-                suiji = UnityEngine.Random.Range(4, 6);
+                suiji = UnityEngine.Random.Range(5, 10);
+                 
             }
 
-            mySequence.Append(transform.DOMoveX(startingPoint.transform.position.x, 0.01f))
+           
-                .Append(transform.DOMoveX(end.transform.position.x, 5f + suiji)).SetEase(Ease.Linear).OnComplete(()=> {
+                transform.DOMoveX(end.transform.position.x,  suiji).SetEase(Ease.Linear).OnComplete(()=> {
                     animator.SetInteger("State", 0);
                     Debug.Log("动画完成，切换为待机动画");
                 }) //切换为待机动画