少年修仙传客户端代码仓库
client_Zxw
2019-02-25 cc8c5433cf7fffe3ce7fbff8d683230f52f2b5bc
6274 【前端】【1.6】【主干】七日巡礼增加略缩图
3个文件已修改
399 ■■■■ 已修改文件
Core/GameEngine/Model/Config/WeekPartyPointConfig.cs 395 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/WeekPartyPointConfig.cs.meta 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/OpenServerActivity/OpenServiceItem.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/WeekPartyPointConfig.cs
@@ -1,33 +1,34 @@
//--------------------------------------------------------
//    [Author]:           Fish
//    [  Date ]:           Thursday, February 14, 2019
//--------------------------------------------------------
using System.Collections.Generic;
using System.IO;
using System.Threading;
using System;
using UnityEngine;
[XLua.LuaCallCSharp]
public partial class WeekPartyPointConfig
{
//--------------------------------------------------------
//    [Author]:           Fish
//    [  Date ]:           Monday, February 25, 2019
//--------------------------------------------------------
using System.Collections.Generic;
using System.IO;
using System.Threading;
using System;
using UnityEngine;
[XLua.LuaCallCSharp]
public partial class WeekPartyPointConfig
{
    public readonly int Id;
    public readonly string ImageType1;
    public readonly string ImageType2;
    public readonly string name;
    public WeekPartyPointConfig()
    {
    }
    public WeekPartyPointConfig(string input)
    {
        try
        {
            var tables = input.Split('\t');
    public readonly float Zoom;
    public WeekPartyPointConfig()
    {
    }
    public WeekPartyPointConfig(string input)
    {
        try
        {
            var tables = input.Split('\t');
            int.TryParse(tables[0],out Id); 
            ImageType1 = tables[1];
@@ -35,174 +36,176 @@
            ImageType2 = tables[2];
            name = tables[3];
        }
        catch (Exception ex)
        {
            DebugEx.Log(ex);
        }
    }
    static Dictionary<string, WeekPartyPointConfig> configs = new Dictionary<string, WeekPartyPointConfig>();
    public static WeekPartyPointConfig Get(string id)
    {
        if (!inited)
        {
            Debug.Log("WeekPartyPointConfig 还未完成初始化。");
            return null;
        }
        if (configs.ContainsKey(id))
        {
            return configs[id];
        }
        WeekPartyPointConfig config = null;
        if (rawDatas.ContainsKey(id))
        {
            config = configs[id] = new WeekPartyPointConfig(rawDatas[id]);
            rawDatas.Remove(id);
        }
        return config;
    }
    public static WeekPartyPointConfig 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<WeekPartyPointConfig> GetValues()
    {
        var values = new List<WeekPartyPointConfig>();
        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 +"/WeekPartyPoint.txt";
        }
        else
        {
            path = AssetVersionUtility.GetAssetFilePath("config/WeekPartyPoint.txt");
        }
        var tempConfig = new WeekPartyPointConfig();
        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 WeekPartyPointConfig(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 WeekPartyPointConfig(line);
                            configs[id] = config;
                            (config as IConfigPostProcess).OnConfigParseCompleted();
                        }
                        else
                        {
                            rawDatas[id] = line;
                        }
                    }
                    catch (System.Exception ex)
                    {
                        Debug.LogError(ex);
                    }
                }
                inited = true;
            });
        }
    }
}
            float.TryParse(tables[4],out Zoom);
        }
        catch (Exception ex)
        {
            DebugEx.Log(ex);
        }
    }
    static Dictionary<string, WeekPartyPointConfig> configs = new Dictionary<string, WeekPartyPointConfig>();
    public static WeekPartyPointConfig Get(string id)
    {
        if (!inited)
        {
            Debug.Log("WeekPartyPointConfig 还未完成初始化。");
            return null;
        }
        if (configs.ContainsKey(id))
        {
            return configs[id];
        }
        WeekPartyPointConfig config = null;
        if (rawDatas.ContainsKey(id))
        {
            config = configs[id] = new WeekPartyPointConfig(rawDatas[id]);
            rawDatas.Remove(id);
        }
        return config;
    }
    public static WeekPartyPointConfig 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<WeekPartyPointConfig> GetValues()
    {
        var values = new List<WeekPartyPointConfig>();
        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 +"/WeekPartyPoint.txt";
        }
        else
        {
            path = AssetVersionUtility.GetAssetFilePath("config/WeekPartyPoint.txt");
        }
        var tempConfig = new WeekPartyPointConfig();
        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 WeekPartyPointConfig(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 WeekPartyPointConfig(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/WeekPartyPointConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: f723363b44064444fb15fc4cafbaa0d5
timeCreated: 1550121884
timeCreated: 1551060842
licenseType: Pro
MonoImporter:
  serializedVersion: 2
System/OpenServerActivity/OpenServiceItem.cs
@@ -37,6 +37,8 @@
                    m_ImageShow.SetSprite(weekPartPointConfig.ImageType2);
                }
                m_ImageShow.SetNativeSize();
                var RectTrans = m_ImageShow.transform.GetComponent<RectTransform>();
                RectTrans.localScale = new Vector3(weekPartPointConfig.Zoom, weekPartPointConfig.Zoom, 1);
            }
            int Point = model.GetPoint(day);           
            m_TextPoint.text = Language.Get("OSA_3", item.NeedPoint);