From 104f3128c8f94f62fab6f5cf8f49422e708e733a Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 04 三月 2019 16:32:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Lua/Gen/AnyCountDownUtilityWrap.cs.meta | 2
Lua/Gen/SFXPlayUtilityWrap.cs.meta | 2
Core/Utilities/AnyCountDownUtility.cs | 13 +-----
Lua/Gen/SFXPlayUtilityWrap.cs | 30 --------------
Utility/ConfigInitiator.cs | 7 ++-
Lua/Gen/AnyCountDownUtilityWrap.cs | 30 --------------
Lua/Gen/XLuaGenAutoRegister.cs.meta | 2
Core/GameEngine/Login/LaunchPostProcess.cs | 2 -
Core/SFX/SFXPlayUtility.cs | 7 ---
9 files changed, 13 insertions(+), 82 deletions(-)
diff --git a/Core/GameEngine/Login/LaunchPostProcess.cs b/Core/GameEngine/Login/LaunchPostProcess.cs
index a8c4bb7..759d7c3 100644
--- a/Core/GameEngine/Login/LaunchPostProcess.cs
+++ b/Core/GameEngine/Login/LaunchPostProcess.cs
@@ -36,8 +36,6 @@
StatusMgr.Instance.Init();
GAMgr.Instance.Init();
FlyObjectManager.Instance.Initialize();
- SFXPlayUtility.Instance.Initialize();
- AnyCountDownUtility.Instance.Initialize();
MapTransferUtility.Instance.Initialize();
NewBieCenter.Instance.Init();
diff --git a/Core/SFX/SFXPlayUtility.cs b/Core/SFX/SFXPlayUtility.cs
index d737d7e..f14a07a 100644
--- a/Core/SFX/SFXPlayUtility.cs
+++ b/Core/SFX/SFXPlayUtility.cs
@@ -8,12 +8,7 @@
public class SFXPlayUtility : SingletonMonobehaviour<SFXPlayUtility>
{
- private Dictionary<int, ObjectPool<SFXController>> m_PoolDict;
-
- public void Initialize()
- {
- m_PoolDict = new Dictionary<int, ObjectPool<SFXController>>();
- }
+ private Dictionary<int, ObjectPool<SFXController>> m_PoolDict=new Dictionary<int, ObjectPool<SFXController>>();
public SFXController PlayEffectAsync(int id, Transform parent, float scale = 1)
{
diff --git a/Core/Utilities/AnyCountDownUtility.cs b/Core/Utilities/AnyCountDownUtility.cs
index f35ba73..fb4032b 100644
--- a/Core/Utilities/AnyCountDownUtility.cs
+++ b/Core/Utilities/AnyCountDownUtility.cs
@@ -5,16 +5,9 @@
[XLua.LuaCallCSharp]
public class AnyCountDownUtility : SingletonMonobehaviour<AnyCountDownUtility>
{
- private Stack<CDItem> m_FreeStack;
- public List<CDItem> m_ActiveList;
- public List<CDItem> m_CacheRemoveList;
-
- public void Initialize()
- {
- m_FreeStack = new Stack<CDItem>();
- m_ActiveList = new List<CDItem>();
- m_CacheRemoveList = new List<CDItem>();
- }
+ private Stack<CDItem> m_FreeStack = new Stack<CDItem>();
+ public List<CDItem> m_ActiveList = new List<CDItem>();
+ public List<CDItem> m_CacheRemoveList = new List<CDItem>();
public void Create(float cd, GActor target, UnityAction callback)
{
diff --git a/Lua/Gen/AnyCountDownUtilityWrap.cs b/Lua/Gen/AnyCountDownUtilityWrap.cs
index bbe282c..62220b8 100644
--- a/Lua/Gen/AnyCountDownUtilityWrap.cs
+++ b/Lua/Gen/AnyCountDownUtilityWrap.cs
@@ -21,9 +21,8 @@
{
ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
System.Type type = typeof(AnyCountDownUtility);
- Utils.BeginObjectRegister(type, L, translator, 0, 2, 2, 2);
+ Utils.BeginObjectRegister(type, L, translator, 0, 1, 2, 2);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "Initialize", _m_Initialize);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "Create", _m_Create);
@@ -76,33 +75,6 @@
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_Initialize(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- AnyCountDownUtility gen_to_be_invoked = (AnyCountDownUtility)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.Initialize( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _m_Create(RealStatePtr L)
diff --git a/Lua/Gen/AnyCountDownUtilityWrap.cs.meta b/Lua/Gen/AnyCountDownUtilityWrap.cs.meta
index 31b48a6..6afb8c4 100644
--- a/Lua/Gen/AnyCountDownUtilityWrap.cs.meta
+++ b/Lua/Gen/AnyCountDownUtilityWrap.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: a5f402668aaaf4c4caf03164f94504d7
-timeCreated: 1550120584
+timeCreated: 1551681032
licenseType: Pro
MonoImporter:
serializedVersion: 2
diff --git a/Lua/Gen/SFXPlayUtilityWrap.cs b/Lua/Gen/SFXPlayUtilityWrap.cs
index 0f4565c..ee92d4a 100644
--- a/Lua/Gen/SFXPlayUtilityWrap.cs
+++ b/Lua/Gen/SFXPlayUtilityWrap.cs
@@ -21,9 +21,8 @@
{
ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
System.Type type = typeof(SFXPlayUtility);
- Utils.BeginObjectRegister(type, L, translator, 0, 9, 0, 0);
+ Utils.BeginObjectRegister(type, L, translator, 0, 8, 0, 0);
- Utils.RegisterFunc(L, Utils.METHOD_IDX, "Initialize", _m_Initialize);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "PlayEffectAsync", _m_PlayEffectAsync);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "PlayBattleEffect", _m_PlayBattleEffect);
Utils.RegisterFunc(L, Utils.METHOD_IDX, "Play", _m_Play);
@@ -79,33 +78,6 @@
-
- [MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
- static int _m_Initialize(RealStatePtr L)
- {
- try {
-
- ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L);
-
-
- SFXPlayUtility gen_to_be_invoked = (SFXPlayUtility)translator.FastGetCSObj(L, 1);
-
-
-
- {
-
- gen_to_be_invoked.Initialize( );
-
-
-
- return 0;
- }
-
- } catch(System.Exception gen_e) {
- return LuaAPI.luaL_error(L, "c# exception:" + gen_e);
- }
-
- }
[MonoPInvokeCallbackAttribute(typeof(LuaCSFunction))]
static int _m_PlayEffectAsync(RealStatePtr L)
diff --git a/Lua/Gen/SFXPlayUtilityWrap.cs.meta b/Lua/Gen/SFXPlayUtilityWrap.cs.meta
index 097b690..cb24d16 100644
--- a/Lua/Gen/SFXPlayUtilityWrap.cs.meta
+++ b/Lua/Gen/SFXPlayUtilityWrap.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: d46860da64feb064193f6a4aee052f55
-timeCreated: 1550120587
+timeCreated: 1551681032
licenseType: Pro
MonoImporter:
serializedVersion: 2
diff --git a/Lua/Gen/XLuaGenAutoRegister.cs.meta b/Lua/Gen/XLuaGenAutoRegister.cs.meta
index 6dc2370..125967a 100644
--- a/Lua/Gen/XLuaGenAutoRegister.cs.meta
+++ b/Lua/Gen/XLuaGenAutoRegister.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: ff2dde43802d1d14795873c131842a1e
-timeCreated: 1551323946
+timeCreated: 1551681032
licenseType: Pro
MonoImporter:
serializedVersion: 2
diff --git a/Utility/ConfigInitiator.cs b/Utility/ConfigInitiator.cs
index 17bf349..07932ea 100644
--- a/Utility/ConfigInitiator.cs
+++ b/Utility/ConfigInitiator.cs
@@ -38,7 +38,8 @@
&& CreateRoleConfig.inited
&& JobSetupConfig.inited
&& ModelResConfig.inited
- && GodWeaponConfig.inited;
+ && GodWeaponConfig.inited
+ && GodWeaponEffectConfig.inited;
}
}
@@ -86,7 +87,8 @@
priorTasks.Add(new ConfigInitTask("CreateRoleConfig", () => { CreateRoleConfig.Init(); }, () => { return CreateRoleConfig.inited; }));
priorTasks.Add(new ConfigInitTask("JobSetupConfig", () => { JobSetupConfig.Init(); }, () => { return JobSetupConfig.inited; }));
priorTasks.Add(new ConfigInitTask("ModelResConfig", () => { ModelResConfig.Init(); }, () => { return ModelResConfig.inited; }));
- priorTasks.Add(new ConfigInitTask("GodWeaponConfig", () => { GodWeaponConfig.Init(); }, () => { return GodWeaponConfig.inited; }));
+ priorTasks.Add(new ConfigInitTask("GodWeaponConfig", () => { GodWeaponConfig.Init(); }, () => { return GodWeaponConfig.inited; }));
+ priorTasks.Add(new ConfigInitTask("GodWeaponEffectConfig", () => { GodWeaponEffectConfig.Init(); }, () => { return GodWeaponEffectConfig.inited; }));
priorTasks.Add(new ConfigInitTask("TASKINFOConfig", () => { TASKINFOConfig.Init(); }, () => { return TASKINFOConfig.inited; }));
priorTasks.Add(new ConfigInitTask("mapnpcConfig", () => { mapnpcConfig.Init(); }, () => { return mapnpcConfig.inited; }));
priorTasks.Add(new ConfigInitTask("SkillConfig", () => { SkillConfig.Init(); }, () => { return SkillConfig.inited; }));
@@ -263,7 +265,6 @@
normalTasks.Add(new ConfigInitTask("GatherSoulPropertyConfig", () => { GatherSoulPropertyConfig.Init(); }, () => { return GatherSoulPropertyConfig.inited; }));
normalTasks.Add(new ConfigInitTask("GetItemWaysConfig", () => { GetItemWaysConfig.Init(); }, () => { return GetItemWaysConfig.inited; }));
normalTasks.Add(new ConfigInitTask("GmCmdConfig", () => { GmCmdConfig.Init(); }, () => { return GmCmdConfig.inited; }));
- normalTasks.Add(new ConfigInitTask("GodWeaponEffectConfig", () => { GodWeaponEffectConfig.Init(); }, () => { return GodWeaponEffectConfig.inited; }));
normalTasks.Add(new ConfigInitTask("GuardConfig", () => { GuardConfig.Init(); }, () => { return GuardConfig.inited; }));
normalTasks.Add(new ConfigInitTask("GuideConfig", () => { GuideConfig.Init(); }, () => { return GuideConfig.inited; }));
normalTasks.Add(new ConfigInitTask("HolidayHomingConfig", () => { HolidayHomingConfig.Init(); }, () => { return HolidayHomingConfig.inited; }));
--
Gitblit v1.8.0