| Core/GameEngine/Model/Config/SpiritWeaponConfig.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/GameEngine/Model/Config/SpiritWeaponConfig.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Lua/Gen/SnxxzUIEquipFightPowerWrap.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Lua/Gen/SpiritWeaponConfigWrap.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Equip/EquipFightPower.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/EquipDevourWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/TaskModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/GameEngine/Model/Config/SpiritWeaponConfig.cs
@@ -1,6 +1,6 @@ //-------------------------------------------------------- // [Author]: Fish // [ Date ]: Thursday, July 04, 2019 // [ Date ]: Friday, July 05, 2019 //-------------------------------------------------------- using System.Collections.Generic; @@ -23,7 +23,8 @@ public readonly int NextItemID; public readonly int NPCID; public readonly Vector3 Rotation; public readonly float scale; public readonly float scale; public readonly Vector3 RawImgPos; public SpiritWeaponConfig() { @@ -75,7 +76,9 @@ Rotation=tables[9].Vector3Parse(); float.TryParse(tables[10],out scale); float.TryParse(tables[10],out scale); RawImgPos=tables[11].Vector3Parse(); } catch (Exception ex) { Core/GameEngine/Model/Config/SpiritWeaponConfig.cs.meta
@@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: ddd7764ed0b6a9c41b3c3e2b91efa8c8 timeCreated: 1562249090 timeCreated: 1562318273 licenseType: Pro MonoImporter: serializedVersion: 2 Lua/Gen/SnxxzUIEquipFightPowerWrap.cs
New file @@ -0,0 +1,161 @@ #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 SnxxzUIEquipFightPowerWrap { public static void __Register(RealStatePtr L) { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); System.Type type = typeof(Snxxz.UI.EquipFightPower); Utils.BeginObjectRegister(type, L, translator, 0, 2, 0, 0); Utils.RegisterFunc(L, Utils.METHOD_IDX, "GetSpiritWeaponPower", _m_GetSpiritWeaponPower); Utils.RegisterFunc(L, Utils.METHOD_IDX, "CalculatePower", _m_CalculatePower); Utils.EndObjectRegister(type, L, translator, null, null, null, null, null); Utils.BeginClassRegister(type, L, __CreateInstance, 1, 0, 0); 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) { Snxxz.UI.EquipFightPower gen_ret = new Snxxz.UI.EquipFightPower(); 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 Snxxz.UI.EquipFightPower constructor!"); } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _m_GetSpiritWeaponPower(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.EquipFightPower gen_to_be_invoked = (Snxxz.UI.EquipFightPower)translator.FastGetCSObj(L, 1); { int _itemId = LuaAPI.xlua_tointeger(L, 2); int gen_ret = gen_to_be_invoked.GetSpiritWeaponPower( _itemId ); LuaAPI.xlua_pushinteger(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_CalculatePower(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.EquipFightPower gen_to_be_invoked = (Snxxz.UI.EquipFightPower)translator.FastGetCSObj(L, 1); int gen_param_count = LuaAPI.lua_gettop(L); if(gen_param_count == 2&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 2)) { int _level = LuaAPI.xlua_tointeger(L, 2); int gen_ret = gen_to_be_invoked.CalculatePower( _level ); LuaAPI.xlua_pushinteger(L, gen_ret); return 1; } if(gen_param_count == 4&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 2)&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 3)&& translator.Assignable<System.Collections.Generic.List<Snxxz.UI.EquipFightPower.EquipInfo>>(L, 4)) { int _job = LuaAPI.xlua_tointeger(L, 2); int _level = LuaAPI.xlua_tointeger(L, 3); System.Collections.Generic.List<Snxxz.UI.EquipFightPower.EquipInfo> _equipInfos = (System.Collections.Generic.List<Snxxz.UI.EquipFightPower.EquipInfo>)translator.GetObject(L, 4, typeof(System.Collections.Generic.List<Snxxz.UI.EquipFightPower.EquipInfo>)); int gen_ret = gen_to_be_invoked.CalculatePower( _job, _level, _equipInfos ); LuaAPI.xlua_pushinteger(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 Snxxz.UI.EquipFightPower.CalculatePower!"); } } } Lua/Gen/SpiritWeaponConfigWrap.cs
@@ -21,7 +21,7 @@ { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); System.Type type = typeof(SpiritWeaponConfig); Utils.BeginObjectRegister(type, L, translator, 0, 0, 11, 0); Utils.BeginObjectRegister(type, L, translator, 0, 0, 12, 0); @@ -36,6 +36,7 @@ Utils.RegisterFunc(L, Utils.GETTER_IDX, "NPCID", _g_get_NPCID); Utils.RegisterFunc(L, Utils.GETTER_IDX, "Rotation", _g_get_Rotation); Utils.RegisterFunc(L, Utils.GETTER_IDX, "scale", _g_get_scale); Utils.RegisterFunc(L, Utils.GETTER_IDX, "RawImgPos", _g_get_RawImgPos); @@ -437,6 +438,20 @@ return 1; } [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))] static int _g_get_RawImgPos(RealStatePtr L) { try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); SpiritWeaponConfig gen_to_be_invoked = (SpiritWeaponConfig)translator.FastGetCSObj(L, 1); translator.PushUnityEngineVector3(L, gen_to_be_invoked.RawImgPos); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); } return 1; }
@@ -5,7 +5,7 @@ namespace Snxxz.UI { [XLua.LuaCallCSharp] public class EquipFightPower : Singleton<EquipFightPower> { PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } } @@ -25,6 +25,14 @@ scoreFormula = config.Numerical2; } public int GetSpiritWeaponPower(int itemId) { var score = ItemLogicUtility.Instance.GetEquipScore(itemId); Equation.Instance.Clear(); Equation.Instance.AddKeyValue("equipScoreTotal", score); return Equation.Instance.Eval<int>(scoreFormula); } public int CalculatePower(int level) { Equation.Instance.Clear(); System/KnapSack/Logic/EquipDevourWin.cs
@@ -62,14 +62,14 @@ isOpen = true; playerPack.selectDevourlist.Clear(); devourModellist = playerPack.GetDevourModellist(); colorlistObj.SetActive(false); InitUI(); } protected override void OnAfterOpen() { this.transform.SetAsLastSibling(); colorlistObj.SetActive(false); OnRefreshColor(playerPack.colorType); StartCoroutine(SetJumpIndex(0));
@@ -147,6 +147,8 @@ List<int[]> priorityTaskChains = new List<int[]>(); List<int> allowAutoTaskMapIds = new List<int>(); private float mainTaskAutoWaitTime = 0f; public readonly TaskWait taskWait = new TaskWait(); @@ -167,6 +169,12 @@ TaskAutoLv = int.Parse(Task_Auto.Numerical1); TaskAutoTime = int.Parse(Task_Auto.Numerical2); mainTaskAutoWaitTime = int.Parse(Task_Auto.Numerical3) / 1000f; var mapIds = ConfigParse.GetMultipleStr<int>(Task_Auto.Numerical4); if (mapIds != null && mapIds.Length > 0) { allowAutoTaskMapIds.AddRange(mapIds); } FairyAuTaskCount_Day = int.Parse(FuncConfigConfig.Get("RunTaskCnt").Numerical1.Split('|')[1].Split('_')[1]); FairyAuTaskCount_Round = int.Parse(FuncConfigConfig.Get("RunTaskCnt").Numerical2.Split('|')[1].Split('_')[1]); @@ -1302,6 +1310,20 @@ { try { if (!allowAutoTaskMapIds.Contains(PlayerDatas.Instance.baseData.MapID)) { return; } var _hero = PlayerDatas.Instance.hero; if (_hero != null) { if (MapArea.IsInMapArea(_hero.CurMapArea, MapArea.E_Type.Boss)) { return; } } if (MainTaskDic.ContainsKey(_taskID))//主线任务 { if (MainTaskDic[_taskID].MissionState == 0 || MainTaskDic[_taskID].MissionState == 3)
