少年修仙传客户端代码仓库
client_linchunjie
2019-05-17 665f6cf1544450bea0653315fb7ab84c4ead7b11
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
4个文件已修改
77 ■■■■■ 已修改文件
Lua/Gen/EnumWrap.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/NewBieGuidance/FunctionalGuideCenter.cs 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/NewBieGuidance/NewBieCenter.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Utility/EnumHelper.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/EnumWrap.cs
@@ -6602,13 +6602,13 @@
            
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "QuestCanAccept", GuideTriggerType.QuestCanAccept);
            
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "QuestCanDo", GuideTriggerType.QuestCanDo);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "QuestCanDo", GuideTriggerType.MainLineQuestCanDo);
            
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "QuestCanAward", GuideTriggerType.QuestCanAward);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "QuestCanAward", GuideTriggerType.MainLineQuestCanAward);
            
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "QuestLimit", GuideTriggerType.QuestLimit);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "QuestLimit", GuideTriggerType.MainLineQuestLimit);
            
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "QuestContinue", GuideTriggerType.QuestContinue);
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "QuestContinue", GuideTriggerType.MainLineQuestContinue);
            
            Utils.RegisterObject(L, translator, Utils.CLS_IDX, "BranchQuestCando", GuideTriggerType.BranchQuestCando);
            
