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

client_linchunjie

2019-02-15 6dfb1ffd3f5e08a3ae0370dd8b20029151031096

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

 System/OpenServerActivity/BestLuckyTreasureItemWin.cs

@@ -13,7 +13,7 @@


        LuckyTreasureModel luckyTreasureModel { get { return ModelCenter.Instance.GetModel<LuckyTreasureModel>(); } }

        ItemTipsModel tipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }



        OperationLuckyTreasure.LuckyTreasureItem luckyItem;

        #region Built-in

        protected override void BindController()

        {

@@ -54,7 +54,7 @@
                return;

            }

            var operation = luckyTreasureModel.GetOperation();

            OperationLuckyTreasure.LuckyTreasureItem luckyItem = null;

            luckyItem = null;

            if (operation.TryGetLuckBigAward(out luckyItem))

            {

                var itemConfig = ItemConfig.Get(luckyItem.itemId);

@@ -73,7 +73,14 @@
        private void ClickGoTo()

        {

            CloseImmediately();

            //WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.PetFunc1);

            if(luckyItem != null)

            {

                var itemConfig = ItemConfig.Get(luckyItem.itemId);

                if (itemConfig.Jump != 0)

                {

                    WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)itemConfig.Jump);

                }

            }

        }



    }


 System/OpenServerActivity/LuckyAwardsGroup.cs

@@ -21,7 +21,7 @@
            {

                var awardCell = awardCells[i];

                int index = cell.index * length + i;

                if(index < treasureItems.Count)

                if(index < treasureItems.Count-1)

                {

                    var treasureItem = treasureItems[index];

                    awardCell.itemBaisc.gameObject.SetActive(true);


 System/OpenServerActivity/LuckyTreasureWin.cs

@@ -80,13 +80,13 @@
            UpdateRemainMoney();

            UpdateMessageInfo();

            UpdateAwards();

            UpdateLuckValue();

            UpdateLuckyTreasureState();

            UpdateSecond();

            luckValueSlider.value = luckyTreasureModel.curLuckValue;

            ruleText.text = Language.Get("LuckyTreasure101",luckyTreasureModel.luckyTreasurePoint);

            luckValueSlider.minValue = 0;

            luckValueSlider.maxValue = operation.sumLuckPoint;

            UpdateLuckValue();

            luckValueSlider.value = luckyTreasureModel.curLuckValue;

            OperationLuckyTreasure.LuckyTreasureItem luckyItem = null;

            if(operation.TryGetLuckBigAward(out luckyItem))

            {

@@ -115,17 +115,21 @@
        private void UpdateAwards()

        {

            var luckyItems = operation.luckTreasureItems;

            awardsCtrl.Refresh();

            int line = luckyItems.Count / 2;

            if(luckyItems.Count % 2 > 0)

            if(luckyItems != null && luckyItems.Count > 0)

            {

                line += 1;

                awardsCtrl.Refresh();

                int length = luckyItems.Count - 1;

                int line = length / 2;

                if (length % 2 > 0)

                {

                    line += 1;

                }

                for (int i = 0; i < line; i++)

                {

                    awardsCtrl.AddCell(ScrollerDataType.Header, i);

                }

                awardsCtrl.Restart();

            }

            for(int i = 0; i < line; i++)

            {

                awardsCtrl.AddCell(ScrollerDataType.Header,i);

            }

            awardsCtrl.Restart();

        }



        private void UpdateMessageInfo()


 System/WindowJump/WindowJumpMgr.cs

@@ -606,6 +606,8 @@
            case JumpUIType.BindGoldWheel:

            case JumpUIType.OpenServer_AccumulateRecharge:

            case JumpUIType.FestivalRedBag303:

            case JumpUIType.LoginReward307:

            case JumpUIType.LuckyTreasure306:

                SetJumpLogic<OpenServerActivityWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.OpenServerMountRank:

@@ -919,6 +921,24 @@
                    if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))

                    {

                        OperationTimeHepler.Instance.ProcessConditionError(Operation.FlashSale);

                        return false;

                    }

                }

                break;

            case JumpUIType.LoginReward307:

                {

                    if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))

                    {

                        OperationTimeHepler.Instance.ProcessConditionError(Operation.LoginReward);

                        return false;

                    }

                }

                break;

            case JumpUIType.LuckyTreasure306:

                {

                    if (!OpenServerActivityCenter.Instance.IsActivityOpen(_tagWinSearchModel.TABID))

                    {

                        OperationTimeHepler.Instance.ProcessConditionError(Operation.LuckyTreasure);

                        return false;

                    }

                }

@@ -1670,6 +1690,8 @@
    FestivalRedBag303 = 303, //节日红包界面

    JadeDynastyGem304 = 304, //诛仙宝石

    ToolCompose305 = 305, //诛仙附伤宝石合成

    LuckyTreasure306 = 306, //幸运鉴宝

    LoginReward307 = 307, //登录奖励



    DhszTs = 1001,//定海神针功法提升界面

    HyqTs = 1002,//皓月枪功法提升界面