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

client_Wu Xijin

2019-03-28 820477acd3e539d6798dd183b21fce185ef3622a

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

 Fight/GameActor/GA_NpcClientCollect.cs

@@ -32,6 +32,8 @@

    protected override void OnUnit()
    {
        base.OnUnit();

        if (m_ArrivedList.Contains(ServerInstID))
        {
            if (OnLeave != null)

 Fight/Stage/MapEditor/Game/ClientSceneManager.cs

@@ -21,6 +21,16 @@
        {
            yield return null;
        }
        float _escapeTime = 0;
        while (m_TriggerHandlerDict.Count == 0)
        {
            _escapeTime += Time.deltaTime;
            if (_escapeTime > 1f)
            {
                yield break;
            }
            yield return null;
        }

        Debug.LogFormat("=           结束触发: {0}             =", id);
        foreach (var _trigger in m_MapData.triggers)

 System/Auction/TransactionRecordWin.cs

@@ -103,7 +103,7 @@
                if (i < MaxCount)

                {

                    gridCtrl.AddCell(ScrollerDataType.Header, i);

                }          
                }

            }

            gridCtrl.Restart();

        }
@@ -135,14 +135,7 @@
                    transactionStatusText.gameObject.SetActive(true);

                    SuccessfulBiddingObj.SetActive(false);

                    AuctionFailedObj.SetActive(false);

                    if (AuctionType == 0)

                    {

                        transactionStatusText.text = Language.Get("PMH_11");

                    }

                    else if (AuctionType == 1)

                    {

                        transactionStatusText.text = Language.Get("PMH_12");

                    }

                    transactionStatusText.text = Language.Get("PMH_11");

                    break;

                case 1://拍卖成交（竞拍成功）

                    SuccessfulBiddingObj.SetActive(true);

@@ -172,6 +165,12 @@
                    transactionStatusText.gameObject.SetActive(false);

                    JadeMoney_1.text = auctionRecord.BidderPrice.ToString();

                    break;

                case 5://仙盟流拍到全服

                    transactionStatusText.gameObject.SetActive(true);

                    SuccessfulBiddingObj.SetActive(false);

                    AuctionFailedObj.SetActive(false);

                    transactionStatusText.text = Language.Get("PMH_12");

                    break;

            }



            itemCell.Init(cellModel);