Merge remote-tracking branch 'origin/master' into leonard

client_Wu Xijin

2018-10-29 d82561629d51d3863002a3f1bbb32ef6b1b429bb

 System/HappyXB/BestXBWin.cs

@@ -516,12 +516,14 @@
          

            if(isEndXB)

            {

                if(targetIndexs.Count > 1)

                if (targetIndexs.Count > 1)

                {

                    ShowXBResultCtrl(targetIndexs.Count - 1);

                }

                else

                {

                    XBGetItem xbItem = targetIndexs[targetIndexs.Count - 1];

                    XBModel.GetNotifyResult(xbItem.itemId, xbItem.count);

                    ResetXBItemState();

                    WindowCenter.Instance.Open<HappyXBGetItemWin>();

                }