少年修仙传客户端代码仓库
client_Wu Xijin
2019-05-17 f73738104784a1cba7aed3e7d481fa4d96938e9e
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
2个文件已修改
63 ■■■■■ 已修改文件
System/Alchemy/AlchemyModel.cs 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/TaskFeedbackModel.cs 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Alchemy/AlchemyModel.cs
@@ -69,8 +69,6 @@
        public bool isServerPrepare { get; private set; }
        Clock m_AlchemingClock = null;
        public event Action selectQualityRefresh;
        public event Action selectAlchemyRefresh;
        public event Action alchemyStateRefresh;
@@ -83,6 +81,7 @@
            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
            PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;
            packModel.refreshItemCountEvent += RefreshItemCountEvent;
            GlobalTimeEvent.Instance.secondEvent += PerSecond;
            ParseConfig();
        }
@@ -110,6 +109,7 @@
            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
            PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent;
            packModel.refreshItemCountEvent -= RefreshItemCountEvent;
            GlobalTimeEvent.Instance.secondEvent -= PerSecond;
        }
        private void RefreshItemCountEvent(PackType packType, int arg2, int itemId)
@@ -470,33 +470,10 @@
        public void ReceivePackage(HA3BF_tagMCPlayerStoveMsg package)
        {
            var seconds = 0f;
            for (int i = 0; i < package.StoveCnt; i++)
            {
                var data = package.InfoList[i];
                m_AlchemyTimes[(int)data.AlchemyID] = data.StartTime;
                if (data.StartTime > 0)
                {
                    var config = AlchemyConfig.Get((int)data.AlchemyID);
                    var time = TimeUtility.GetTime(data.StartTime);
                    var _seconds = (TimeUtility.ServerNow - time).TotalSeconds;
                    if (_seconds < config.NeedTime && config.NeedTime - _seconds > seconds)
                    {
                        seconds = config.NeedTime - (float)_seconds + 0.3f;
                    }
                }
            }
            if (m_AlchemingClock != null)
            {
                Clock.Stop(m_AlchemingClock);
                m_AlchemingClock = null;
            }
            if (seconds > 0)
            {
                m_AlchemingClock = Clock.AlarmAfter(seconds, CheckRedpoint);
            }
            var lastLevel = stoveLevel;
@@ -547,6 +524,41 @@
            }
        }
        private void PerSecond()
        {
            if (isServerPrepare)
            {
                if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.BlastFurnace))
                {
                    return;
                }
                var requireCheckRedpoint = false;
                Int2 position;
                if (IsStoveAlcheming(AlchemyType.Normal, out position)
                    && GetStoveState(position.y) == 2
                    && alchemyRedpoints.ContainsKey(position.y)
                    && alchemyRedpoints[position.y].endRedpoint.state != RedPointState.Simple)
                {
                    requireCheckRedpoint = true;
                }
                if (IsStoveAlcheming(AlchemyType.Fairy, out position)
                    && GetStoveState(position.y) == 2
                    && alchemyRedpoints.ContainsKey(position.y)
                    && alchemyRedpoints[position.y].endRedpoint.state != RedPointState.Simple)
                {
                    requireCheckRedpoint = true;
                }
                if (requireCheckRedpoint)
                {
                    CheckRedpoint();
                }
            }
        }
        static List<int> s_Endables = new List<int>();
        static List<int> s_Studyables = new List<int>();
        static List<int> s_Alchemyables = new List<int>();
System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -139,6 +139,7 @@
                switch (feedback.type)
                {
                    case TaskFeedbackType.FightPower:
                    case TaskFeedbackType.Copper:
                    case TaskFeedbackType.ReikiPoint:
                    case TaskFeedbackType.Guide:
                    case TaskFeedbackType.Equip: