少年修仙传客户端代码仓库
client_Zxw
2018-11-19 491dbabece13cca7f7ca582e4c02ef0c974196b3
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
5个文件已修改
48 ■■■■ 已修改文件
System/OpenServerActivity/OpenServerActivityNotifyModel.cs 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/WishingPoolModel.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Skill/SkillPassWin.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/TreasureBaseWin.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/TreasureLevelUpWin.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/OpenServerActivityNotifyModel.cs
@@ -8,7 +8,6 @@
    [XLua.LuaCallCSharp]
    public class OpenServerActivityNotifyModel : Model,IBeforePlayerDataInitialize,IPlayerLoginOk
    {
        public override void Init()
        {
          
@@ -17,27 +16,29 @@
        public void OnBeforePlayerDataInitialize()
        {
            FlashRushToBuyActivityClose();
            GlobalTimeEvent.Instance.minuteEvent -= UpdateMinute;
            TimeMgr.Instance.OnMinuteEvent -= UpdateMinute;
            OperationTimeHepler.Instance.operationStartEvent -= OperationStartEvent;
            OperationTimeHepler.Instance.operationEndEvent -= OperationEndEvent;
            OperationTimeHepler.Instance.operationTimeUpdateEvent -= OperationTimeEvent;
            OperationTimeHepler.Instance.operationServerCloseEvent -= OperationServerCloseEvent;
            NewBieCenter.Instance.guideCompletedEvent -= GuideCompletedEvent;
            WindowCenter.Instance.windowBeforeOpenEvent -= UpdateWindowOpen;
        }
        public void OnPlayerLoginOk()
        {
            if (!WindowCenter.Instance.IsOpen<OpenServerActivityNotifyWin>())
            {
                WindowCenter.Instance.Open<OpenServerActivityNotifyWin>();
            }
            OperationTimeHepler.Instance.operationStartEvent += OperationStartEvent;
            OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent;
            OperationTimeHepler.Instance.operationTimeUpdateEvent += OperationTimeEvent;
            OperationTimeHepler.Instance.operationServerCloseEvent += OperationServerCloseEvent;
            NewBieCenter.Instance.guideCompletedEvent += GuideCompletedEvent;
            GlobalTimeEvent.Instance.minuteEvent += UpdateMinute;
            TimeMgr.Instance.OnMinuteEvent += UpdateMinute;
            WindowCenter.Instance.windowBeforeOpenEvent += UpdateWindowOpen;
            SetFlashRushToBuyNotify();
            if(!WindowCenter.Instance.IsOpen<OpenServerActivityNotifyWin>())
            {
                WindowCenter.Instance.Open<OpenServerActivityNotifyWin>();
            }
        }
        public override void UnInit()
@@ -45,6 +46,16 @@
          
        }
        private void UpdateWindowOpen(Window win)
        {
            if (win.name != "MainInterfaceWin") return;
            if (!WindowCenter.Instance.IsOpen<OpenServerActivityNotifyWin>())
            {
                WindowCenter.Instance.Open<OpenServerActivityNotifyWin>();
            }
        }
        private void UpdateMinute()
        {
            SetFlashRushToBuyNotify();
System/OpenServerActivity/WishingPoolModel.cs
@@ -394,7 +394,6 @@
            {
                freeWishRedpoint.state = RedPointState.Simple;
            }
            UpdateRedpoint();
        }
        private void UpdateRedpoint()
System/Skill/SkillPassWin.cs
@@ -639,7 +639,13 @@
            if (model.taskHoleDict.ContainsKey(presentSltEquipIndex))
            {
                var taskId = model.taskHoleDict[presentSltEquipIndex];
                TaskAllocation.Instance.SkillTask(taskId);
                if (!NewBieCenter.Instance.inGuiding && task.allMissionDict.ContainsKey(taskId))
                {
                    var list = task.allMissionDict[taskId].InforList;
                    var message = TaskAllocation.Instance.GetTaskInfo(Config.Instance.Get<TASKINFOConfig>(list).show_writing, taskId);
                    HrefAnalysis.Inst.ExcuteHrefEvent(message);
                    DropItemManager.StopMissionPickup = false;
                }
            }
        }
System/Treasure/TreasureBaseWin.cs
@@ -258,6 +258,11 @@
            UI3DTreasureSelectStage.Instance.StartBack();
        }
        public void DisplayContainer(bool active)
        {
            m_DisplayContainer.gameObject.SetActive(active);
        }
        private bool AllowSelectTreasure(int treasureId)
        {
            Treasure treasure;
System/Treasure/TreasureLevelUpWin.cs
@@ -830,11 +830,20 @@
        private void PlaySkillShow()
        {
            var baseWin = WindowCenter.Instance.Get<TreasureBaseWin>();
            if (baseWin != null)
            {
                baseWin.DisplayContainer(false);
            }
            m_DisplayContainer.gameObject.SetActive(false);
            UI3DTreasureSelectStage.Instance.CloseRenderCamera();
            UI3DHeroSkillShow.Instance.ShowTreasureSkill(m_Treasure.id, () =>
            {
                m_DisplayContainer.gameObject.SetActive(true);
                if (baseWin != null)
                {
                    baseWin.DisplayContainer(true);
                }
                UI3DTreasureSelectStage.Instance.OpenRenderCamera();
                StartScreenShot();
            });