少年修仙传客户端代码仓库
client_linchunjie
2019-05-17 297961044b54e60879f8738f225793b0220152e9
3335 任务反馈添加防御值判断
4个文件已修改
419 ■■■■■ 已修改文件
Core/GameEngine/Model/Config/TreasureDungeonConfig.cs 396 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/TreasureDungeonConfig.cs.meta 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/TaskFeedbackModel.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Treasure/TreasureData.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/TreasureDungeonConfig.cs
@@ -1,18 +1,18 @@
//--------------------------------------------------------
//    [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 TreasureDungeonConfig
{
//--------------------------------------------------------
//    [Author]:           Fish
//    [  Date ]:           Friday, May 17, 2019
//--------------------------------------------------------
using System.Collections.Generic;
using System.IO;
using System.Threading;
using System;
using UnityEngine;
[XLua.LuaCallCSharp]
public partial class TreasureDungeonConfig
{
    public readonly int ID;
    public readonly int MWID;
    public readonly int LineID;
@@ -21,17 +21,18 @@
    public readonly int fightPower;
    public readonly string icon;
    public readonly string bossName;
    public TreasureDungeonConfig()
    {
    }
    public TreasureDungeonConfig(string input)
    {
        try
        {
            var tables = input.Split('\t');
    public readonly int defense;
    public TreasureDungeonConfig()
    {
    }
    public TreasureDungeonConfig(string input)
    {
        try
        {
            var tables = input.Split('\t');
            int.TryParse(tables[0],out ID); 
            int.TryParse(tables[1],out MWID); 
@@ -47,175 +48,176 @@
            icon = tables[6];
            bossName = tables[7];
        }
        catch (Exception ex)
        {
            DebugEx.Log(ex);
        }
    }
    static Dictionary<string, TreasureDungeonConfig> configs = new Dictionary<string, TreasureDungeonConfig>();
    public static TreasureDungeonConfig Get(string id)
    {
        if (!inited)
        {
            Debug.Log("TreasureDungeonConfig 还未完成初始化。");
            return null;
        }
        if (configs.ContainsKey(id))
        {
            return configs[id];
        }
        TreasureDungeonConfig config = null;
        if (rawDatas.ContainsKey(id))
        {
            config = configs[id] = new TreasureDungeonConfig(rawDatas[id]);
            rawDatas.Remove(id);
        }
        return config;
    }
    public static TreasureDungeonConfig 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<TreasureDungeonConfig> GetValues()
    {
        var values = new List<TreasureDungeonConfig>();
        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 +"/TreasureDungeon.txt";
        }
        else
        {
            path = AssetVersionUtility.GetAssetFilePath("config/TreasureDungeon.txt");
        }
        configs.Clear();
        var tempConfig = new TreasureDungeonConfig();
        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 TreasureDungeonConfig(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 TreasureDungeonConfig(line);
                            configs[id] = config;
                            (config as IConfigPostProcess).OnConfigParseCompleted();
                        }
                        else
                        {
                            rawDatas[id] = line;
                        }
                    }
                    catch (System.Exception ex)
                    {
                        Debug.LogError(ex);
                    }
                }
                inited = true;
            });
        }
    }
}
            int.TryParse(tables[8],out defense);
        }
        catch (Exception ex)
        {
            DebugEx.Log(ex);
        }
    }
    static Dictionary<string, TreasureDungeonConfig> configs = new Dictionary<string, TreasureDungeonConfig>();
    public static TreasureDungeonConfig Get(string id)
    {
        if (!inited)
        {
            Debug.Log("TreasureDungeonConfig 还未完成初始化。");
            return null;
        }
        if (configs.ContainsKey(id))
        {
            return configs[id];
        }
        TreasureDungeonConfig config = null;
        if (rawDatas.ContainsKey(id))
        {
            config = configs[id] = new TreasureDungeonConfig(rawDatas[id]);
            rawDatas.Remove(id);
        }
        return config;
    }
    public static TreasureDungeonConfig 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<TreasureDungeonConfig> GetValues()
    {
        var values = new List<TreasureDungeonConfig>();
        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 +"/TreasureDungeon.txt";
        }
        else
        {
            path = AssetVersionUtility.GetAssetFilePath("config/TreasureDungeon.txt");
        }
        var tempConfig = new TreasureDungeonConfig();
        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 TreasureDungeonConfig(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 TreasureDungeonConfig(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/TreasureDungeonConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 03f67cc7383990b4da0f2e2d600e3ea5
timeCreated: 1557892448
timeCreated: 1558084867
licenseType: Pro
MonoImporter:
  serializedVersion: 2
System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -12,6 +12,7 @@
        ReikiRootModel reikiRootModel { get { return ModelCenter.Instance.GetModel<ReikiRootModel>(); } }
        PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
        TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } }
        TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
        public override void Init()
        {
@@ -143,6 +144,7 @@
                    case TaskFeedbackType.Equip:
                    case TaskFeedbackType.ItemCount:
                    case TaskFeedbackType.SkyTowerFightPoint:
                    case TaskFeedbackType.DemonTreasure:
                        {
                            int condition = 0;
                            if (IsSatisfyCondition(feedback, out condition))
@@ -343,6 +345,20 @@
                        }
                    }
                    break;
                case TaskFeedbackType.DemonTreasure:
                    {
                        TreasureDungeon treasureDungeon;
                        if (treasureModel.TryGetTreasureDungeon(config.condition, out treasureDungeon))
                        {
                            var dungeonInfo = treasureDungeon.Get(treasureDungeon.currentLevel + 1);
                            if (!dungeonInfo.Equals(default(TreasureDungeonInfo)))
                            {
                                return UIHelper.GetPropertyValue(PropertyType.DEF) >= dungeonInfo.defense;
                            }
                            return true;
                        }
                    }
                    break;
            }
            return false;
        }
@@ -404,6 +420,7 @@
        FightPowerSideTask = 7,
        ItemCount = 8,
        SkyTowerFightPoint = 9,
        DemonTreasure = 10,
    }
}
System/Treasure/TreasureData.cs
@@ -180,7 +180,8 @@
                    fightPower = config.fightPower,
                    level = config.Level,
                    propertyDict = propertyDict,
                    lineId = config.LineID
                    lineId = config.LineID,
                    defense = config.defense,
                };
                dungeonInfos.Add(dungeonInfo);
@@ -241,6 +242,7 @@
        public int level;
        public Dictionary<int, int> propertyDict;
        public int fightPower;
        public int defense;
    }
    public enum TreasureStageUnlock