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

TheStrongestSnail/Assets/Scenes/Scene_main.unity

@@ -9059,7 +9059,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   retbutton: {fileID: 0}
   ClosureObj: {fileID: 0}
-  Panel: {fileID: 5449552263403658889, guid: 21918674044dc0640af7d47f2617dca5, type: 3}
+  Panel: {fileID: 5363579444209329409, guid: 21918674044dc0640af7d47f2617dca5, type: 3}
   CloseBTN: {fileID: 0}
   btn: {fileID: 1588445222}
   canvas: {fileID: 278122028}

TheStrongestSnail/Assets/Scripts/Scene_main/Scene_main_jiekou.cs

@@ -7,33 +7,55 @@ public class Scene_main_jiekou :Base
 {
     public static Scene_main_jiekou instance;
     public mainBTN _mainBTN;
-    private  RealPlayerInfo _realPlayerInfo;
-    private queryPlayerInfo _queryPlayerInfo;
+
+    //用户信息
+    private RealPlayerInfo _realPlayerInfo;//用户信息结构体
+    private queryPlayerInfo _queryPlayerInfo;//用户信息
+
+
+    //商城信息
+    public MallResponsePro _mallResponsePro;//商城列表结构体
+    private getMallList21 _getMallList21;//商城列表获取方法
+
 
     // Start is called before the first frame update
 
     private void Awake()
     {
         instance = this;
+
+        testLogo();
         //getInfo();
+        // getShopInfo();
     }
 
 
-    async void getInfo()
+    async void getPlayerInfo()
     {
-        await StartAsync();
-        Debug.Log(_realPlayerInfo.data.nickName);
+        await PlayerInfoAsync();
+        /*Debug.Log(_realPlayerInfo.data.nickName);
         Debug.Log(_realPlayerInfo.data.voluteCoin);
-        Debug.Log(_realPlayerInfo.data.beansCoin);
-        _mainBTN.UpDatePlayer(_realPlayerInfo.data.nickName, _realPlayerInfo.data.voluteCoin.ToString("f1")+"M", _realPlayerInfo.data.beansCoin.ToString("f1")+"M");
+        Debug.Log(_realPlayerInfo.data.beansCoin);*/
+        _mainBTN.UpDatePlayer(_realPlayerInfo.data.nickName, _realPlayerInfo.data.voluteCoin.ToString("f1") + "M", _realPlayerInfo.data.beansCoin.ToString("f1") + "M");
     }
-    async Task StartAsync()
+
+    async Task PlayerInfoAsync()
     {
         _realPlayerInfo = new RealPlayerInfo();
         _queryPlayerInfo = new queryPlayerInfo();
-
         _realPlayerInfo = await _queryPlayerInfo.QueryPlayerInfoPro();
     }
 
 
+
+    public async Task ShopInfo()
+    {
+        _mallResponsePro = new MallResponsePro();
+        _getMallList21 = new getMallList21();
+
+        _mallResponsePro = await _getMallList21.getMallList(1, 1, 20);
+
+    }
+
+
 }

TheStrongestSnail/Assets/Scripts/Scene_shop/itemInfo.cs

@@ -32,19 +32,24 @@ public class itemInfo : MonoBehaviour
         });
     }
 
-
     public void init(int id)
     {
         this.id = id;
     }
 
-   void initShow(Sprite icon,string name,float price)
+    public void initShow(int id, Sprite icon, string name, float price)
     {
+        this.id = id;
         iconImage.sprite = icon;
         nameText.text = name;
         priceText.text = price.ToString();
     }
 
-
+    public void initShow(int id, string name, float price)
+    {
+        this.id = id;
+        nameText.text = name;
+        priceText.text = price.ToString();
+    }
 
 }

TheStrongestSnail/Assets/Scripts/Scene_shop/wokePanel.cs

@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class wokePanel : ui_huodong
+{
+   
+}

TheStrongestSnail/Assets/Scripts/Scene_shop/wokePanel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e117d84ff9930204294b2e850dabe40f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

TheStrongestSnail/Assets/prefabs/shopPanel.prefab

@@ -45,6 +45,10 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 5363579444209329408}
     m_Modifications:
+    - target: {fileID: 5126270613698848532, guid: 4e48ee49e456fad4887407d7ee921b35, type: 3}
+      propertyPath: prefab
+      value: 
+      objectReference: {fileID: 499058875926005686, guid: 850728972d7b6c64e88a9a269542755e, type: 3}
     - target: {fileID: 5126270615579512174, guid: 4e48ee49e456fad4887407d7ee921b35, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5

TheStrongestSnail/Assets/prefabs/woniukaPanel.prefab

@@ -733,6 +733,7 @@ GameObject:
   m_Component:
   - component: {fileID: 499058875926005685}
   - component: {fileID: 499058875926005683}
+  - component: {fileID: 2304854834134518743}
   m_Layer: 5
   m_Name: woniukaPanel
   m_TagString: Untagged
@@ -770,6 +771,21 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 499058875926005686}
   m_CullTransparentMesh: 1
+--- !u!114 &2304854834134518743
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 499058875926005686}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e117d84ff9930204294b2e850dabe40f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _panel: {fileID: 499058876202855932}
+  btns: []
+  panels: []
 --- !u!1 &499058875926305708
 GameObject:
   m_ObjectHideFlags: 0