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

TheStrongestSnail/Assets/Resources/ListItem.prefab

@@ -144,7 +144,7 @@ MonoBehaviour:
       m_Calls: []
   m_Sprite: {fileID: 21300000, guid: 08f5a0582a540a14a9c564a8628a35ac, type: 3}
   m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
@@ -245,12 +245,12 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 62.6
+  m_fontSize: 53.55
   m_fontSizeBase: 62.6
   m_fontWeight: 400
-  m_enableAutoSizing: 0
+  m_enableAutoSizing: 1
   m_fontSizeMin: 18
-  m_fontSizeMax: 72
+  m_fontSizeMax: 63
   m_fontStyle: 0
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
@@ -806,6 +806,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   list: 0
+  UserId: 0
   listText: {fileID: 3151892670552190403}
   listImage: {fileID: 3151892671348087528}
   headImage: {fileID: 1781241705427011089}
@@ -814,3 +815,4 @@ MonoBehaviour:
   Bg: {fileID: 3151892671755038175}
   headPath: 
   snailCoinImage: {fileID: 3151892669669158523}
+  woke: {fileID: 21300000, guid: 3106307617a9ef84ca9d7dca61b9842b, type: 3}

TheStrongestSnail/Assets/Scenes/GLTest.unity

@@ -325,14 +325,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 435234966}
     m_Modifications:
-    - target: {fileID: 5986886319956566290, guid: 69b7d9f386dab1a49933fd81cc0e5447, type: 3}
-      propertyPath: MotherFuck118
-      value: 
-      objectReference: {fileID: 1422497206}
-    - target: {fileID: 5986886319956566290, guid: 69b7d9f386dab1a49933fd81cc0e5447, type: 3}
-      propertyPath: MotherFuck119
-      value: 
-      objectReference: {fileID: 1422497207}
     - target: {fileID: 5986886319956566294, guid: 69b7d9f386dab1a49933fd81cc0e5447, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -421,22 +413,6 @@ PrefabInstance:
       propertyPath: m_Name
       value: ListPanel
       objectReference: {fileID: 0}
-    - target: {fileID: 5986886320331047108, guid: 69b7d9f386dab1a49933fd81cc0e5447, type: 3}
-      propertyPath: m_fontAsset
-      value: 
-      objectReference: {fileID: 11400000, guid: 5214a01544a3d6744bbbe3653d4662f3, type: 2}
-    - target: {fileID: 5986886320331047108, guid: 69b7d9f386dab1a49933fd81cc0e5447, type: 3}
-      propertyPath: m_fontStyle
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5986886320331047108, guid: 69b7d9f386dab1a49933fd81cc0e5447, type: 3}
-      propertyPath: m_sharedMaterial
-      value: 
-      objectReference: {fileID: -5950493476346735654, guid: 5214a01544a3d6744bbbe3653d4662f3, type: 2}
-    - target: {fileID: 5986886320331047108, guid: 69b7d9f386dab1a49933fd81cc0e5447, type: 3}
-      propertyPath: m_hasFontAssetChanged
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 69b7d9f386dab1a49933fd81cc0e5447, type: 3}
 --- !u!224 &1422497204 stripped
@@ -444,35 +420,6 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 5986886319956566294, guid: 69b7d9f386dab1a49933fd81cc0e5447, type: 3}
   m_PrefabInstance: {fileID: 1422497203}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &1422497205 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5986886319956566295, guid: 69b7d9f386dab1a49933fd81cc0e5447, type: 3}
-  m_PrefabInstance: {fileID: 1422497203}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &1422497206
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1422497205}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a73003eba920cc14ebddc6ddf89e7683, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!114 &1422497207
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1422497205}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 818231cc3df4680438c9194ad795cc34, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1644448011
 GameObject:
   m_ObjectHideFlags: 0

TheStrongestSnail/Assets/Scenes/Scene_main.unity

@@ -2677,7 +2677,7 @@ MonoBehaviour:
   BTN2: {fileID: 11612200}
   BTN3: {fileID: 888752578}
   BTN4: {fileID: 2016989869}
-  panel1: {fileID: 8224412517989302027, guid: 3f3311031422a454a86dcefc6b0ff28a, type: 3}
+  panel1: {fileID: 5986886319956566295, guid: 69b7d9f386dab1a49933fd81cc0e5447, type: 3}
   panel2: {fileID: 768269564691424298, guid: 1e40dae730127c442a1dcf38f3871e09, type: 3}
   panel3: {fileID: 5974044103532206297, guid: 2ea9f46d5d084364b9ed13356743f255, type: 3}
   panel4: {fileID: 499058875926005686, guid: fd127a1747aec274e9335d11591e4f0a, type: 3}
