少年修仙传客户端代码仓库
client_Wu Xijin
2019-05-15 9f6126e88f9c3a55736ab34f25a32656bb472307
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
8个文件已修改
599 ■■■■■ 已修改文件
Core/GameEngine/Model/Config/TaskFeedbackConfig.cs 424 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GA_NpcCollect.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Lua/Gen/TaskFeedbackConfigWrap.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Alchemy/AlchemyUseDrugWin.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/ItemLogicUtility.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/TaskFeedbackModel.cs 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/WindowJump/WindowJumpMgr.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/TaskFeedbackConfig.cs
@@ -1,215 +1,233 @@
//--------------------------------------------------------
//    [Author]:           Fish
//    [  Date ]:           Wednesday, May 15, 2019
//--------------------------------------------------------
using System.Collections.Generic;
using System.IO;
using System.Threading;
using System;
using UnityEngine;
[XLua.LuaCallCSharp]
public partial class TaskFeedbackConfig
{
//--------------------------------------------------------
//    [Author]:           Fish
//    [  Date ]:           Wednesday, May 15, 2019
//--------------------------------------------------------
using System.Collections.Generic;
using System.IO;
using System.Threading;
using System;
using UnityEngine;
[XLua.LuaCallCSharp]
public partial class TaskFeedbackConfig
{
    public readonly int taskId;
    public readonly int type;
    public readonly string condition;
    public readonly int succGuide;
    public readonly int failGuide;
    public readonly string remind;
    public TaskFeedbackConfig()
    {
    }
    public TaskFeedbackConfig(string input)
    {
        try
        {
            var tables = input.Split('\t');
    public readonly int condition;
    public readonly string equips;
    public readonly string items;
    public readonly string sideTasks;
    public readonly int[] succGuide;
    public readonly int[] failGuide;
    public readonly string remind;
    public TaskFeedbackConfig()
    {
    }
    public TaskFeedbackConfig(string input)
    {
        try
        {
            var tables = input.Split('\t');
            int.TryParse(tables[0],out taskId); 
            int.TryParse(tables[1],out type); 
            condition = tables[2];
            int.TryParse(tables[2],out condition);
            int.TryParse(tables[3],out succGuide);
            equips = tables[3];
            int.TryParse(tables[4],out failGuide);
            items = tables[4];
            remind = tables[5];
        }
        catch (Exception ex)
        {
            DebugEx.Log(ex);
        }
    }
            sideTasks = tables[5];
    static Dictionary<string, TaskFeedbackConfig> configs = new Dictionary<string, TaskFeedbackConfig>();
    public static TaskFeedbackConfig Get(string id)
    {
        if (!inited)
        {
            Debug.Log("TaskFeedbackConfig 还未完成初始化。");
            return null;
        }
        if (configs.ContainsKey(id))
        {
            return configs[id];
        }
            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]);
            }
        TaskFeedbackConfig config = null;
        if (rawDatas.ContainsKey(id))
        {
            config = configs[id] = new TaskFeedbackConfig(rawDatas[id]);
            rawDatas.Remove(id);
        }
            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]);
            }
        return config;
    }
    public static TaskFeedbackConfig Get(int id)
    {
        return Get(id.ToString());
    }
    public static List<string> GetKeys()
    {
        var keys = new List<string>();
        keys.AddRange(configs.Keys);
        keys.AddRange(rawDatas.Keys);
        return keys;
    }
    public static List<TaskFeedbackConfig> GetValues()
    {
        var values = new List<TaskFeedbackConfig>();
        values.AddRange(configs.Values);
        var keys = new List<string>(rawDatas.Keys);
        foreach (var key in keys)
        {
            values.Add(Get(key));
        }
        return values;
    }
    public static bool Has(string id)
    {
        return configs.ContainsKey(id) || rawDatas.ContainsKey(id);
    }
    public static bool Has(int id)
    {
        return Has(id.ToString());
    }
    public static bool inited { get; private set; }
    protected static Dictionary<string, string> rawDatas = new Dictionary<string, string>();
    public static void Init(bool sync=false)
    {
        inited = false;
        var path = string.Empty;
        if (AssetSource.refdataFromEditor)
        {
            path = ResourcesPath.CONFIG_FODLER +"/TaskFeedback.txt";
        }
        else
        {
            path = AssetVersionUtility.GetAssetFilePath("config/TaskFeedback.txt");
        }
        configs.Clear();
        var tempConfig = new TaskFeedbackConfig();
        var preParse = tempConfig is IConfigPostProcess;
        if (sync)
        {
            var lines = File.ReadAllLines(path);
            if (!preParse)
            {
                rawDatas = new Dictionary<string, string>(lines.Length - 3);
            }
            for (int i = 3; i < lines.Length; i++)
            {
                try
                {
                    var line = lines[i];
                    var index = line.IndexOf("\t");
                    if (index == -1)
                    {
                        continue;
                    }
                    var id = line.Substring(0, index);
                    if (preParse)
                    {
                        var config = new TaskFeedbackConfig(line);
                        configs[id] = config;
                        (config as IConfigPostProcess).OnConfigParseCompleted();
                    }
                    else
                    {
                        rawDatas[id] = line;
                    }
                }
                catch (System.Exception ex)
                {
                    Debug.LogError(ex);
                }
            }
            inited = true;
        }
        else
        {
            ThreadPool.QueueUserWorkItem((object _object) =>
            {
                var lines = File.ReadAllLines(path);
                if (!preParse)
                {
                    rawDatas = new Dictionary<string, string>(lines.Length - 3);
                }
                for (int i = 3; i < lines.Length; i++)
                {
                    try
                    {
                       var line = lines[i];
                        var index = line.IndexOf("\t");
                        if (index == -1)
                        {
                            continue;
                        }
                        var id = line.Substring(0, index);
                        if (preParse)
                        {
                            var config = new TaskFeedbackConfig(line);
                            configs[id] = config;
                            (config as IConfigPostProcess).OnConfigParseCompleted();
                        }
                        else
                        {
                            rawDatas[id] = line;
                        }
                    }
                    catch (System.Exception ex)
                    {
                        Debug.LogError(ex);
                    }
                }
                inited = true;
            });
        }
    }
}
            remind = tables[8];
        }
        catch (Exception ex)
        {
            DebugEx.Log(ex);
        }
    }
    static Dictionary<string, TaskFeedbackConfig> configs = new Dictionary<string, TaskFeedbackConfig>();
    public static TaskFeedbackConfig Get(string id)
    {
        if (!inited)
        {
            Debug.Log("TaskFeedbackConfig 还未完成初始化。");
            return null;
        }
        if (configs.ContainsKey(id))
        {
            return configs[id];
        }
        TaskFeedbackConfig config = null;
        if (rawDatas.ContainsKey(id))
        {
            config = configs[id] = new TaskFeedbackConfig(rawDatas[id]);
            rawDatas.Remove(id);
        }
        return config;
    }
    public static TaskFeedbackConfig Get(int id)
    {
        return Get(id.ToString());
    }
    public static List<string> GetKeys()
    {
        var keys = new List<string>();
        keys.AddRange(configs.Keys);
        keys.AddRange(rawDatas.Keys);
        return keys;
    }
    public static List<TaskFeedbackConfig> GetValues()
    {
        var values = new List<TaskFeedbackConfig>();
        values.AddRange(configs.Values);
        var keys = new List<string>(rawDatas.Keys);
        foreach (var key in keys)
        {
            values.Add(Get(key));
        }
        return values;
    }
    public static bool Has(string id)
    {
        return configs.ContainsKey(id) || rawDatas.ContainsKey(id);
    }
    public static bool Has(int id)
    {
        return Has(id.ToString());
    }
    public static bool inited { get; private set; }
    protected static Dictionary<string, string> rawDatas = new Dictionary<string, string>();
    public static void Init(bool sync=false)
    {
        inited = false;
        var path = string.Empty;
        if (AssetSource.refdataFromEditor)
        {
            path = ResourcesPath.CONFIG_FODLER +"/TaskFeedback.txt";
        }
        else
        {
            path = AssetVersionUtility.GetAssetFilePath("config/TaskFeedback.txt");
        }
        var tempConfig = new TaskFeedbackConfig();
        var preParse = tempConfig is IConfigPostProcess;
        if (sync)
        {
            var lines = File.ReadAllLines(path);
            if (!preParse)
            {
                rawDatas = new Dictionary<string, string>(lines.Length - 3);
            }
            for (int i = 3; i < lines.Length; i++)
            {
                try
                {
                    var line = lines[i];
                    var index = line.IndexOf("\t");
                    if (index == -1)
                    {
                        continue;
                    }
                    var id = line.Substring(0, index);
                    if (preParse)
                    {
                        var config = new TaskFeedbackConfig(line);
                        configs[id] = config;
                        (config as IConfigPostProcess).OnConfigParseCompleted();
                    }
                    else
                    {
                        rawDatas[id] = line;
                    }
                }
                catch (System.Exception ex)
                {
                    Debug.LogError(ex);
                }
            }
            inited = true;
        }
        else
        {
            ThreadPool.QueueUserWorkItem((object _object) =>
            {
                var lines = File.ReadAllLines(path);
                if (!preParse)
                {
                    rawDatas = new Dictionary<string, string>(lines.Length - 3);
                }
                for (int i = 3; i < lines.Length; i++)
                {
                    try
                    {
                       var line = lines[i];
                        var index = line.IndexOf("\t");
                        if (index == -1)
                        {
                            continue;
                        }
                        var id = line.Substring(0, index);
                        if (preParse)
                        {
                            var config = new TaskFeedbackConfig(line);
                            configs[id] = config;
                            (config as IConfigPostProcess).OnConfigParseCompleted();
                        }
                        else
                        {
                            rawDatas[id] = line;
                        }
                    }
                    catch (System.Exception ex)
                    {
                        Debug.LogError(ex);
                    }
                }
                inited = true;
            });
        }
    }
}
Core/GameEngine/Model/Config/TaskFeedbackConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: b80a883f246077d46ab59d6938182ec9
timeCreated: 1557892634
timeCreated: 1557911827
licenseType: Pro
MonoImporter:
  serializedVersion: 2
