From 33130a24f50494083c9a65716f3aec1a50f3f966 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 13 八月 2018 20:58:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/HappyXB/RuneXBWin.cs | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/System/HappyXB/RuneXBWin.cs b/System/HappyXB/RuneXBWin.cs
index 67e7acd..ad8d081 100644
--- a/System/HappyXB/RuneXBWin.cs
+++ b/System/HappyXB/RuneXBWin.cs
@@ -254,13 +254,13 @@
private void RefreshXBResult()
{
CreateGetItem();
- targetIndexs = XBModel.GetXbResultDict().Values.ToList();
+ targetIndexs = XBModel.rangelist;
StartCoroutine(PlayXBAni(0,0));
}
private void CreateGetItem()
{
- List<XBGetItem> xbResultlist = XBModel.GetXbResultDict().Values.ToList();
+ List<XBGetItem> xbResultlist = XBModel.rangelist;
if (xbResultlist.Count < 2) return;
luckDesObj.SetActive(false);
getXBItemParent.gameObject.SetActive(true);
@@ -292,7 +292,13 @@
if (index < xbResultItemBasiclist.Count)
{
xbResultItemBasiclist[index].gameObject.SetActive(true);
- xbResultItemBasiclist[index].transform.DOScale(new Vector3(1, 1, 1), scaleTime);
+ xbResultItemBasiclist[index].transform.DOScale(new Vector3(1, 1, 1), scaleTime).OnComplete(() =>
+ {
+ if (index == xbResultItemBasiclist.Count - 1)
+ {
+ RestXBItemState();
+ }
+ }); ;
if(xbResultItemBasiclist[index].itemConfig != null)
{
XBModel.GetNotifyResult(xbResultItemBasiclist[index].itemConfig.ID, int.Parse(xbResultItemBasiclist[index].countText.text));
@@ -364,7 +370,14 @@
yield return new WaitForSeconds(stopTime);
if (isEndXB)
{
- RestXBItemState();
+ if (targetIndexs.Count > 1)
+ {
+ ShowXBResultCtrl(targetIndexs.Count - 1);
+ }
+ else
+ {
+ RestXBItemState();
+ }
}
else
{
--
Gitblit v1.8.0