@@ -2709,6 +2709,7 @@ MonoBehaviour:
   playerName: {fileID: 397626158}
   playerWoKeNumber: {fileID: 315736740}
   playerWoDanNumber: {fileID: 1787489775}
+  listPanel: {fileID: 0}
 --- !u!1 &333482353
 GameObject:
   m_ObjectHideFlags: 0

TheStrongestSnail/Assets/Scripts/Battle_Royale/ListItem.cs

@@ -7,6 +7,7 @@ using UnityEngine.UI;
 public class ListItem : MonoBehaviour
 {
     public int list;
+    public int UserId;//用户id
     public TextMeshProUGUI listText;//ĹĹĂű
     public Image listImage;//ĹĹĂűťŐŐÂ͟Ə
     public Image headImage;//͡Ďń
@@ -17,6 +18,8 @@ public class ListItem : MonoBehaviour
     [Header("ÎĎĹŁżÇťňÎĎĹŁľ°ÍźĆŹ")]
     //[HideInInspector]
     public Image snailCoinImage;//ÎĎĹŁżÇťňÎĎĹŁľ°ÍźĆŹ
+    [Header("蜗牛壳精灵图片资源")]
+    public Sprite woke;
     void Start()
     {
         SetListImage();

TheStrongestSnail/Assets/Scripts/GLScripts/MotherFuck118.cs

@@ -38,7 +38,7 @@ public class MotherFuck118 : MonoBehaviour
         {
             Debug.LogError("directlist 数据为空");
         }
-        Debug.Log(directlist.data.UserResponseVoList.Count);
+        //Debug.Log(directlist.data.UserResponseVoList.Count);
         return directlist;
     }
 }

TheStrongestSnail/Assets/Scripts/ListPanel.cs

@@ -37,6 +37,8 @@ public class ListPanel : BasePanel
 
     public MotherFuck119 MotherFuck119;
     public Directlist wokelist;
+
+    public bool ToShow;
     public override void Start()
     {
         base.Start();
@@ -56,10 +58,14 @@ public class ListPanel : BasePanel
         // 初始化面板状态，根据 Toggle 的初始值
         UpdatePanels();
 
+        if (ToShow)
+        {
             SetInfo118();
             SetInfo119();
             ShowPanel();
         }
+        
+    }
     // 第一个 Toggle 的变化事件
     private void OnToggle1Changed(bool isOn)
     {
@@ -92,6 +98,8 @@ public class ListPanel : BasePanel
     {
         panel1.SetActive(toggle1.isOn);
         panel2.SetActive(toggle2.isOn);
+        SelfListToDay.gameObject.SetActive(toggle1.isOn);
+        SelfListLastDay.gameObject.SetActive(toggle2.isOn);
     }
 
     public void ShowPanels()//显示所有面板
@@ -209,6 +217,7 @@ public class ListPanel : BasePanel
 
             SelfListToDay.SetListImage();
             SelfListToDay.ListBgImage();
+            
         }
         else
         {
@@ -219,6 +228,7 @@ public class ListPanel : BasePanel
 
             SelfListLastDay.SetListImage();
             SelfListLastDay.ListBgImage();
+            
         }
       
     }
