排行榜等页面给兑换奖励调用

Assets/AdSDK/AD/CSJ/PangleAdapterScripts.meta

-fileFormatVersion: 2
-guid: 4de77bfbd9c014146a2b371280ff0f63
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AdSDK/AD/CSJ/PangleSDK.meta

-fileFormatVersion: 2
-guid: 9216b5ab3159c44e594fa8e3a6bfcd90
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Game/Main/Scripts/Item/PlantTreeItem.cs

@@ -137,7 +137,7 @@ public class PlantTreeItem : MonoBehaviour
                         if (RealAwardsVM.didChooseAward)
                         {
                             // 已经选择过奖品, 直接弹出排行榜
-                            FindObjectOfType<DialogControl>().ShowRARankList();
+                            FindObjectOfType<DialogControl>().ShowRARankList(true);
                         }
                         else
                         {
@@ -161,7 +161,7 @@ public class PlantTreeItem : MonoBehaviour
                         if (RealAwardsVM.didChooseAward)
                         {
                             // 已经选择过奖品, 直接弹出排行榜
-                            FindObjectOfType<DialogControl>().ShowRARankList();
+                            FindObjectOfType<DialogControl>().ShowRARankList(true);
                         }
                         else
                         {

Assets/Game/Main/Scripts/View/DialogControl.cs

@@ -1060,6 +1060,7 @@ public class DialogControl : MonoBehaviour
     /// </summary>
     public void ShowRealAwards()
     {
+        RealAwardsVM.isFanYiFan = true;
         GameObject gameObject = Instantiate(RealAwards, transform);
         gameObject.name = "RealAwards";
         gameObject.SetActive(true);
@@ -1153,8 +1154,11 @@ public class DialogControl : MonoBehaviour
     /// <summary>
     /// 显示排行榜页面
     /// </summary>
-    public void ShowRARankList()
+    /// <param name="isFanYiFan">是否是翻一翻</param>
+    public void ShowRARankList(bool isFanYiFan)
     {
+        RealAwardsVM.isFanYiFan = isFanYiFan;
+
         GameObject gameObject = transform.Find("RARankList").gameObject;
         gameObject.SetActive(true);
     }

Assets/Game/Main/Scripts/View/HomeInfoControl.cs

@@ -716,7 +716,7 @@ public class HomeInfoControl : MonoBehaviour, HomeContract.View
             if (RealAwardsVM.didChooseAward)
             {
                 // 已经选择过奖品, 直接弹出排行榜
-                FindObjectOfType<DialogControl>().ShowRARankList();
+                FindObjectOfType<DialogControl>().ShowRARankList(true);
             }
             else
             {

Assets/Game/Main/Scripts/dialog/RealAwards/RAInputPhone.cs

@@ -31,12 +31,15 @@ public class RAInputPhone : MonoBehaviour
         AdUtils.PlayRewardAd("shiwu_tijiaophone_ad", new Action<bool>((cb) =>
         {
             if (cb)
+            {
+                if (RealAwardsVM.isFanYiFan)
                 {
                     RealAwardsVM.RequestInternetForChooseAward(RealAwardsVM.awardModel.id);
+                }
 
                 FindObjectOfType<DialogControl>().CloseRAInputPhone();
 
-                FindObjectOfType<DialogControl>().ShowRARankList();
+                FindObjectOfType<DialogControl>().ShowRARankList(RealAwardsVM.isFanYiFan);
             }
 
         }));

Assets/Game/Main/Scripts/dialog/RealAwards/RealAwardsVM.cs

@@ -40,12 +40,42 @@ public class RealAwardsVM : SingletonMono<RealAwardsVM>
     /// </summary>
     public static bool cannotChooseOthers;
 
+    /// <summary>
+    /// 是否是翻一翻
+    /// </summary>
+    public static bool isFanYiFan;
+
+    /// <summary>
+    /// 兑换奖品的no
+    /// </summary>
+    public static string no;
+
     /// <summary>
     /// 获取实物奖励数据, 包括我的奖品、奖品列表、排行榜、我的排行
     /// </summary>
     public static void RequestInternetForData()
     {
-        HttpTool.Instance._Get("app/v1/game/module/inKind/rank", null, new Action<RealAwardsDataModel>((bean) =>
+        string urlString;
+        if (isFanYiFan)
+        {
+            urlString = "app/v1/game/module/inKind/rank";
+        }
+        else
+        {
+            urlString = "app/v1/game/module/exchange/logRank";
+        }
+
+        Dictionary<string, object> parameters = new Dictionary<string, object>();
+        if (isFanYiFan)
+        {
+            parameters = null;
+        }
+        else
+        {
+            parameters[no] = no;
+        }
+
+        HttpTool.Instance._Get(urlString, parameters, new Action<RealAwardsDataModel>((bean) =>
         {
             dataModel = bean;
 
@@ -101,7 +131,27 @@ public class RealAwardsVM : SingletonMono<RealAwardsVM>
     /// </summary>
     public static void RequestInternetForRankYesterday(Action action)
     {
-        HttpTool.Instance._Get("app/v1/game/module/inKind/rankYesterday", null, new Action<List<RealAwardsRankModel>>((bean) =>
+        string urlString;
+        if (isFanYiFan)
+        {
+            urlString = "app/v1/game/module/inKind/rankYesterday";
+        }
+        else
+        {
+            urlString = "app/v1/game/module/exchange/rankYesterday";
+        }
+
+        Dictionary<string, object> parameters = new Dictionary<string, object>();
+        if (isFanYiFan)
+        {
+            parameters = null;
+        }
+        else
+        {
+            parameters[no] = no;
+        }
+
+        HttpTool.Instance._Get(urlString, parameters, new Action<List<RealAwardsRankModel>>((bean) =>
         {
             yesterdayList = bean;
 
@@ -118,7 +168,27 @@ public class RealAwardsVM : SingletonMono<RealAwardsVM>
     /// </summary>
     public static void RequestInternetForUpgrade()
     {
-        HttpTool.Instance._Post("app/v1/game/module/inKind/upgrade", null, new Action<EmptyModel>((bean) =>
+        string urlString;
+        if (isFanYiFan)
+        {
+            urlString = "app/v1/game/module/inKind/upgrade";
+        }
+        else
+        {
+            urlString = "app/v1/game/module/exchange/upgrade";
+        }
+
+        Dictionary<string, object> parameters = new Dictionary<string, object>();
+        if (isFanYiFan)
+        {
+            parameters = null;
+        }
+        else
+        {
+            parameters[no] = no;
+        }
+
+        HttpTool.Instance._Post(urlString, parameters, new Action<EmptyModel>((bean) =>
         {
             RequestInternetForData();
 

Assets/Game/Main/Scripts/dialog/RealAwards/RealAwardsWinDialog.cs

@@ -59,13 +59,18 @@ public class RealAwardsWinDialog : MonoBehaviour
     /// </summary>
     /// <param name="img">图片url</param>
     /// <param name="name">名字</param>
-    public void SetUpSubviews(string img, string name)
+    /// <param name="no">兑换奖励的订单号</param>
+    public void SetUpSubviews(string img, string name, string no)
     {
         isReal = false;
 
         StartCoroutine(LoadAwardImage(img));
 
         NameText.text = name;
+
+        RealAwardsVM.no = no;
+
+        RealAwardsVM.isFanYiFan = false;
     }
 
     /// <summary>