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

client_Wu Xijin

2019-04-19 c7b93f0ad3bcfa8ee06e870f1a9f41c7c72ebda8

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

 System/FairyAu/FairyGrabBossModel.cs

@@ -6,7 +6,7 @@
namespace Snxxz.UI

{

    [XLua.LuaCallCSharp]

    public class FairyGrabBossModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, IOpenServerActivity

    public class FairyGrabBossModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

    {

        public List<int> bosses { get; private set; }

        Dictionary<int, List<Item>> dropItemDict = new Dictionary<int, List<Item>>();

@@ -124,7 +124,6 @@
            WindowCenter.Instance.windowAfterCloseEvent += WindowAfterCloseEvent;

            NewBieCenter.Instance.guideCompletedEvent += GuideCompletedEvent;

            TreasureNewGotWin.CloseTreasureNewGotWinEvent += CloseTreasureNewGotWinEvent;

            OpenServerActivityCenter.Instance.Register(13, this);

        }



        public void OnBeforePlayerDataInitialize()


 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -256,22 +256,22 @@
                activityCell.timer.text = TimeUtility.SecondsToHMS(seconds);

                activityCell.containerTimer.gameObject.SetActive(seconds > 0);

            }

            cell = m_ActivityCtrl.GetActiveCellView((int)OpenServerActivityCenter.OSActivityType.FairyGrabBossNotice);

            if (cell != null)

            {

                var activityCell = cell as OpenServerActivityCell;

                var seconds = fairyGrabBossModel.GetNextSessionSeconds();

                bool isOpen = fairyGrabBossModel.IsOpen;

                activityCell.containerTimer.gameObject.SetActive(seconds > 0 || isOpen);

                if (seconds > 0)

                {

                    activityCell.timer.text = TimeUtility.SecondsToHMS(seconds);

                }

                else if (isOpen)

                {

                    activityCell.timer.text = Language.Get("FairyGrabBossOpened");

                }

            }

            //cell = m_ActivityCtrl.GetActiveCellView((int)OpenServerActivityCenter.OSActivityType.FairyGrabBossNotice);

            //if (cell != null)

            //{

            //    var activityCell = cell as OpenServerActivityCell;

            //    var seconds = fairyGrabBossModel.GetNextSessionSeconds();

            //    bool isOpen = fairyGrabBossModel.IsOpen;

            //    activityCell.containerTimer.gameObject.SetActive(seconds > 0 || isOpen);

            //    if (seconds > 0)

            //    {

            //        activityCell.timer.text = TimeUtility.SecondsToHMS(seconds);

            //    }

            //    else if (isOpen)

            //    {

            //        activityCell.timer.text = Language.Get("FairyGrabBossOpened");

            //    }

            //}

        }



        void CheckAlreadyOpen()

@@ -567,9 +567,9 @@
                case 12:

                    WindowCenter.Instance.Open<FairyLeagueNoticeWin>(true);

                    break;

                case 13:

                    WindowCenter.Instance.Open<FairyGrabBossNoticeWin>(true);

                    break;

                //case 13:

                //    WindowCenter.Instance.Open<FairyGrabBossNoticeWin>(true);

                //    break;

                case 14:

                    WindowCenter.Instance.Open<FlashRushToBuyWin>(true);

                    break;