@@ -6717,19 +6717,19 @@
                }
                else if (LuaAPI.xlua_is_eq_str(L, 1, "QuestCanDo"))
                {
                    translator.PushGuideTriggerType(L, GuideTriggerType.QuestCanDo);
                    translator.PushGuideTriggerType(L, GuideTriggerType.MainLineQuestCanDo);
                }
                else if (LuaAPI.xlua_is_eq_str(L, 1, "QuestCanAward"))
                {
                    translator.PushGuideTriggerType(L, GuideTriggerType.QuestCanAward);
                    translator.PushGuideTriggerType(L, GuideTriggerType.MainLineQuestCanAward);
                }
                else if (LuaAPI.xlua_is_eq_str(L, 1, "QuestLimit"))
                {
                    translator.PushGuideTriggerType(L, GuideTriggerType.QuestLimit);
                    translator.PushGuideTriggerType(L, GuideTriggerType.MainLineQuestLimit);
                }
                else if (LuaAPI.xlua_is_eq_str(L, 1, "QuestContinue"))
                {
                    translator.PushGuideTriggerType(L, GuideTriggerType.QuestContinue);
                    translator.PushGuideTriggerType(L, GuideTriggerType.MainLineQuestContinue);
                }
                else if (LuaAPI.xlua_is_eq_str(L, 1, "BranchQuestCando"))
                {
System/NewBieGuidance/FunctionalGuideCenter.cs
@@ -29,7 +29,7 @@
        {
            TaskModel.tryGetTaskAwardEvent += OnTryGetMainLineTaskReward;
            TaskModel.Event_MainlineTask += OnMainLineTaskUpdate;
            TaskModel.CardLevelChange += OnMainLineLimitStateChange;
            TaskModel.CardLevelChange += OnQuestLimitStateChange;
            TaskModel.SideQuestChangeEvent += OnBranchQuestStateChange;
            treasureModel.treasureStateChangeEvent += OnTreasureStateChange;
            taskmodel.taskDescriptionRefresh += OnMainLineDescriptionChange;
@@ -139,7 +139,7 @@
                            RemoveGuide(guideId);
                        }
                        break;
                    case GuideTriggerType.QuestCanDo:
                    case GuideTriggerType.MainLineQuestCanDo:
                        if (_state > 1)
                        {
                            RemoveGuide(guideId);
@@ -149,7 +149,7 @@
            }
        }
        private void OnMainLineLimitStateChange(int _taskId)
        private void OnQuestLimitStateChange(int _taskId)
        {
            for (int i = underwayGuides.Count - 1; i >= 0; i--)
            {
@@ -165,7 +165,8 @@
                switch ((GuideTriggerType)config.TriggerType)
                {
                    case GuideTriggerType.QuestLimit:
                    case GuideTriggerType.MainLineQuestLimit:
                    case GuideTriggerType.BranchQuestLimit:
                        if (limitState != TaskModel.TaskStatus.CardLevel || limitState != TaskModel.TaskStatus.TreasureCardLevel)
                        {
                            RemoveGuide(guideId);
@@ -189,7 +190,7 @@
                switch ((GuideTriggerType)config.TriggerType)
                {
                    case GuideTriggerType.QuestCanDo:
                    case GuideTriggerType.MainLineQuestCanDo:
                        MissionDetailDates datas;
                        if (taskmodel.TryGetTaskData(config.Condition, out datas))
                        {
@@ -243,11 +244,13 @@
                var config = GuideConfig.Get(guideId);
                switch ((GuideTriggerType)config.TriggerType)
                {
                    case GuideTriggerType.QuestCanAward:
                    case GuideTriggerType.QuestCanDo:
                    case GuideTriggerType.MainLineQuestCanAward:
                    case GuideTriggerType.MainLineQuestCanDo:
                    case GuideTriggerType.QuestCanAccept:
                    case GuideTriggerType.QuestContinue:
                    case GuideTriggerType.QuestLimit:
                    case GuideTriggerType.MainLineQuestContinue:
                    case GuideTriggerType.MainLineQuestLimit:
                    case GuideTriggerType.BranchQuestLimit:
                    case GuideTriggerType.BranchQuestContinue:
                        RemoveGuide(guideId);
                        break;
                }
@@ -286,7 +289,7 @@
            var mainTaskId = taskmodel.currentMission;
            switch ((GuideTriggerType)config.TriggerType)
            {
                case GuideTriggerType.QuestCanDo:
                case GuideTriggerType.MainLineQuestCanDo:
                    if (config.SupplementCondition == 0)
                    {
                        return mainTaskId == config.Condition && taskmodel.currentMissionState == 1;
@@ -303,12 +306,14 @@
                            return false;
                        }
                    }
                case GuideTriggerType.QuestCanAward:
                case GuideTriggerType.MainLineQuestCanAward:
                    return mainTaskId == config.Condition && taskmodel.currentMissionState == 2;
                case GuideTriggerType.QuestLimit:
                    return mainTaskId == config.Condition &&
                        (taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.CardLevel || taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.TreasureCardLevel);
                case GuideTriggerType.QuestContinue:
                case GuideTriggerType.MainLineQuestLimit:
                case GuideTriggerType.BranchQuestLimit:
                    return taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.CardLevel
                        || taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.TreasureCardLevel;
                case GuideTriggerType.MainLineQuestContinue:
                case GuideTriggerType.BranchQuestContinue:
                    var questState = taskmodel.SideQuestState(config.Condition);
                    var taskStatus = taskmodel.GetTaskStatus(config.Condition);
                    return questState == 1 && (taskStatus == TaskModel.TaskStatus.Normal);
System/NewBieGuidance/NewBieCenter.cs
@@ -330,15 +330,17 @@
                    return false;
                case GuideTriggerType.QuestCanAccept:
                    return taskmodel.currentMission == config.Condition && taskmodel.currentMissionState == 0;
                case GuideTriggerType.QuestCanDo:
                case GuideTriggerType.MainLineQuestCanDo:
                    return taskmodel.currentMission == config.Condition && taskmodel.currentMissionState == 1;
                case GuideTriggerType.QuestCanAward:
                case GuideTriggerType.MainLineQuestCanAward:
                    return taskmodel.currentMission == config.Condition && taskmodel.currentMissionState == 2;
                case GuideTriggerType.QuestLimit:
                    return taskmodel.currentMission == config.Condition &&
                        (taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.CardLevel || taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.TreasureCardLevel);
                case GuideTriggerType.QuestContinue:
                    return taskmodel.currentMission == config.Condition && (taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.Normal);
                case GuideTriggerType.MainLineQuestLimit:
                case GuideTriggerType.BranchQuestLimit:
                    return taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.CardLevel
                            || taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.TreasureCardLevel;
                case GuideTriggerType.MainLineQuestContinue:
                case GuideTriggerType.BranchQuestContinue:
                    return taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.Normal;
                case GuideTriggerType.Map:
                    return PlayerDatas.Instance.baseData.MapID == config.Condition;
                case GuideTriggerType.RealmSitDown:
Utility/EnumHelper.cs
@@ -1144,13 +1144,15 @@
    TrialExchange = 22,//宗门试炼兑换材料
    QuestCanAccept = 100,//任务可接
    QuestCanDo = 101,//任务进行中
    QuestCanAward = 102,//任务可领奖
    QuestLimit = 106,//任务被限制
    QuestContinue = 110,//任务可继续
    MainLineQuestCanDo = 101,//任务进行中
    MainLineQuestCanAward = 102,//任务可领奖
    MainLineQuestLimit = 106,//任务被限制
    MainLineQuestContinue = 110,//任务可继续
    BranchQuestCando = 201,//支线任务可做
    BranchQuestCanAward = 202,//支线任务可领奖
    BranchQuestLimit = 206,//支线任务被限制
    BranchQuestContinue = 210,//支线任务可继续
}
[XLua.LuaCallCSharp]