Fight/GameActor/GA_NpcCollect.cs
@@ -352,7 +352,8 @@
        }
        else
        {
            if (ModelCenter.Instance.GetModel<HazyGrassModel>().IsInDungeon)
            if (ModelCenter.Instance.GetModel<HazyGrassModel>().IsInDungeon
            || PlayerDatas.Instance.baseData.MapID == 31190)
            {
                m_CanCollect = true;
            }
Lua/Gen/TaskFeedbackConfigWrap.cs
@@ -27,9 +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, "condition", _g_get_condition);
            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);
            
            
@@ -300,48 +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_condition(RealStatePtr L)
        {
            try {
                ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
                TaskFeedbackConfig gen_to_be_invoked = (TaskFeedbackConfig)translator.FastGetCSObj(L, 1);
                LuaAPI.lua_pushstring(L, gen_to_be_invoked.condition);
            } 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/Alchemy/AlchemyUseDrugWin.cs
@@ -64,6 +64,14 @@
        void Display()
        {
            DisplayDrugs();
            var index = displayItems.IndexOf(model.jumpAlchemy);
            if (index != -1)
            {
                m_Controller.JumpIndex(index);
            }
            model.jumpAlchemy = 0;
        }
        void DisplayDrugs()
System/KnapSack/Logic/ItemLogicUtility.cs
@@ -499,6 +499,15 @@
                }
            }
            var fruitConfig = AttrFruitConfig.Get(item.itemId);
            if (fruitConfig != null && fruitConfig.FuncID == 2)
            {
                if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.BlastFurnace))
                {
                    return false;
                }
            }
            switch (item.config.Type)
            {
                case 8:
System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -38,14 +38,10 @@
                switch (feedback.type)
                {
                    case TaskFeedbackType.FightPower:
                    case TaskFeedbackType.ReikiPoint:
                    case TaskFeedbackType.Copper:
                        feedback.condition = int.Parse(config.condition);
                        break;
                    case TaskFeedbackType.SideTask:
                    case TaskFeedbackType.FightPowerSideTask:
                        {
                            var array = LitJson.JsonMapper.ToObject<int[][]>(config.condition);
                            var array = LitJson.JsonMapper.ToObject<int[][]>(config.sideTasks);
                            if (array != null)
                            {
                                List<int[]> sideTasks = new List<int[]>(array.Length);
@@ -59,29 +55,13 @@
                        break;
                    case TaskFeedbackType.Equip:
                        {
                            var array = ConfigParse.GetMultipleStr<int>(config.condition);
                            var array = LitJson.JsonMapper.ToObject<int[]>(config.equips);
                            feedback.equipCondition = array;
                        }
                        break;
                    case TaskFeedbackType.FightPowerSideTask:
                        {
                            var stringArray = config.condition.Split('|');
                            feedback.condition = int.Parse(stringArray[0]);
                            var array = LitJson.JsonMapper.ToObject<int[][]>(stringArray[1]);
                            if (array != null)
                            {
                                List<int[]> sideTasks = new List<int[]>(array.Length);
                                for (int i = 0; i < array.Length; i++)
                                {
                                    sideTasks.Add(array[i]);
                                }
                                feedback.sideTasks = sideTasks;
                            }
                        }
                        break;
                    case TaskFeedbackType.ItemCount:
                        {
                            var array = LitJson.JsonMapper.ToObject<int[][]>(config.condition);
                            var array = LitJson.JsonMapper.ToObject<int[][]>(config.items);
                            if (array != null)
                            {
                                List<Item> items = new List<Item>();
@@ -126,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
@@ -137,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]);
                                }
                            }
                        }
@@ -149,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]);
                                }
                            }
                        }
