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

client_linchunjie

2019-05-07 a913e707e77f2c4293223ca4614e558181963b8c

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

 System/CrossServerOneVsOne/CrossServerOneVsOneHonorShopCell.cs

@@ -37,6 +37,7 @@
                redpointBeh.redpointId = redpoint.id;

            }

            ItemCellModel cellModel = new ItemCellModel(itemConfig.ID, false, 0, "",PackType.Deleted,true);

            itemCell.button.enabled = false;

            itemCell.Init(cellModel);

            nameText.text = itemConfig.ItemName;

            nameText.color = UIHelper.GetUIColor(itemConfig.ItemColor, true);


 System/Login/CrossServerLogin.cs

@@ -41,11 +41,11 @@
        public string accountBuf { get; private set; }

        public string passwordBuf { get; private set; }



        public void UpdateCrossServerOneVsOneData(HC001_tagGCCrossRealmPKMatchOK matchOK,bool isClient)

        public void UpdateCrossServerOneVsOneData(HC001_tagGCCrossRealmPKMatchOK matchOK, bool isClient)

        {

            oneVsOnePlayerData = new CrossServerOneVsOne()

            {

                isClient=isClient,

                isClient = isClient,

                roomId = matchOK.RoomID,

                waitForLoginCrossServer = true,

                validTimeLimited = Time.time + 30f,

@@ -139,11 +139,11 @@
                gamePortBuf = gamePort;



                StopLoginOverTimeProcess();

                loginOverTimeClock = Clock.AlarmAt(DateTime.Now + new TimeSpan(30 * TimeSpan.TicksPerSecond), () =>

                {

                    busy = false;

                    ReAccountLogin();

                });

                loginOverTimeClock = Clock.AlarmAt(DateTime.Now.AddSeconds(30), () =>

                  {

                      busy = false;

                      ReAccountLogin();

                  });



                GameNetSystem.Instance.BeginConnectCrossServer(ipBuf, gamePortBuf, OnGameServerConnected);

                NetLinkWin.Show();

@@ -174,11 +174,11 @@
            {

                this.reconnectBackGround = true;

                StopLoginOverTimeProcess();

                loginOverTimeClock = Clock.AlarmAt(DateTime.Now + new TimeSpan(30 * TimeSpan.TicksPerSecond), () =>

                 {

                     busy = false;

                     ReAccountLogin();

                 });

                loginOverTimeClock = Clock.AlarmAt(DateTime.Now.AddSeconds(30), () =>

                   {

                       busy = false;

                       ReAccountLogin();

                   });

                GameNetSystem.Instance.BeginConnectCrossServer(ipBuf, gamePortBuf, OnGameServerConnected);

                NetLinkWin.Show();

            }

@@ -195,7 +195,7 @@
            {

                Clock.Stop(loginOverTimeClock);

            }

        


            loginOverTimeClock = null;

        }




 System/Store/BagStoreWin.cs

@@ -136,6 +136,7 @@
                    if (chinModel != null)

                    {

                        ItemCellModel cellModel = new ItemCellModel(chinModel.ID, true, 0);

                        shopItemCell.itemCell.button.enabled = false;

                        shopItemCell.itemCell.Init(cellModel);

                        shopItemCell.itemNameText.text = chinModel.ItemName;

                        shopItemCell.itemNameText.color = UIHelper.GetUIColor(chinModel.ItemColor);


 System/Store/BuyItemController.cs

@@ -100,13 +100,11 @@
    public readonly LogicInt wannaBuyCount = new LogicInt();

    StoreModel model { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
    BuyShopItemLimit goodLimit;

    public void SetGood(int goodId)
    {
        this.goodId = goodId;
        wannaBuyCount.value = 1;
        goodLimit = model.GetBuyShopLimit((uint)goodId);
    }

    public void SetBuyCount(int count)
@@ -206,6 +204,7 @@
            canBuy = config.PurchaseNumber[0];
        }

        var goodLimit = model.GetBuyShopLimit((uint)goodId);
        var haveBuy = goodLimit != null ? goodLimit.BuyCnt : 0;
        return canBuy - haveBuy;
    }

 System/Store/StoreWin.cs

@@ -339,6 +339,7 @@
                    if (config != null)

                    {

                        ItemCellModel cellModel = new ItemCellModel(config.ID, true, 0,"", PackType.Deleted, true);

                        shopItemCell.itemCell.button.enabled = false;

                        shopItemCell.itemCell.Init(cellModel);

                        shopItemCell.itemNameText.text = config.ItemName;

                        shopItemCell.coinsIcon.SetIconWithMoneyType(shopInfo.MoneyType);


 System/Store/UnionStoreWin.cs

@@ -189,6 +189,7 @@
                    if (chinModel != null)

                    {

                        ItemCellModel cellModel = new ItemCellModel(chinModel.ID,false, 0);

                        shopItemCell.itemCell.enabled = false;

                        shopItemCell.itemCell.Init(cellModel);

                        shopItemCell.itemNameText.text = chinModel.ItemName;

                        shopItemCell.itemNameText.color = UIHelper.GetUIColor(chinModel.ItemColor);