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

client_Wu Xijin

2018-08-13 3b41fe30bf4e2e057702e5a2f4dc67a98a309b7b

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

 Fight/PreFightMission.cs

@@ -1526,6 +1526,11 @@
    private bool mDestroy = false;

    public void Destroy()

    {

        if (IsFinished())

        {

            return;

        }



        mDestroy = true;

        if (m_FuncNpc != null)

        {


 System/Vip/VipInvest/VipInvestWin.cs

@@ -19,6 +19,8 @@
        [SerializeField] Button m_Button_Two;

        [SerializeField] Button m_Button_Three;

        [SerializeField] Button m_Button_Four;



        [SerializeField] Button m_GoToVipBoss;

        VipInvestModel _investModel;

        VipInvestModel investModel { get { return _investModel ?? (_investModel = ModelCenter.Instance.GetModel<VipInvestModel>()); } }

        ItemTipsModel _tipsModel;

@@ -41,6 +43,7 @@
            m_Button_Two.AddListener(OnClickButtonTwo);

            m_Button_Three.AddListener(OnClickButtonThree);

            m_Button_Four.AddListener(OnClickButtonFour);

            m_GoToVipBoss.AddListener(OnClickVipBossWin);

        }



        protected override void OnPreOpen()

@@ -356,6 +359,10 @@
            configlist = investModel.GetInvestConfiglistByCycle(cycle);

            CreateRewardCell();

        }

        private void OnClickVipBossWin()

        {

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.FindPreciousFrameFunc3);

        }



        private void SwithWeek(int cycle_int)

        {