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

client_linchunjie

2018-10-10 c48f17dec5987217fb8837d359868d5de88d2116

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

 System/KnapSack/Logic/EquipTip.cs

@@ -134,6 +134,8 @@
            get { return _modelInterface ?? (_modelInterface = ModelCenter.Instance.GetModel<PackModelInterface>()); }

        }



        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }



        ItemAttrData itemAttrData;





@@ -944,6 +946,8 @@
                foreach (ItemWinBtnType key in itemAttrData.tipsFuncBtnDic.Keys)

                {

                    Button btn = OnGUIButton(btnGroup.gameObject, operateBtn, key.ToString(), Language.Get(StringUtility.Contact("ItemHandle_", key.ToString())));

                    if(itemAttrData.guid == playerPack.lookItemGUID && playerPack.lookLineIndex != -1)

                    {

                    switch (key)

                    {

                        case ItemWinBtnType.putOn:

@@ -959,6 +963,7 @@
                            }

                            break;

                    }

                    }



                    btn.RemoveAllListeners();

                    btn.onClick.AddListener(() => {


 System/KnapSack/Logic/PlayerPackModels.cs

@@ -905,6 +905,7 @@
            if (string.IsNullOrEmpty(guid) || guid == "")

            {

                lookLineIndex = -1;

                lookItemGUID = "";

            }

            else

            {


 System/Vip/VipInvest/WheelOfFortuneWin.cs

@@ -3,6 +3,7 @@
//    [  Date ]:           Friday, September 21, 2018
//--------------------------------------------------------

using DG.Tweening;

using System;
using System.Collections;
using System.Collections.Generic;
@@ -20,11 +21,16 @@
        [SerializeField] CheckDisplay m_CheckDisplay;

        [SerializeField] Text Money1_Text;

        [SerializeField] Text Money2_Text;

        //[SerializeField] UIEffectFly m_UIEffectFly;

        [SerializeField] Text m_Text_remainingTimes;

        [SerializeField] Button m_PromotionBtn;

        [Header("最大速度")]

        public  float RollingTime = 1f;



        VipModel m_Vipmodel;

        VipModel vipmodel { get { return m_Vipmodel ?? (m_Vipmodel = ModelCenter.Instance.GetModel<VipModel>()); } }
        WheelOfFortuneModel wheelOfFortuneModel { get { return ModelCenter.Instance.GetModel<WheelOfFortuneModel>(); } }

        private int remainingTimes = 0;//剩余次数
        private int FairyJade = 0;//获取当前绑玉
        #region Built-in
        protected override void BindController()
        {
@@ -34,11 +40,13 @@
        {
            m_LotteryBtn.AddListener(OnClickButton);
            m_Toggle.onValueChanged.AddListener(OnClickToggle);
            m_PromotionBtn.AddListener(OnClickPromotionBtn);
        }

        protected override void OnPreOpen()
        {

            Money1_Text.text = UIHelper.GetMoneyCnt(2).ToString();

            FairyJade = (int)UIHelper.GetMoneyCnt(2);

            Money1_Text.text = FairyJade.ToString();

            Money2_Text.text = UIHelper.GetMoneyCnt(1).ToString();

            m_RotatePointer.Init();

            IsLottery();//判断是否拥有次数
@@ -89,10 +97,15 @@
            }



        }

        private void IsButtonShow(bool _bool)

        private void OnClickPromotionBtn()

        {        
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.VipRechargeFunc4);

        }

        private void IsButtonShow(bool _bool)//是否可点击旋转

        {

            m_LotteryBtn.interactable = _bool;

        }
       
        private void IsLottery()

        {

            int LotteryNumber = vipmodel.GetVipPrivilegeCnt(VipPrivilegeType.BindJadeWheel);

@@ -106,6 +119,18 @@
                m_LotteryBtn.interactable = false;

            }

        }
        private Sequence mScoreSequence;
        private void TiedJadeChange()//绑玉变化

        {

            mScoreSequence = DOTween.Sequence();

            mScoreSequence.SetAutoKill(false);

            mScoreSequence.Append(DOTween.To(delegate(float value) 
            {

                var temp = Math.Floor(value);

                Money1_Text.text = temp + "";

            }, FairyJade,(int)UIHelper.GetMoneyCnt(2), RollingTime));

            FairyJade = (int)UIHelper.GetMoneyCnt(2);

        }
        #endregion


    }

 System/WindowJump/WindowJumpMgr.cs

@@ -524,6 +524,10 @@
            case JumpUIType.CeremonyOutof:

                SetJumpLogic<FairylandCeremonyWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.DogzFunc1Type1:

            case JumpUIType.DogzFunc1Type2:

                SetJumpLogic<DogzWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.FaBaoSoul_BenYuan:

            case JumpUIType.FaBaoSoul_FengMo:

            case JumpUIType.FaBaoSoul_Strength:

@@ -1368,6 +1372,8 @@
    CeremonyFire = 245, //仙界盛典烟花狂欢界面

    CeremonyPeopleToHi = 246, //仙界盛典全民来嗨界面

    CeremonyOutof = 247, //仙界盛典绝版降临界面

    DogzFunc1Type1 = 248, //神兽界面

    DogzFunc1Type2 = 249, //神兽界面

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

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

    GyzTs = 1003,//鬼牙刃功法提升界面