@@ -227,29 +237,67 @@ public class ListPanel : BasePanel
     {
         if (flag == 0)
         {
-            SelfListToDay.listText.text = info.UserId.ToString();
+            bool ishave = false;
+            foreach (GameObject listItem in ItemList)
+            {
+                if (listItem.GetComponent<ListItem>().UserId != info.UserId)
+                {
+                    continue;
+
+                }
+                else
+                {
+                    SelfListToDay.listText.text = listItem.GetComponent<ListItem>().list.ToString();
+                    ishave = true;
+                    break;
+                }
+            }
+            if (!ishave)
+            {
+                SelfListToDay.listText.text = "100+";
+            }
             SelfListToDay.nameText.text = info.NickName;
             SelfListToDay.numText.text = info.VoluteCoin.ToString("F1");
             SelfListToDay.headPath = info.HeadImg;
 
             SelfListToDay.SetListImage();
             SelfListToDay.ListBgImage();
+            SelfListToDay.snailCoinImage.gameObject.SetActive(false);
         }
         else
         {
-            SelfListLastDay.listText.text = info.UserId.ToString();
+            bool ishave=false;
+            foreach (GameObject listItem in ItemListLastDay)
+            {
+                if (listItem.GetComponent<ListItem>().UserId != info.UserId)
+                {
+                    continue;                                 
+                }
+                else
+                {
+                    SelfListLastDay.listText.text = listItem.GetComponent<ListItem>().list.ToString();
+                    ishave = true;
+                    break;
+                }
+            }
+            if (!ishave)
+            {
+                SelfListLastDay.listText.text = "100+";
+            }
             SelfListLastDay.nameText.text = info.NickName;
             SelfListLastDay.numText.text = info.VoluteCoin.ToString("F1");
             SelfListLastDay.headPath = info.HeadImg;
 
             SelfListLastDay.SetListImage();
             SelfListLastDay.ListBgImage();
+            SelfListLastDay.snailCoinImage.sprite = SelfListLastDay.woke;
         }
 
     }
 
     public void CreateDirectListItem(List<userResponseVoList> gameData, Transform parent, int flag = 0)
     {
+        int num = 1;
         foreach (userResponseVoList item in gameData)
         {
 
@@ -259,16 +307,17 @@ public class ListPanel : BasePanel
             ListItem panelComponent = newPanel.GetComponent<ListItem>();
 
             // 设置实例化对象的内容
-            panelComponent.list = (int)item.UserId;
+            panelComponent.list = num;
-            panelComponent.listText.text = item.UserId.ToString();
+            panelComponent.listText.text = num.ToString();
             panelComponent.nameText.text = item.NickName;
             panelComponent.numText.text = item.VoluteCoin.ToString("F1");
-
+            panelComponent.UserId = (int)(item.UserId);
             
 
 
             if (flag == 0)
             {
+                panelComponent.snailCoinImage.gameObject.SetActive(false);
                 // 判断是否已存在
                 bool exists = false;
                 foreach (GameObject panel in ItemList)
@@ -284,7 +333,7 @@ public class ListPanel : BasePanel
                 if (!exists)
                 {
                     ItemList.Add(newPanel);
-
+                    num++;
                 }
                 else
                 {
@@ -294,6 +343,7 @@ public class ListPanel : BasePanel
             }
             else
             {
+                panelComponent.snailCoinImage.sprite= panelComponent.woke;
                 // 判断是否已存在
                 bool exists = false;
                 foreach (GameObject panel in ItemListLastDay)
@@ -309,7 +359,7 @@ public class ListPanel : BasePanel
                 if (!exists)
                 {
                     ItemListLastDay.Add(newPanel);
-
+                    num++;
                 }
                 else
                 {

TheStrongestSnail/Assets/Scripts/Scene_main/mainBTN.cs

@@ -49,7 +49,8 @@ public class mainBTN :main_game
     private float startPosY;
     private float clickPosY;
 
-
+    [Header("排行榜")]
+    public ListPanel listPanel;
     // Start is called before the first frame update
     public override void Start()
     {
@@ -196,4 +197,10 @@ public class mainBTN :main_game
         this.playerWoKeNumber.text = playerWoKeNumber;
         this.playerWoDanNumber.text = playerWoDanNumber;
     }
+
+
+    public void ShowListPanel()
+    {
+
+    }
 }

TheStrongestSnail/Assets/Scripts/Scene_main/main_game.cs

@@ -30,6 +30,7 @@ public class main_game :Base
         {
             BTN1.onClick.AddListener(() => {
                 asyncOnShopBTN(BTN1, panel1);
+           
             });
         }
 
@@ -103,4 +104,6 @@ public class main_game :Base
         SceneManager.LoadScene(index);
 
     }
+
+   
 }

TheStrongestSnail/Assets/font_textmeshpro/gl.txt

@@ -1 +1 @@
-！@#￥%……&*（）——+|}{”：？》《，。、；’【】、=-0987654321奇迹蜗牛逃亡霸主来袭手机号验证码记录排行灵液密码登入录获取没有立刻脱失败没关系拿到了榜单爷傲奈我何今日排行骑士投入秒后比赛开始灭霸雷神超人蝙蝠钢铁毒液蜘蛛美队卡槽豌豆黄毒蘑菇计时器激素去数加速器商店立刻即工会信息申请申请我的背包碎片兑换公告福利通知活动详情参与规则靓号商店取消确认补充打工时长剩余个人中心邀请好友一二三四五六七八九十鹅的主身份证保存认证真实完成收货新增加编辑安全退出修改注销订转赠送壳兑换购买赤橙黄绿青蓝紫鬼王怪物粉色嘻嬉笑舍洞窟趣巢穴破烂豆逗商城昨天册帐室屋乐居近10次杀手房间记录近100期被杀记录我的参与记录功共投入蜗蛋共获得蜗蛋奖励阿尔法狗尊贵的最强蜗牛用户敬超级幸运抽奖高级宝箱普通宝箱游戏本轮结果比赛夺冠直推
+！@#￥%……&*（）——+|}{”：？》《，。、；’【】、=-0987654321奇迹蜗牛逃亡霸主来袭手机号验证码记录排行灵液密码登入录获取没有立刻脱失败没关系拿到了榜单爷傲奈我何今日排行骑士投入秒后比赛开始灭霸雷神超人蝙蝠钢铁毒液蜘蛛美队卡槽豌豆黄毒蘑菇计时器激素去数加速器商店立刻即工会信息申请申请我的背包碎片兑换公告福利通知活动详情参与规则靓号商店取消确认补充打工时长剩余个人中心邀请好友一二三四五六七八九十鹅的主身份证保存认证真实完成收货新增加编辑安全退出修改注销订转赠送壳兑换购买赤橙黄绿青蓝紫鬼王怪物粉色嘻嬉笑舍洞窟趣巢穴破烂豆逗商城昨天册帐室屋乐居近10次杀手房间记录近100期被杀记录我的参与记录功共投入蜗蛋共获得蜗蛋奖励阿尔法狗尊贵的最强蜗牛用户敬超级幸运抽奖高级宝箱普通宝箱游戏本轮结果比赛夺冠直推昵称

TheStrongestSnail/Assets/prefabs/GLPrefabs/ListPanel.prefab

@@ -537,6 +537,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   list: 0
+  UserId: 0
   listText: {fileID: 5986886319318530831}
   listImage: {fileID: 5986886319443777340}
   headImage: {fileID: 5986886318624424562}
@@ -544,6 +545,8 @@ MonoBehaviour:
   numText: {fileID: 5986886320130472017}
   Bg: {fileID: 5986886318900239027}
   headPath: 
+  snailCoinImage: {fileID: 5986886319739682168}
+  woke: {fileID: 21300000, guid: 3106307617a9ef84ca9d7dca61b9842b, type: 3}
 --- !u!1 &5986886318952695273
 GameObject:
   m_ObjectHideFlags: 0
@@ -637,12 +640,12 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 62.6
+  m_fontSize: 53.55
   m_fontSizeBase: 62.6
   m_fontWeight: 400
-  m_enableAutoSizing: 0
+  m_enableAutoSizing: 1
   m_fontSizeMin: 18
-  m_fontSizeMax: 72
+  m_fontSizeMax: 63
   m_fontStyle: 0
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
@@ -1843,7 +1846,7 @@ MonoBehaviour:
       m_Calls: []
   m_Sprite: {fileID: 21300000, guid: 08f5a0582a540a14a9c564a8628a35ac, type: 3}
   m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
@@ -2393,7 +2396,7 @@ MonoBehaviour:
       m_Calls: []
   m_Sprite: {fileID: 21300000, guid: 08f5a0582a540a14a9c564a8628a35ac, type: 3}
   m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
@@ -2852,6 +2855,8 @@ GameObject:
   - component: {fileID: 5986886319956566288}
   - component: {fileID: 5986886319956566290}
   - component: {fileID: 5986886319956566301}
+  - component: {fileID: 1422497206}
+  - component: {fileID: 1422497207}
   m_Layer: 5
   m_Name: ListPanel
   m_TagString: Untagged
@@ -2955,6 +2960,9 @@ MonoBehaviour:
   SelfListToDay: {fileID: 5986886318900239037}
   SelfListLastDay: {fileID: 5986886320192227032}
   allHouseContro: {fileID: 0}
+  MotherFuck118: {fileID: 1422497206}
+  MotherFuck119: {fileID: 1422497207}
+  ToShow: 1
 --- !u!114 &5986886319956566301
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2968,6 +2976,30 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_AllowSwitchOff: 0
+--- !u!114 &1422497206
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5986886319956566295}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a73003eba920cc14ebddc6ddf89e7683, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1422497207
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5986886319956566295}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 818231cc3df4680438c9194ad795cc34, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &5986886320049387483
 GameObject:
   m_ObjectHideFlags: 0
@@ -3213,12 +3245,12 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 62.6
+  m_fontSize: 53.55
   m_fontSizeBase: 62.6
   m_fontWeight: 400
-  m_enableAutoSizing: 0
+  m_enableAutoSizing: 1
   m_fontSizeMin: 18
-  m_fontSizeMax: 72
+  m_fontSizeMax: 63
   m_fontStyle: 0
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
@@ -3426,6 +3458,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   list: 0
+  UserId: 0
   listText: {fileID: 5986886319596296387}
   listImage: {fileID: 5986886319413436551}
   headImage: {fileID: 5986886319628539587}
@@ -3433,6 +3466,8 @@ MonoBehaviour:
   numText: {fileID: 5986886318952695275}
   Bg: {fileID: 5986886320192227035}
   headPath: 
+  snailCoinImage: {fileID: 5986886319606374908}
+  woke: {fileID: 21300000, guid: 3106307617a9ef84ca9d7dca61b9842b, type: 3}
 --- !u!1 &5986886320210259884
 GameObject:
   m_ObjectHideFlags: 0