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

client_Wu Xijin

2018-11-23 b41c064ee35b7db697594a19293f7d86446051a6

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

 System/FairyAu/FairyGrabBossModel.cs

@@ -84,6 +84,8 @@


        public int reduceInjuryBuffId { get; private set; }



        public bool flyToGrabBossRemind { get; set; }



        private bool serverInited = false;

        //private DateTime lastQueryProgressTime = DateTime.Now;



@@ -258,6 +260,7 @@
                notified = false;

                fairyGrabBossHelps.Clear();

                ClearGrabBossInfo();

                flyToGrabBossRemind = false;

            }

            else

            {


 System/KnapSack/Logic/ItemTipsModel.cs

@@ -1772,6 +1772,13 @@
            {

                maxReExp = maxLvConfig.ReExp;

            }

            else

            {

                if(maxExpLv <= 0)

                {

                    maxReExp = playerReExp;

                }

            }

            Equation.Instance.Clear();

            Equation.Instance.AddKeyValue("PlayerReExp",playerReExp);

            Equation.Instance.AddKeyValue("MaxReExp", maxReExp);


 System/MainInterfacePanel/FlyShoseConfirmwin.cs

@@ -35,6 +35,7 @@
        PlayerTaskDatas taskmodel { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } }

        PlayerMainDate mainModel { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } }

        GetItemPathModel GetItemPath { get { return ModelCenter.Instance.GetModel<GetItemPathModel>(); } }

        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }



        #region Built-in



@@ -122,13 +123,16 @@


        private void OnClickToggle(bool _bool)

        {

            if (_bool)

            switch (useEnvironment)

            {

                mainModel.IsFlyShoseBool = true;

            }

            else

            {

                mainModel.IsFlyShoseBool = false;

                case UseEnvironment.Task:

                    mainModel.IsFlyShoseBool = _bool;

                    break;

                case UseEnvironment.LocalMap:

                    break;

                case UseEnvironment.FairyGrabBoss:

                    fairyGrabBossModel.flyToGrabBossRemind = _bool;

                    break;

            }

        }




 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -1180,9 +1180,24 @@
                        }

                        else

                        {

                            FlyShoseConfirmwin.useEnvironment = FlyShoseConfirmwin.UseEnvironment.FairyGrabBoss;

                            FlyShoseConfirmwin.confirmCallBack = FlyShoesUseCallback;

                            WindowCenter.Instance.Open<FlyShoseConfirmwin>();

                            if (fairyGrabBossModel.flyToGrabBossRemind)

                            {

                                var money = (int)UIHelper.GetMoneyCnt(1) + (int)UIHelper.GetMoneyCnt(2);

                                if (money >= 1)

                                {

                                    FlyShoesUseCallback();

                                }

                                else

                                {

                                    WindowCenter.Instance.Open<RechargeTipWin>();

                                }

                            }

                            else

                            {

                                FlyShoseConfirmwin.useEnvironment = FlyShoseConfirmwin.UseEnvironment.FairyGrabBoss;

                                FlyShoseConfirmwin.confirmCallBack = FlyShoesUseCallback;

                                WindowCenter.Instance.Open<FlyShoseConfirmwin>();

                            }

                        }

                    }

                }