Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2018-08-13 33130a24f50494083c9a65716f3aec1a50f3f966

 System/HappyXB/BestXBWin.cs

@@ -245,13 +245,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);

@@ -284,8 +284,19 @@
            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));

                }

                XBModel.GetNotifyResult(xbResultItemBasiclist[index].itemConfig.ID, int.Parse(xbResultItemBasiclist[index].countText.text));

                
            }

        }



@@ -353,7 +364,14 @@
            yield return new WaitForSeconds(stopTime);

            if(isEndXB)

            {

                RestXBItemState();

                if(targetIndexs.Count > 1)

                {

                    ShowXBResultCtrl(targetIndexs.Count - 1);

                }

                else

                {

                    RestXBItemState();

                }

            }

            else

            {