Commit 8b0530b7 authored by zhangzhe's avatar zhangzhe

修改实物奖励排行榜逻辑,使兑换和翻一翻都能用

parent 40783c30
fileFormatVersion: 2
guid: b9b263a922fc04fb18572f38d7307beb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -57,6 +57,7 @@ public class DialogControl : MonoBehaviour ...@@ -57,6 +57,7 @@ public class DialogControl : MonoBehaviour
EventCenter.AddListener<WithDrawDialogBean>(MyEventType.WITHDRAW_DIALOG, OnWithDrawDialog); EventCenter.AddListener<WithDrawDialogBean>(MyEventType.WITHDRAW_DIALOG, OnWithDrawDialog);
// 提前请求弹窗数据 // 提前请求弹窗数据
RealAwardsVM.isFanYiFan = true;
RealAwardsVM.RequestInternetForData(); RealAwardsVM.RequestInternetForData();
} }
......
...@@ -64,7 +64,7 @@ public class RARankList : MonoBehaviour ...@@ -64,7 +64,7 @@ public class RARankList : MonoBehaviour
CurrentRankText.text = "当前排名:" + RealAwardsVM.dataModel.my.number; CurrentRankText.text = "当前排名:" + RealAwardsVM.dataModel.my.number;
StartCoroutine(LoadRawImage(AwardImage, RealAwardsVM.awardModel.img)); StartCoroutine(LoadRawImage(AwardImage, RealAwardsVM.dataModel.award.img));
for (int i = 0; i < RealAwardsVM.dataModel.list.Count; i++) for (int i = 0; i < RealAwardsVM.dataModel.list.Count; i++)
{ {
......
...@@ -72,32 +72,34 @@ public class RealAwardsVM : SingletonMono<RealAwardsVM> ...@@ -72,32 +72,34 @@ public class RealAwardsVM : SingletonMono<RealAwardsVM>
} }
else else
{ {
parameters[no] = no; parameters["no"] = no;
} }
HttpTool.Instance._Get(urlString, parameters, new Action<RealAwardsDataModel>((bean) => HttpTool.Instance._Get(urlString, parameters, new Action<RealAwardsDataModel>((bean) =>
{ {
dataModel = bean; dataModel = bean;
if (dataModel.award != null) if (isFanYiFan)
{ {
awardModel = dataModel.award; if (dataModel.award != null)
{
awardModel = dataModel.award;
didChooseAward = true; didChooseAward = true;
} }
else else
{
foreach (var item in dataModel.awardList)
{ {
if (item.winALottery == 1) foreach (var item in dataModel.awardList)
{ {
awardModel = item; if (item.winALottery == 1)
{
awardModel = item;
break; break;
}
} }
} }
} }
EventCenter.Broadcast(MyEventType.RefreshRealAwardsData); EventCenter.Broadcast(MyEventType.RefreshRealAwardsData);
...@@ -148,7 +150,7 @@ public class RealAwardsVM : SingletonMono<RealAwardsVM> ...@@ -148,7 +150,7 @@ public class RealAwardsVM : SingletonMono<RealAwardsVM>
} }
else else
{ {
parameters[no] = no; parameters["no"] = no;
} }
HttpTool.Instance._Get(urlString, parameters, new Action<List<RealAwardsRankModel>>((bean) => HttpTool.Instance._Get(urlString, parameters, new Action<List<RealAwardsRankModel>>((bean) =>
...@@ -185,7 +187,7 @@ public class RealAwardsVM : SingletonMono<RealAwardsVM> ...@@ -185,7 +187,7 @@ public class RealAwardsVM : SingletonMono<RealAwardsVM>
} }
else else
{ {
parameters[no] = no; parameters["no"] = no;
} }
HttpTool.Instance._Post(urlString, parameters, new Action<EmptyModel>((bean) => HttpTool.Instance._Post(urlString, parameters, new Action<EmptyModel>((bean) =>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
"dependencies": { "dependencies": {
"com.unity.ugui": "1.0.0" "com.unity.ugui": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.analytics": { "com.unity.analytics": {
"version": "3.3.5", "version": "3.3.5",
...@@ -28,21 +28,21 @@ ...@@ -28,21 +28,21 @@
"dependencies": { "dependencies": {
"com.unity.ugui": "1.0.0" "com.unity.ugui": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.collab-proxy": { "com.unity.collab-proxy": {
"version": "1.2.16", "version": "1.2.16",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.ext.nunit": { "com.unity.ext.nunit": {
"version": "1.0.6", "version": "1.0.6",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.ide.rider": { "com.unity.ide.rider": {
"version": "1.1.4", "version": "1.1.4",
...@@ -51,14 +51,14 @@ ...@@ -51,14 +51,14 @@
"dependencies": { "dependencies": {
"com.unity.test-framework": "1.1.1" "com.unity.test-framework": "1.1.1"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.ide.vscode": { "com.unity.ide.vscode": {
"version": "1.2.3", "version": "1.2.3",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.multiplayer-hlapi": { "com.unity.multiplayer-hlapi": {
"version": "1.0.8", "version": "1.0.8",
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
"dependencies": { "dependencies": {
"nuget.mono-cecil": "0.1.6-preview" "nuget.mono-cecil": "0.1.6-preview"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.purchasing": { "com.unity.purchasing": {
"version": "2.2.1", "version": "2.2.1",
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
"dependencies": { "dependencies": {
"com.unity.ugui": "1.0.0" "com.unity.ugui": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.test-framework": { "com.unity.test-framework": {
"version": "1.1.20", "version": "1.1.20",
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
"com.unity.modules.imgui": "1.0.0", "com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0" "com.unity.modules.jsonserialize": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.textmeshpro": { "com.unity.textmeshpro": {
"version": "2.1.1", "version": "2.1.1",
...@@ -96,14 +96,14 @@ ...@@ -96,14 +96,14 @@
"dependencies": { "dependencies": {
"com.unity.ugui": "1.0.0" "com.unity.ugui": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.timeline": { "com.unity.timeline": {
"version": "1.2.17", "version": "1.2.17",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.ugui": { "com.unity.ugui": {
"version": "1.0.0", "version": "1.0.0",
...@@ -122,14 +122,14 @@ ...@@ -122,14 +122,14 @@
"com.unity.modules.vr": "1.0.0", "com.unity.modules.vr": "1.0.0",
"com.unity.modules.xr": "1.0.0" "com.unity.modules.xr": "1.0.0"
}, },
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"nuget.mono-cecil": { "nuget.mono-cecil": {
"version": "0.1.6-preview", "version": "0.1.6-preview",
"depth": 1, "depth": 1,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
"url": "https://packages.unity.cn" "url": "https://packages.unity.com"
}, },
"com.unity.modules.ai": { "com.unity.modules.ai": {
"version": "1.0.0", "version": "1.0.0",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment