部分LOADING_END改为LOADING_ENDING防止过图顿卡

tinymins · Dec 30, 2016 · f3b0733 · f3b0733
1 parent efc6a9c
commit f3b0733
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/MY_!Base/src/MY.Player.lua b/MY_!Base/src/MY.Player.lua
@@ -4,7 +4,7 @@
 -- @Date  : 2014-12-17 17:24:48
 -- @Email : admin@derzh.com
 -- @Last modified by:   Emil Zhai
--- @Last modified time: 2016-10-14 10:18:30
+-- @Last modified time: 2016-12-30 10:47:43
 -- @Ref: 借鉴大量海鳗源码 @haimanchajian.com
 --------------------------------------------
 --------------------------------------------
@@ -171,7 +171,7 @@ function MY.Player.GetClientInfo(bForceRefresh)
 	return m_ClientInfo or {}
 end
 MY.GetClientInfo = MY.Player.GetClientInfo
-MY.RegisterEvent('LOADING_END', MY.Player.GetClientInfo)
+MY.RegisterEvent('LOADING_ENDING', MY.Player.GetClientInfo)
 
 -- 获取唯一标识符
 local m_szUUID
@@ -483,7 +483,7 @@ function MY.Player.IsFighting()
 	return bFightState
 end
 MY.IsFighting = MY.Player.IsFighting
-MY.RegisterEvent("LOADING_END.MY-PLAYER", function() _C.bJJCStart = nil end)
+MY.RegisterEvent("LOADING_ENDING.MY-PLAYER", function() _C.bJJCStart = nil end)
 MY.RegisterEvent("ARENA_START.MY-PLAYER", function() _C.bJJCStart = true end)
 
 -------------------------------------------------------------------------------------------------------------------

diff --git a/MY_!Base/src/MY.lua b/MY_!Base/src/MY.lua
@@ -4,7 +4,7 @@
 -- @Date  : 2014-11-24 08:40:30
 -- @Email : admin@derzh.com
 -- @Last modified by:   Emil Zhai
--- @Last modified time: 2016-12-23 15:58:28
+-- @Last modified time: 2016-12-30 10:45:10
 -- @Ref: 借鉴大量海鳗源码 @haimanchajian.com
 --------------------------------------------
 -- #################################################################################################################################### --
@@ -391,7 +391,7 @@ local function OnInit()
 	-- 显示欢迎信息
 	MY.Sysmsg({_L("%s, welcome to use mingyi plugins!", GetClientPlayer().szName) .. " v" .. MY.GetVersion() .. ' Build ' .. _BUILD_})
 end
-RegisterEvent("LOADING_END", OnInit) -- 不能用FIRST_LOADING_END 不然注册快捷键就全跪了
+RegisterEvent("LOADING_ENDING", OnInit) -- 不能用FIRST_LOADING_END 不然注册快捷键就全跪了
 
 -- 注册初始化函数
 -- RegisterInit(string id, function fn) -- 注册

diff --git a/MY_ChatLog/src/MY_ChatLog.lua b/MY_ChatLog/src/MY_ChatLog.lua
@@ -197,7 +197,7 @@ local function InitDB()
 		end
 		MY.RegisterMsgMonitor('MY_ChatLog', OnMsg, t)
 	end
-	MY.RegisterEvent("LOADING_END.MY_ChatLog_Save", SaveMsg)
+	MY.RegisterEvent("LOADING_ENDING.MY_ChatLog_Save", SaveMsg)
 end
 MY.RegisterInit("MY_ChatLog_Init", InitDB)
 

diff --git a/MY_MiddleMapMark/src/MY_MiddleMapMark.lua b/MY_MiddleMapMark/src/MY_MiddleMapMark.lua
@@ -94,7 +94,7 @@ local function OnLoadingEnd()
 	DB:Execute("END TRANSACTION")
 	l_doodad = {}
 end
-MY.RegisterEvent('LOADING_END.MY_MiddleMapMark', OnLoadingEnd)
+MY.RegisterEvent('LOADING_ENDING.MY_MiddleMapMark', OnLoadingEnd)
 
 local function OnExit()
 	OnLoadingEnd()

diff --git a/MY_Recount/src/MY_Recount.Data.lua b/MY_Recount/src/MY_Recount.Data.lua
@@ -204,7 +204,7 @@ function MY_Recount.Data.SaveData()
 end
 
 -- 过图清除当前战斗数据
-MY.RegisterEvent('LOADING_END', function()
+MY.RegisterEvent('LOADING_ENDING', function()
 	MY_Recount.Data.Push()
 	MY_Recount.Data.Init(true)
 	FireUIEvent('MY_RECOUNT_NEW_FIGHT')

diff --git a/MY_Toolbox/src/MY_Toolbox.lua b/MY_Toolbox/src/MY_Toolbox.lua
@@ -4,7 +4,7 @@
 -- @Date  : 2014-05-10 08:40:30
 -- @Email : admin@derzh.com
 -- @Last modified by:   Emil Zhai
--- @Last modified time: 2016-11-11 10:09:59
+-- @Last modified time: 2016-12-30 10:49:02
 -----------------------------------------------
 local _L = MY.LoadLangPack(MY.GetAddonInfo().szRoot.."MY_Toolbox/lang/")
 local _C = {}
@@ -275,7 +275,7 @@ MY_ToolBox.ApplyConfig = function()
 	end
 
 	if MY_ToolBox.bJJCAutoSwitchTalkChannel then
-		MY.RegisterEvent('LOADING_END.MY_TOOLBOX_JJCAUTOSWITCHTALKCHANNEL', function()
+		MY.RegisterEvent('LOADING_ENDING.MY_TOOLBOX_JJCAUTOSWITCHTALKCHANNEL', function()
 			local bIsBattleField = (GetClientPlayer().GetScene().nType == MAP_TYPE.BATTLE_FIELD)
 			local nChannel, szName = EditBox_GetChannel()
 			if bIsBattleField and (nChannel == PLAYER_TALK_CHANNEL.RAID or nChannel == PLAYER_TALK_CHANNEL.TEAM) then
@@ -286,7 +286,7 @@ MY_ToolBox.ApplyConfig = function()
 			end
 		end)
 	else
-		MY.RegisterEvent('LOADING_END.MY_TOOLBOX_JJCAUTOSWITCHTALKCHANNEL')
+		MY.RegisterEvent('LOADING_ENDING.MY_TOOLBOX_JJCAUTOSWITCHTALKCHANNEL')
 	end
 
 	-- 长歌影子头顶次序
@@ -466,7 +466,7 @@ end)
 
 -- auto restore team authourity info in arena
 do local l_tTeamInfo, l_bConfigEnd
-MY.RegisterEvent("LOADING_END", function() l_bConfigEnd = false end)
+MY.RegisterEvent("LOADING_ENDING", function() l_bConfigEnd = false end)
 MY.RegisterEvent("ARENA_START", function() l_bConfigEnd = true  end)
 local function RestoreTeam()
 	local me, team = GetClientPlayer(), GetClientTeam()