From f624ba05077458b476f76cb8d666029a2fb56807 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 18 四月 2019 14:37:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
/dev/null | 12 ---
Lua/Gen/XLuaGenAutoRegister.cs | 5 -
System/EquipTrain/EquipTrainPropertyBarBehaviour.cs | 2
Utility/ConfigInitiator.cs | 1
System/WorldMap/LocalMapFindPath.cs | 12 ++
System/WorldMap/LocalMapTag.cs | 154 +++++++++++++++++++++----------------
6 files changed, 99 insertions(+), 87 deletions(-)
diff --git a/Core/GameEngine/Model/Config/EquipSuitCompoundConfig.cs b/Core/GameEngine/Model/Config/EquipSuitCompoundConfig.cs
deleted file mode 100644
index cd867b4..0000000
--- a/Core/GameEngine/Model/Config/EquipSuitCompoundConfig.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-锘�//--------------------------------------------------------
-// [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 EquipSuitCompoundConfig
-{
-
- public readonly int ID;
- public readonly int SuiteType;
- public readonly int EquipPlace;
- public readonly int SuiteLV;
- public readonly int Job;
- public readonly int[] CostItemID;
- public readonly int[] CostItemCnt;
-
- public EquipSuitCompoundConfig()
- {
- }
-
- public EquipSuitCompoundConfig(string input)
- {
- try
- {
- var tables = input.Split('\t');
-
- int.TryParse(tables[0],out ID);
-
- int.TryParse(tables[1],out SuiteType);
-
- int.TryParse(tables[2],out EquipPlace);
-
- int.TryParse(tables[3],out SuiteLV);
-
- int.TryParse(tables[4],out Job);
-
- string[] CostItemIDStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- CostItemID = new int[CostItemIDStringArray.Length];
- for (int i=0;i<CostItemIDStringArray.Length;i++)
- {
- int.TryParse(CostItemIDStringArray[i],out CostItemID[i]);
- }
-
- string[] CostItemCntStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- CostItemCnt = new int[CostItemCntStringArray.Length];
- for (int i=0;i<CostItemCntStringArray.Length;i++)
- {
- int.TryParse(CostItemCntStringArray[i],out CostItemCnt[i]);
- }
- }
- catch (Exception ex)
- {
- DebugEx.Log(ex);
- }
- }
-
- static Dictionary<string, EquipSuitCompoundConfig> configs = new Dictionary<string, EquipSuitCompoundConfig>();
- public static EquipSuitCompoundConfig Get(string id)
- {
- if (!inited)
- {
- Debug.Log("EquipSuitCompoundConfig 杩樻湭瀹屾垚鍒濆鍖栥��");
- return null;
- }
-
- if (configs.ContainsKey(id))
- {
- return configs[id];
- }
-
- EquipSuitCompoundConfig config = null;
- if (rawDatas.ContainsKey(id))
- {
- config = configs[id] = new EquipSuitCompoundConfig(rawDatas[id]);
- rawDatas.Remove(id);
- }
-
- return config;
- }
-
- public static EquipSuitCompoundConfig 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<EquipSuitCompoundConfig> GetValues()
- {
- var values = new List<EquipSuitCompoundConfig>();
- 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 +"/EquipSuitCompound.txt";
- }
- else
- {
- path = AssetVersionUtility.GetAssetFilePath("config/EquipSuitCompound.txt");
- }
-
- var tempConfig = new EquipSuitCompoundConfig();
- 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 EquipSuitCompoundConfig(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 EquipSuitCompoundConfig(line);
- configs[id] = config;
- (config as IConfigPostProcess).OnConfigParseCompleted();
- }
- else
- {
- rawDatas[id] = line;
- }
- }
- catch (System.Exception ex)
- {
- Debug.LogError(ex);
- }
- }
-
- inited = true;
- });
- }
- }
-
-}
-
-
-
-
diff --git a/Core/GameEngine/Model/Config/EquipSuitCompoundConfig.cs.meta b/Core/GameEngine/Model/Config/EquipSuitCompoundConfig.cs.meta
deleted file mode 100644
index 23b62e7..0000000
--- a/Core/GameEngine/Model/Config/EquipSuitCompoundConfig.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: e02a56bdd275f5c4cba9d24746664bb1
-timeCreated: 1550122126
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Core/GameEngine/Model/TelPartialConfig/tagEquipSuitCompoundConfig.cs b/Core/GameEngine/Model/TelPartialConfig/tagEquipSuitCompoundConfig.cs
deleted file mode 100644
index 69df69b..0000000
--- a/Core/GameEngine/Model/TelPartialConfig/tagEquipSuitCompoundConfig.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-锘縰sing System.Collections.Generic;
-using System.Text;
-using UnityEngine;
-
-public partial class EquipSuitCompoundConfig : IConfigPostProcess
-{
- private StringBuilder _makerEquipSuitID = new StringBuilder();
- private static Dictionary<string, EquipSuitCompoundConfig> makerEquipSuitDict = new Dictionary<string, EquipSuitCompoundConfig>();
-
- public void OnConfigParseCompleted()
- {
- _makerEquipSuitID.Length = 0;
- _makerEquipSuitID.Append(SuiteType.ToString());
- _makerEquipSuitID.Append(EquipPlace.ToString());
- _makerEquipSuitID.Append(SuiteLV.ToString());
- _makerEquipSuitID.Append(Job.ToString());
- makerEquipSuitDict.Add(_makerEquipSuitID.ToString(), this);
- }
-
- //鏍规嵁瑁呭鐨勪綅缃紝绛夌骇锛岃亴涓氬緱鍒伴敾鐐煎瑁呴渶瑕佺殑鏉愭枡
- public static EquipSuitCompoundConfig GetMakerEquipSuitMatModel(int suitType, int equipPlace, int equipLv, int job)
- {
- string strId = StringUtility.Contact(suitType, equipPlace, equipLv, job);
- EquipSuitCompoundConfig makerSuitMat = null;
- makerEquipSuitDict.TryGetValue(strId, out makerSuitMat);
- return makerSuitMat;
- }
-
-}
diff --git a/Core/GameEngine/Model/TelPartialConfig/tagEquipSuitCompoundConfig.cs.meta b/Core/GameEngine/Model/TelPartialConfig/tagEquipSuitCompoundConfig.cs.meta
deleted file mode 100644
index aa9f9b6..0000000
--- a/Core/GameEngine/Model/TelPartialConfig/tagEquipSuitCompoundConfig.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 60139233d74ee0c4f880a3de858116cf
-timeCreated: 1503470651
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Lua/Gen/EquipSuitCompoundConfigWrap.cs b/Lua/Gen/EquipSuitCompoundConfigWrap.cs
deleted file mode 100644
index ccb0c13..0000000
--- a/Lua/Gen/EquipSuitCompoundConfigWrap.cs
+++ /dev/null
@@ -1,446 +0,0 @@
-锘�#if USE_UNI_LUA
-using LuaAPI = UniLua.Lua;
-using RealStatePtr = UniLua.ILuaState;
-using LuaCSFunction = UniLua.CSharpFunctionDelegate;
-#else
-using LuaAPI = XLua.LuaDLL.Lua;
-using RealStatePtr = System.IntPtr;
-using LuaCSFunction = XLua.LuaDLL.lua_CSFunction;
-#endif
-
-using XLua;
-using System.Collections.Generic;
-
-
-namespace XLua.CSObjectWrap
-{
- using Utils = XLua.Utils;
- public class EquipSuitCompoundConfigWrap
- {
- public static void __Register(RealStatePtr L)
- {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
- System.Type type = typeof(EquipSuitCompoundConfig);
- Utils.BeginObjectRegister(type, L, translator, 0, 1, 7, 0);
-
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "OnConfigParseCompleted", _m_OnConfigParseCompleted);
-
-
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "ID", _g_get_ID);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "SuiteType", _g_get_SuiteType);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "EquipPlace", _g_get_EquipPlace);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "SuiteLV", _g_get_SuiteLV);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "Job", _g_get_Job);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "CostItemID", _g_get_CostItemID);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "CostItemCnt", _g_get_CostItemCnt);
-
-
-
- Utils.EndObjectRegister(type, L, translator, null, null,
- null, null, null);
-
- Utils.BeginClassRegister(type, L, __CreateInstance, 7, 1, 0);
- Utils.RegisterFunc(L, Utils.CLS_IDX, "Get", _m_Get_xlua_st_);
- Utils.RegisterFunc(L, Utils.CLS_IDX, "GetKeys", _m_GetKeys_xlua_st_);
- Utils.RegisterFunc(L, Utils.CLS_IDX, "GetValues", _m_GetValues_xlua_st_);
- Utils.RegisterFunc(L, Utils.CLS_IDX, "Has", _m_Has_xlua_st_);
- Utils.RegisterFunc(L, Utils.CLS_IDX, "Init", _m_Init_xlua_st_);
- Utils.RegisterFunc(L, Utils.CLS_IDX, "GetMakerEquipSuitMatModel", _m_GetMakerEquipSuitMatModel_xlua_st_);
-
-
-
- Utils.RegisterFunc(L, Utils.CLS_GETTER_IDX, "inited", _g_get_inited);
-
-
-
- Utils.EndClassRegister(type, L, translator);
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int __CreateInstance(RealStatePtr L)
- {
-
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
- if(LuaAPI.lua_gettop(L) == 1)
- {
-
- EquipSuitCompoundConfig gen_ret = new EquipSuitCompoundConfig();
- translator.Push(L, gen_ret);
-
- return 1;
- }
- if(LuaAPI.lua_gettop(L) == 2 && (LuaAPI.lua_isnil(L, 2) || LuaAPI.lua_type(L, 2) == LuaTypes.LUA_TSTRING))
- {
- string _input = LuaAPI.lua_tostring(L, 2);
-
- EquipSuitCompoundConfig gen_ret = new EquipSuitCompoundConfig(_input);
- translator.Push(L, gen_ret);
-
- return 1;
- }
-
- }
- catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return LuaAPI.luaL_error(L, "invalid arguments to EquipSuitCompoundConfig constructor!");
-
- }
-
-
-
-
-
-
-
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_Get_xlua_st_(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
-
- int gen_param_count = LuaAPI.lua_gettop(L);
-
- if(gen_param_count == 1&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 1))
- {
- int _id = LuaAPI.xlua_tointeger(L, 1);
-
- EquipSuitCompoundConfig gen_ret = EquipSuitCompoundConfig.Get( _id );
- translator.Push(L, gen_ret);
-
-
-
- return 1;
- }
- if(gen_param_count == 1&& (LuaAPI.lua_isnil(L, 1) || LuaAPI.lua_type(L, 1) == LuaTypes.LUA_TSTRING))
- {
- string _id = LuaAPI.lua_tostring(L, 1);
-
- EquipSuitCompoundConfig gen_ret = EquipSuitCompoundConfig.Get( _id );
- translator.Push(L, gen_ret);
-
-
-
- return 1;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- return LuaAPI.luaL_error(L, "invalid arguments to EquipSuitCompoundConfig.Get!");
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GetKeys_xlua_st_(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
-
-
- {
-
- System.Collections.Generic.List<string> gen_ret = EquipSuitCompoundConfig.GetKeys( );
- translator.Push(L, gen_ret);
-
-
-
- return 1;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GetValues_xlua_st_(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
-
-
- {
-
- System.Collections.Generic.List<EquipSuitCompoundConfig> gen_ret = EquipSuitCompoundConfig.GetValues( );
- translator.Push(L, gen_ret);
-
-
-
- return 1;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_Has_xlua_st_(RealStatePtr L)
- {
- try {
-
-
-
- int gen_param_count = LuaAPI.lua_gettop(L);
-
- if(gen_param_count == 1&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 1))
- {
- int _id = LuaAPI.xlua_tointeger(L, 1);
-
- bool gen_ret = EquipSuitCompoundConfig.Has( _id );
- LuaAPI.lua_pushboolean(L, gen_ret);
-
-
-
- return 1;
- }
- if(gen_param_count == 1&& (LuaAPI.lua_isnil(L, 1) || LuaAPI.lua_type(L, 1) == LuaTypes.LUA_TSTRING))
- {
- string _id = LuaAPI.lua_tostring(L, 1);
-
- bool gen_ret = EquipSuitCompoundConfig.Has( _id );
- LuaAPI.lua_pushboolean(L, gen_ret);
-
-
-
- return 1;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- return LuaAPI.luaL_error(L, "invalid arguments to EquipSuitCompoundConfig.Has!");
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_Init_xlua_st_(RealStatePtr L)
- {
- try {
-
-
-
- int gen_param_count = LuaAPI.lua_gettop(L);
-
- if(gen_param_count == 1&& LuaTypes.LUA_TBOOLEAN == LuaAPI.lua_type(L, 1))
- {
- bool _sync = LuaAPI.lua_toboolean(L, 1);
-
- EquipSuitCompoundConfig.Init( _sync );
-
-
-
- return 0;
- }
- if(gen_param_count == 0)
- {
-
- EquipSuitCompoundConfig.Init( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- return LuaAPI.luaL_error(L, "invalid arguments to EquipSuitCompoundConfig.Init!");
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_OnConfigParseCompleted(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- EquipSuitCompoundConfig gen_to_be_invoked = (EquipSuitCompoundConfig)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.OnConfigParseCompleted( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_GetMakerEquipSuitMatModel_xlua_st_(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
-
-
- {
- int _suitType = LuaAPI.xlua_tointeger(L, 1);
- int _equipPlace = LuaAPI.xlua_tointeger(L, 2);
- int _equipLv = LuaAPI.xlua_tointeger(L, 3);
- int _job = LuaAPI.xlua_tointeger(L, 4);
-
- EquipSuitCompoundConfig gen_ret = EquipSuitCompoundConfig.GetMakerEquipSuitMatModel( _suitType, _equipPlace, _equipLv, _job );
- translator.Push(L, gen_ret);
-
-
-
- return 1;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
-
-
-
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_inited(RealStatePtr L)
- {
- try {
-
- LuaAPI.lua_pushboolean(L, EquipSuitCompoundConfig.inited);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_ID(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- EquipSuitCompoundConfig gen_to_be_invoked = (EquipSuitCompoundConfig)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.ID);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_SuiteType(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- EquipSuitCompoundConfig gen_to_be_invoked = (EquipSuitCompoundConfig)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.SuiteType);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_EquipPlace(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- EquipSuitCompoundConfig gen_to_be_invoked = (EquipSuitCompoundConfig)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.EquipPlace);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_SuiteLV(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- EquipSuitCompoundConfig gen_to_be_invoked = (EquipSuitCompoundConfig)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.SuiteLV);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_Job(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- EquipSuitCompoundConfig gen_to_be_invoked = (EquipSuitCompoundConfig)translator.FastGetCSObj(L, 1);
- LuaAPI.xlua_pushinteger(L, gen_to_be_invoked.Job);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_CostItemID(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- EquipSuitCompoundConfig gen_to_be_invoked = (EquipSuitCompoundConfig)translator.FastGetCSObj(L, 1);
- translator.Push(L, gen_to_be_invoked.CostItemID);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_CostItemCnt(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- EquipSuitCompoundConfig gen_to_be_invoked = (EquipSuitCompoundConfig)translator.FastGetCSObj(L, 1);
- translator.Push(L, gen_to_be_invoked.CostItemCnt);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
-
-
-
-
-
-
- }
-}
diff --git a/Lua/Gen/EquipSuitCompoundConfigWrap.cs.meta b/Lua/Gen/EquipSuitCompoundConfigWrap.cs.meta
deleted file mode 100644
index 3533381..0000000
--- a/Lua/Gen/EquipSuitCompoundConfigWrap.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: a9dd8ef4a3326ca42b3ac9e317f0e9bb
-timeCreated: 1550122893
-licenseType: Pro
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Lua/Gen/XLuaGenAutoRegister.cs b/Lua/Gen/XLuaGenAutoRegister.cs
index 1b25ea2..1e9bf56 100644
--- a/Lua/Gen/XLuaGenAutoRegister.cs
+++ b/Lua/Gen/XLuaGenAutoRegister.cs
@@ -229,12 +229,7 @@
translator.DelayWrapLoader(typeof(EquipSuitAttrConfig), EquipSuitAttrConfigWrap.__Register);
-
- translator.DelayWrapLoader(typeof(EquipSuitCompoundConfig), EquipSuitCompoundConfigWrap.__Register);
-
-
translator.DelayWrapLoader(typeof(EquipSuitConfig), EquipSuitConfigWrap.__Register);
-
translator.DelayWrapLoader(typeof(EquipSuitNameConfig), EquipSuitNameConfigWrap.__Register);
diff --git a/System/EquipTrain/EquipTrainPropertyBarBehaviour.cs b/System/EquipTrain/EquipTrainPropertyBarBehaviour.cs
index 1151d24..39a2ece 100644
--- a/System/EquipTrain/EquipTrainPropertyBarBehaviour.cs
+++ b/System/EquipTrain/EquipTrainPropertyBarBehaviour.cs
@@ -98,7 +98,7 @@
{
if (operateType == EquipTrainModel.TrainOperateType.Train)
{
- m_DeltaValue.text = inevitable ? "蹇呭" : "";
+ m_DeltaValue.text = inevitable ? "鏈�澶�" : "";
m_DeltaValue.color = UIHelper.GetUIColor(TextColType.Green, true);
}
else if (operateType == EquipTrainModel.TrainOperateType.Save)
diff --git a/System/WorldMap/LocalMapFindPath.cs b/System/WorldMap/LocalMapFindPath.cs
index c92b425..d338ae2 100644
--- a/System/WorldMap/LocalMapFindPath.cs
+++ b/System/WorldMap/LocalMapFindPath.cs
@@ -404,9 +404,19 @@
private void FoucsEventPoint(int _eventPoint)
{
+ var config = MapEventPointConfig.Get(_eventPoint);
+ if (config != null)
+ {
+ var npcConfig = NPCConfig.Get(config.NPCID);
+ if (npcConfig.NPCType == 0)
+ {
+ m_EventPointInstroduce.gameObject.SetActive(false);
+ return;
+ }
+ }
+
if (model.selectedMapEventPoint != -1)
{
- var config = MapEventPointConfig.Get(_eventPoint);
var monsterRefreshConfig = MonsterRefreshPointConfig.Get(config.NPCID);
var position = new Vector3(monsterRefreshConfig.Position.x * 0.5f, 0, monsterRefreshConfig.Position.y * 0.5f);
diff --git a/System/WorldMap/LocalMapTag.cs b/System/WorldMap/LocalMapTag.cs
index cd767be..e4e1c3d 100644
--- a/System/WorldMap/LocalMapTag.cs
+++ b/System/WorldMap/LocalMapTag.cs
@@ -18,40 +18,28 @@
[SerializeField] TextEx m_Level;
[SerializeField] Button m_Moveto;
[SerializeField] Image m_TaskState;
+ [SerializeField] UIEffect m_Effect;
TagType m_TagType;
public TagType tagType {
- get {
- return m_TagType;
- }
- set {
- m_TagType = value;
- }
+ get { return m_TagType; }
+ set { m_TagType = value; }
}
- LocalMapFindPath localMapFindPath;
- Vector3 worldPosition = Vector3.zero;
int npcId = 0;
int index = 0;
- TaskModel taskmodel {
- get {
- return ModelCenter.Instance.GetModel<TaskModel>();
- }
- }
- FairyLeagueModel fairyLeagueModel {
- get {
- return ModelCenter.Instance.GetModel<FairyLeagueModel>();
- }
- }
+ MapModel mapModel { get { return ModelCenter.Instance.GetModel<MapModel>(); } }
+ TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } }
+ FairyLeagueModel fairyLeagueModel { get { return ModelCenter.Instance.GetModel<FairyLeagueModel>(); } }
- public void Display(int _npcId, TextColType _colorType)
+ public void Display(int npcId, TextColType colorType)
{
- npcId = _npcId;
+ this.npcId = npcId;
switch (m_TagType)
{
case TagType.Function:
- var status = taskmodel.StatusLightQuery(npcId);
+ var status = this.taskModel.StatusLightQuery(this.npcId);
if (status > 0)
{
m_TaskState.SetSprite(StringUtility.Contact("LocalMapTaskState_", status));
@@ -64,6 +52,10 @@
m_TaskState.SetNativeSize();
TaskModel.Event_TaskResponse -= OnTaskStateChange;
TaskModel.Event_TaskResponse += OnTaskStateChange;
+
+ OnSelectEvent(mapModel.selectedMapEventPoint);
+ mapModel.selectMapEventPointEvent -= OnSelectEvent;
+ mapModel.selectMapEventPointEvent += OnSelectEvent;
break;
case TagType.WayPoint:
break;
@@ -71,61 +63,88 @@
break;
case TagType.Elite:
case TagType.Monster:
- var config = NPCConfig.Get(npcId);
+ var config = NPCConfig.Get(this.npcId);
m_NpcName.text = config.charName;
- m_NpcName.colorType = _colorType;
+ m_NpcName.colorType = colorType;
break;
case TagType.Crystal:
- OnCrystalStateChange(npcId);
+ this.OnCrystalStateChange(this.npcId);
m_Moveto.RemoveAllListeners();
m_Moveto.AddListener(MoveTo);
- PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshInfoEvent;
- PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshInfoEvent;
+ PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent;
+ PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;
fairyLeagueModel.UpdateWarCrystalEvent -= OnCrystalStateChange;
fairyLeagueModel.UpdateWarCrystalEvent += OnCrystalStateChange;
break;
}
}
- public void Display(int _npcId, TextColType _colorType, Vector3 _position)
+ public void Display(int npcId, TextColType colorType, Vector3 _position)
{
- worldPosition = _position;
- npcId = _npcId;
-
+ this.npcId = npcId;
switch (m_TagType)
{
case TagType.Boss:
- var config = NPCConfig.Get(npcId);
+ var config = NPCConfig.Get(this.npcId);
m_NpcName.text = config.charName;
m_Level.text = Language.Get("HeadUpName_Monster", config.NPCLV);
- m_NpcName.colorType = _colorType;
+ m_NpcName.colorType = colorType;
var dangerous = PlayerDatas.Instance.baseData.LV <= config.NPCLV;
m_Level.color = UIHelper.GetUIColor(dangerous ? TextColType.Red : TextColType.Green, false);
- m_Moveto.RemoveAllListeners();
- m_Moveto.AddListener(MoveTo);
+ m_Moveto.SetListener(MoveTo);
break;
default:
break;
}
}
- public void Display(int _index)
+ public void Display(int index)
{
- index = _index;
+ this.index = index;
switch (m_TagType)
{
case TagType.FairyLeagueBuff:
- m_Moveto.RemoveAllListeners();
- m_Moveto.AddListener(MoveTo);
+ m_Moveto.SetListener(MoveTo);
break;
}
}
public void Dispose()
{
+ mapModel.selectMapEventPointEvent += OnSelectEvent;
TaskModel.Event_TaskResponse -= OnTaskStateChange;
fairyLeagueModel.UpdateWarCrystalEvent -= OnCrystalStateChange;
- PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshInfoEvent;
+ PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent;
+ }
+
+ private void OnSelectEvent(int eventId)
+ {
+ var config = MapEventPointConfig.Get(eventId);
+
+ var isFunctionNpc = false;
+ if (config != null && config.NPCID == this.npcId)
+ {
+ var npcConfig = NPCConfig.Get(config.NPCID);
+ if (npcConfig.NPCType == 0)
+ {
+ isFunctionNpc = true;
+ }
+ }
+
+ if (isFunctionNpc)
+ {
+ if (!m_Effect.IsPlaying)
+ {
+ m_Effect.Play();
+ }
+ }
+ else
+ {
+ if (m_Effect.IsPlaying)
+ {
+ m_Effect.Stop();
+ }
+ }
}
private void MoveTo()
@@ -134,33 +153,31 @@
{
case TagType.FairyLeagueBuff:
{
- var _help = fairyLeagueModel.fairyLeagueHelp;
- Vector2 _buffPos = fairyLeagueModel.crystalPosList[index];
- var _hero = PlayerDatas.Instance.hero;
- if (_hero != null)
+ var buffPos = fairyLeagueModel.crystalPosList[index];
+ var hero = PlayerDatas.Instance.hero;
+ if (hero != null)
{
- _hero.MoveToPosition(new Vector3(_buffPos.x, _hero.Pos.y, _buffPos.y));
+ hero.MoveToPosition(new Vector3(buffPos.x, hero.Pos.y, buffPos.y));
}
}
break;
default:
{
- var model = ModelCenter.Instance.GetModel<MapModel>();
WindowCenter.Instance.Close<WorldMapWin>();
WindowCenter.Instance.Close<LocalMapWin>();
WindowCenter.Instance.Open<MainInterfaceWin>();
MapTransferUtility.Instance.MoveToNPC(npcId);
- model.selectedMapEventPoint = -1;
+ mapModel.selectedMapEventPoint = -1;
}
break;
}
}
- private void OnTaskStateChange(int _nowNPCid, int _nPCLamp, Dictionary<int, int> _dic)
+ private void OnTaskStateChange(int nowNpcId, int npcLamp, Dictionary<int, int> dic)
{
- if (npcId == _nowNPCid)
+ if (npcId == nowNpcId)
{
- var status = taskmodel.StatusLightQuery(npcId);
+ var status = taskModel.StatusLightQuery(npcId);
if (status > 0)
{
m_TaskState.SetSprite(StringUtility.Contact("LocalMapTaskState_", status));
@@ -178,31 +195,34 @@
OnCrystalStateChange(npcId);
}
- private void PlayerDataRefreshInfoEvent(PlayerDataType _type)
+ private void PlayerDataRefreshEvent(PlayerDataType type)
{
- if (_type == PlayerDataType.Faction)
+ if (type == PlayerDataType.Faction)
{
OnCrystalStateChange();
}
}
- private void OnCrystalStateChange(int _npcId)
+ private void OnCrystalStateChange(int npcId)
{
- if (npcId != _npcId)
+ if (this.npcId != npcId)
{
return;
}
- var _index = fairyLeagueModel.GetCrystalIndex(_npcId);
- m_NpcName.text = (_index + 1).ToString();
- var _camp = fairyLeagueModel.fairyLeagueHelp.GetCrystalBelongCamp(_npcId);
- if (_camp == 0)
+
+ var index = fairyLeagueModel.GetCrystalIndex(npcId);
+ m_NpcName.text = (index + 1).ToString();
+ var camp = fairyLeagueModel.fairyLeagueHelp.GetCrystalBelongCamp(npcId);
+ if (camp == 0)
{
m_TaskState.SetSprite("GrayCrystal");
m_Moveto.image.SetSprite("GreyBottom");
return;
}
- m_TaskState.SetSprite((FairyCampType)_camp == FairyCampType.Blue ? "BlueCrystal" : "RedCrystal");
- m_Moveto.image.SetSprite((FairyCampType)_camp == FairyCampType.Blue ? "BlueBottom" : "RedBottom");
+
+ var isBlue = (FairyCampType)camp == FairyCampType.Blue;
+ m_TaskState.SetSprite(isBlue ? "BlueCrystal" : "RedCrystal");
+ m_Moveto.image.SetSprite(isBlue ? "BlueBottom" : "RedBottom");
}
public enum TagType
@@ -222,13 +242,13 @@
{
static Dictionary<int, GameObjectPoolManager.GameObjectPool> pools = new Dictionary<int, GameObjectPoolManager.GameObjectPool>();
- public static LocalMapTag Require(LocalMapTag.TagType _pattern)
+ public static LocalMapTag Require(LocalMapTag.TagType pattern)
{
GameObjectPoolManager.GameObjectPool pool = null;
- var poolKey = (int)_pattern;
+ var poolKey = (int)pattern;
if (!pools.ContainsKey(poolKey))
{
- var prefab = UILoader.LoadPrefab(StringUtility.Contact("LocalMap_", _pattern));
+ var prefab = UILoader.LoadPrefab(StringUtility.Contact("LocalMap_", pattern));
if (prefab != null)
{
pool = GameObjectPoolManager.Instance.RequestPool(prefab);
@@ -244,7 +264,7 @@
{
var instance = pool.Request();
var npcBehaviour = instance.GetComponent<LocalMapTag>();
- npcBehaviour.tagType = _pattern;
+ npcBehaviour.tagType = pattern;
npcBehaviour.enabled = true;
return npcBehaviour;
}
@@ -254,14 +274,14 @@
}
}
- public static void Recycle(LocalMapTag _npcBehaviour)
+ public static void Recycle(LocalMapTag behaviour)
{
- var pattern = _npcBehaviour.tagType;
+ var pattern = behaviour.tagType;
GameObjectPoolManager.GameObjectPool pool;
if (pools.TryGetValue((int)pattern, out pool))
{
- _npcBehaviour.enabled = false;
- pool.Release(_npcBehaviour.gameObject);
+ behaviour.enabled = false;
+ pool.Release(behaviour.gameObject);
}
}
diff --git a/Utility/ConfigInitiator.cs b/Utility/ConfigInitiator.cs
index 7629b43..414d6a0 100644
--- a/Utility/ConfigInitiator.cs
+++ b/Utility/ConfigInitiator.cs
@@ -243,7 +243,6 @@
normalTasks.Add(new ConfigInitTask("EquipDeComposeConfig", () => { EquipDeComposeConfig.Init(); }, () => { return EquipDeComposeConfig.inited; }));
normalTasks.Add(new ConfigInitTask("EquipGSParamConfig", () => { EquipGSParamConfig.Init(); }, () => { return EquipGSParamConfig.inited; }));
normalTasks.Add(new ConfigInitTask("EquipSuitAttrConfig", () => { EquipSuitAttrConfig.Init(); }, () => { return EquipSuitAttrConfig.inited; }));
- normalTasks.Add(new ConfigInitTask("EquipSuitCompoundConfig", () => { EquipSuitCompoundConfig.Init(); }, () => { return EquipSuitCompoundConfig.inited; }));
normalTasks.Add(new ConfigInitTask("EquipWashConfig", () => { EquipWashConfig.Init(); }, () => { return EquipWashConfig.inited; }));
normalTasks.Add(new ConfigInitTask("EquipWashSpecConfig", () => { EquipWashSpecConfig.Init(); }, () => { return EquipWashSpecConfig.inited; }));
normalTasks.Add(new ConfigInitTask("FaceConfig", () => { FaceConfig.Init(); }, () => { return FaceConfig.inited; }));
--
Gitblit v1.8.0