| Core/GameEngine/Model/Config/TaskFeedbackConfig.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Lua/Gen/TaskFeedbackConfigWrap.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/TaskFeedbackModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/GameEngine/Model/Config/TaskFeedbackConfig.cs
@@ -19,8 +19,8 @@ public readonly string equips; public readonly string items; public readonly string sideTasks; public readonly int succGuide; public readonly int failGuide; public readonly int[] succGuide; public readonly int[] failGuide; public readonly string remind; public TaskFeedbackConfig() @@ -45,9 +45,19 @@ sideTasks = tables[5]; int.TryParse(tables[6],out succGuide); string[] succGuideStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries); succGuide = new int[succGuideStringArray.Length]; for (int i=0;i<succGuideStringArray.Length;i++) { int.TryParse(succGuideStringArray[i],out succGuide[i]); } int.TryParse(tables[7],out failGuide); string[] failGuideStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries); failGuide = new int[failGuideStringArray.Length]; for (int i=0;i<failGuideStringArray.Length;i++) { int.TryParse(failGuideStringArray[i],out failGuide[i]); } remind = tables[8]; } Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta
@@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: b80a883f246077d46ab59d6938182ec9 timeCreated: 1557908461 timeCreated: 1557911827 licenseType: Pro MonoImporter: serializedVersion: 2 Lua/Gen/TaskFeedbackConfigWrap.cs
@@ -27,8 +27,6 @@ Utils.RegisterFunc(L, Utils.GETTER_IDX, "taskId", _g_get_taskId); Utils.RegisterFunc(L, Utils.GETTER_IDX, "type", _g_get_type); Utils.RegisterFunc(L, Utils.GETTER_IDX, "succGuide", _g_get_succGuide); Utils.RegisterFunc(L, Utils.GETTER_IDX, "failGuide", _g_get_failGuide); Utils.RegisterFunc(L, Utils.GETTER_IDX, "remind", _g_get_remind); @@ -299,34 +297,6 @@ TaskFeedbackConfig gen_to_be_invoked = (TaskFeedbackConfig)translator.FastGetCSObj(L, 1); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.type); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 1; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_succGuide(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); TaskFeedbackConfig gen_to_be_invoked = (TaskFeedbackConfig)translator.FastGetCSObj(L, 1); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.succGuide); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 1; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_failGuide(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); TaskFeedbackConfig gen_to_be_invoked = (TaskFeedbackConfig)translator.FastGetCSObj(L, 1); LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.failGuide); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -106,9 +106,10 @@ int condition = 0; if (IsSatisfyCondition(feedback, out condition)) { if (config.succGuide != 0) if (config.succGuide != null && config.succGuide.Length > 0) { ExecuteGuide(config.succGuide); ExecuteGuide(config.succGuide[0]); } } else @@ -117,9 +118,10 @@ { SysNotifyMgr.Instance.ShowTip(config.remind); } if (config.failGuide != 0) if (config.failGuide != null && config.failGuide.Length > 0) { ExecuteGuide(config.succGuide); ExecuteGuide(config.failGuide[0]); } } } @@ -129,21 +131,23 @@ int condition = 0; if (IsSatisfyCondition(feedback, out condition)) { if (config.succGuide != 0) if (config.succGuide != null && config.succGuide.Length > 0) { ExecuteGuide(config.succGuide); ExecuteGuide(config.succGuide[0]); } } else { var sideFeedbackConfig = TaskFeedbackConfig.Get(condition); if (!string.IsNullOrEmpty(sideFeedbackConfig.remind)) if (!string.IsNullOrEmpty(config.remind)) { SysNotifyMgr.Instance.ShowTip(sideFeedbackConfig.remind); SysNotifyMgr.Instance.ShowTip(config.remind); } if (sideFeedbackConfig != null && sideFeedbackConfig.failGuide != 0) var index = feedback.IndexOfSideTasks(condition); if (config.failGuide != null && index >= 0 && index < config.failGuide.Length) { ExecuteGuide(sideFeedbackConfig.failGuide); ExecuteGuide(config.failGuide[index]); } } } @@ -153,23 +157,25 @@ int condition = 0; if (IsSatisfyCondition(feedback, out condition)) { if (config.succGuide != 0) if (config.succGuide != null && config.succGuide.Length > 0) { ExecuteGuide(config.succGuide); ExecuteGuide(config.succGuide[0]); } } else { if (!string.IsNullOrEmpty(config.remind)) { SysNotifyMgr.Instance.ShowTip(config.remind); } if (!IsSatisfySideTask(feedback.sideTasks, out condition)) { var sideFeedbackConfig = TaskFeedbackConfig.Get(condition); if (!string.IsNullOrEmpty(sideFeedbackConfig.remind)) var index = feedback.IndexOfSideTasks(condition); if (config.failGuide != null && index >= 0 && index < config.failGuide.Length) { SysNotifyMgr.Instance.ShowTip(sideFeedbackConfig.remind); } if (sideFeedbackConfig != null && sideFeedbackConfig.failGuide != 0) { ExecuteGuide(sideFeedbackConfig.failGuide); ExecuteGuide(config.failGuide[index]); } } } @@ -181,6 +187,10 @@ public void ExecuteGuide(int id) { if (id == 0) { return; } var config = GuideConfig.Get(id); if (config == null) { @@ -271,6 +281,22 @@ public List<int[]> sideTasks; public int[] equipCondition; public List<Item> items; public int IndexOfSideTasks(int taskId) { var index = 0; for (int i = 0; i < sideTasks.Count; i++) { if (taskId >= sideTasks[i][0] && taskId <= sideTasks[i][1]) { index += taskId - sideTasks[i][0]; break; } index += (sideTasks[i][1] - sideTasks[i][0] + 1); } return index; } } public enum TaskFeedbackType