From 8be0f21cae73089ad6c19ac4a5b72e7c8a724144 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 25 二月 2019 16:31:49 +0800
Subject: [PATCH] 3335 删除无用配置
---
Lua/Gen/WeekPartyPointConfigWrap.cs | 17 ++++++++
System/GeneralConfig/GeneralDefine.cs | 2 -
Lua/Gen/BlastFurnaceModelWrap.cs | 17 --------
System/BlastFurnace/BlastFurnaceModel.cs | 7 ---
Lua/Gen/SnxxzGameWrap.cs | 30 ++++++++++++++
5 files changed, 46 insertions(+), 27 deletions(-)
diff --git a/Lua/Gen/BlastFurnaceModelWrap.cs b/Lua/Gen/BlastFurnaceModelWrap.cs
index f06f7b2..b706783 100644
--- a/Lua/Gen/BlastFurnaceModelWrap.cs
+++ b/Lua/Gen/BlastFurnaceModelWrap.cs
@@ -21,7 +21,7 @@
{
ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
System.Type type = typeof(BlastFurnaceModel);
- Utils.BeginObjectRegister(type, L, translator, 0, 48, 26, 12);
+ Utils.BeginObjectRegister(type, L, translator, 0, 48, 25, 12);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "UnInit", _m_UnInit);
@@ -74,7 +74,6 @@
Utils.RegisterFunc(L, Utils.METHOD_IDX, "RefreshSelectRecycleAct", _e_RefreshSelectRecycleAct);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "sTreasureModel", _g_get_sTreasureModel);
- Utils.RegisterFunc(L, Utils.GETTER_IDX, "extraMats", _g_get_extraMats);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "MaxStoveLv", _g_get_MaxStoveLv);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "alchemyModellist", _g_get_alchemyModellist);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "jumpToPrescripe", _g_get_jumpToPrescripe);
@@ -1442,20 +1441,6 @@
BlastFurnaceModel gen_to_be_invoked = (BlastFurnaceModel)translator.FastGetCSObj(L, 1);
translator.Push(L, gen_to_be_invoked.sTreasureModel);
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
- return 1;
- }
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _g_get_extraMats(RealStatePtr L)
- {
- try {
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
- BlastFurnaceModel gen_to_be_invoked = (BlastFurnaceModel)translator.FastGetCSObj(L, 1);
- translator.Push(L, gen_to_be_invoked.extraMats);
} catch(System.Exception gen_e) {
return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
}
diff --git a/Lua/Gen/SnxxzGameWrap.cs b/Lua/Gen/SnxxzGameWrap.cs
index 3e08728..05051b6 100644
--- a/Lua/Gen/SnxxzGameWrap.cs
+++ b/Lua/Gen/SnxxzGameWrap.cs
@@ -21,7 +21,7 @@
{
ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
System.Type type = typeof(SnxxzGame);
- Utils.BeginObjectRegister(type, L, translator, 0, 11, 0, 0);
+ Utils.BeginObjectRegister(type, L, translator, 0, 12, 0, 0);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "AddUpdateAction", _m_AddUpdateAction);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "RemoveUpdateAction", _m_RemoveUpdateAction);
@@ -34,6 +34,7 @@
Utils.RegisterFunc(L, Utils.METHOD_IDX, "StartTimePause", _m_StartTimePause);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "MovingCamera", _m_MovingCamera);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "ResetCamera", _m_ResetCamera);
+ Utils.RegisterFunc(L, Utils.METHOD_IDX, "StopAllCameraCo", _m_StopAllCameraCo);
@@ -391,6 +392,33 @@
}
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _m_StopAllCameraCo(RealStatePtr L)
+ {
+ try {
+
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+
+ SnxxzGame gen_to_be_invoked = (SnxxzGame)translator.FastGetCSObj(L, 1);
+
+
+
+ {
+
+ gen_to_be_invoked.StopAllCameraCo( );
+
+
+
+ return 0;
+ }
+
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+
+ }
+
diff --git a/Lua/Gen/WeekPartyPointConfigWrap.cs b/Lua/Gen/WeekPartyPointConfigWrap.cs
index 610ce4b..b8929d7 100644
--- a/Lua/Gen/WeekPartyPointConfigWrap.cs
+++ b/Lua/Gen/WeekPartyPointConfigWrap.cs
@@ -21,7 +21,7 @@
{
ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
System.Type type = typeof(WeekPartyPointConfig);
- Utils.BeginObjectRegister(type, L, translator, 0, 0, 4, 0);
+ Utils.BeginObjectRegister(type, L, translator, 0, 0, 5, 0);
@@ -29,6 +29,7 @@
Utils.RegisterFunc(L, Utils.GETTER_IDX, "ImageType1", _g_get_ImageType1);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "ImageType2", _g_get_ImageType2);
Utils.RegisterFunc(L, Utils.GETTER_IDX, "name", _g_get_name);
+ Utils.RegisterFunc(L, Utils.GETTER_IDX, "Zoom", _g_get_Zoom);
@@ -332,6 +333,20 @@
return 1;
}
+ [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
+ static int _g_get_Zoom(RealStatePtr L)
+ {
+ try {
+ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
+
+ WeekPartyPointConfig gen_to_be_invoked = (WeekPartyPointConfig)translator.FastGetCSObj(L, 1);
+ LuaAPI.lua_pushnumber(L, gen_to_be_invoked.Zoom);
+ } catch(System.Exception gen_e) {
+ return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
+ }
+ return 1;
+ }
+
diff --git a/System/BlastFurnace/BlastFurnaceModel.cs b/System/BlastFurnace/BlastFurnaceModel.cs
index e5886bb..60544c4 100644
--- a/System/BlastFurnace/BlastFurnaceModel.cs
+++ b/System/BlastFurnace/BlastFurnaceModel.cs
@@ -25,7 +25,6 @@
private FuncConfigConfig _blastFurnaceExpModel;
private ItemConfig chinItemModel;
private Dictionary<int, int> _blastFurnaceExpDict;
- public int[] extraMats { get; private set; }
public int MaxStoveLv { get; private set; }
public List<AlchemyConfig> alchemyModellist { get; private set; }
@@ -47,12 +46,6 @@
ParseAlchemyConfig();
ParseAlchemySpecConfig();
_blastFurnaceExpDict = new Dictionary<int, int>();
- extraMats = null;
- _upTreasureRateModel = FuncConfigConfig.Get("TreasureUpRateItem");
- if (_upTreasureRateModel != null)
- {
- extraMats = ConfigParse.GetMultipleStr<int>(_upTreasureRateModel.Numerical2);
- }
List<RefineStoveConfig> stovelist = RefineStoveConfig.GetValues();
MaxStoveLv = 0;
if (stovelist != null)
diff --git a/System/GeneralConfig/GeneralDefine.cs b/System/GeneralConfig/GeneralDefine.cs
index 0c169ae..8abe825 100644
--- a/System/GeneralConfig/GeneralDefine.cs
+++ b/System/GeneralConfig/GeneralDefine.cs
@@ -11,7 +11,6 @@
{
public static int greatMasterStartLV { get; private set; }
public static int playerMaxLevel { get; private set; }
- public static float potentialUpSuccessRecommend { get; private set; }
public static int[] kylinHomeCollectItems;
public static List<int> dailyQuestOpenTime;
public static int flyBootItemId { get; private set; }
@@ -184,7 +183,6 @@
CompareEquipPlaces = GetIntArray("EquipUpType");
greatMasterStartLV = GetInt("GreatMasterStartLV");
playerMaxLevel = GetInt("PlayerMaxLV");
- potentialUpSuccessRecommend = GetFloat("SPSkillType", 2) * 0.0001f;
kylinHomeCollectItems = GetIntArray("KirinNpc", 2);
dailyQuestOpenTime = GetTimeArray("ActionTime", 1);
flyBootItemId = GetInt("TransportPay");
--
Gitblit v1.8.0