@@ -173,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]);
                                    }
                                }
                            }
@@ -201,6 +187,10 @@
        public void ExecuteGuide(int id)
        {
            if (id == 0)
            {
                return;
            }
            var config = GuideConfig.Get(id);
            if (config == null)
            {
@@ -220,15 +210,16 @@
        public bool IsSatisfyCondition(TaskFeedback feedback, out int condition)
        {
            condition = feedback.condition;
            var config = TaskFeedbackConfig.Get(feedback.taskId);
            condition = 0;
            switch (feedback.type)
            {
                case TaskFeedbackType.FightPower:
                    return PlayerDatas.Instance.baseData.FightPoint >= feedback.condition;
                    return PlayerDatas.Instance.baseData.FightPoint >= config.condition;
                case TaskFeedbackType.SideTask:
                    return IsSatisfySideTask(feedback.sideTasks, out condition);
                case TaskFeedbackType.ReikiPoint:
                    return reikiRootModel.GetReikiRootTotalPoint() >= feedback.condition;
                    return reikiRootModel.GetReikiRootTotalPoint() >= config.condition;
                case TaskFeedbackType.Equip:
                    {
                        var items = packModel.GetItems(PackType.Item, new SinglePack.FilterParams()
@@ -241,11 +232,11 @@
                        return items != null && items.Count > 0;
                    }
                case TaskFeedbackType.Copper:
                    return PlayerDatas.Instance.baseData.allCopper >= (ulong)feedback.condition;
                    return PlayerDatas.Instance.baseData.allCopper >= (ulong)config.condition;
                case TaskFeedbackType.Guide:
                    return true;
                case TaskFeedbackType.FightPowerSideTask:
                    return PlayerDatas.Instance.baseData.FightPoint >= feedback.condition;
                    return PlayerDatas.Instance.baseData.FightPoint >= config.condition;
                case TaskFeedbackType.ItemCount:
                    {
                        if (feedback.items != null)
@@ -287,10 +278,25 @@
    {
        public int taskId;
        public TaskFeedbackType type;
        public int condition;
        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
System/WindowJump/WindowJumpMgr.cs
@@ -723,6 +723,7 @@
            case JumpUIType.Alchemy3:
            case JumpUIType.Alchemy4:
            case JumpUIType.Alchemy5:
            case JumpUIType.Alchemy6:
                var selectAlchemy = 0;
                int.TryParse(_tagWinSearchModel.SelectActive, out selectAlchemy);
                ModelCenter.Instance.GetModel<AlchemyModel>().jumpAlchemy = selectAlchemy;
@@ -1675,6 +1676,7 @@
    Alchemy4 = 315,
    Alchemy5 = 316,
    RealmEquip1 = 317,
    Alchemy6 = 318,
    DhszTs = 1001,//定海神针功法提升界面
    HyqTs = 1002,//皓月枪功法提升界面