From f2b432fa001dbff739f41855d0343a9b7835d650 Mon Sep 17 00:00:00 2001
From: Muscipular <m@ljw.im>
Date: Sun, 26 Sep 2021 21:28:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=83=A8=E5=88=86debug?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=20=E5=AE=8C=E5=96=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libs/GlobalEvents.lua | 12 ++++++++++++
 libs/ModuleBase.lua   | 10 +++++++++-
 libs/ModuleSystem.lua |  1 +
 libs/sql.lua          |  7 ++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/libs/GlobalEvents.lua b/libs/GlobalEvents.lua
index d701ce8..79eaada 100644
--- a/libs/GlobalEvents.lua
+++ b/libs/GlobalEvents.lua
@@ -80,6 +80,13 @@ end
 
 local eventCallbacks = {}
 local ix = 0;
+
+--- 注册全局事件
+---@param eventName string
+---@param fn function
+---@param moduleName string
+---@param extraSign string|nil
+---@return number 全局注册Index
 function _G.regGlobalEvent(eventName, fn, moduleName, extraSign)
   extraSign = extraSign or ''
   logInfo('GlobalEvent', 'regGlobalEvent', eventName, moduleName, ix + 1, eventCallbacks[eventName .. extraSign])
@@ -111,6 +118,11 @@ function _G.regGlobalEvent(eventName, fn, moduleName, extraSign)
   return ix;
 end
 
+--- 移除全局事件
+---@param eventName string
+---@param fnIndex number 全局注册Index
+---@param moduleName string
+---@param extraSign string|nil
 function _G.removeGlobalEvent(eventName, fnIndex, moduleName, extraSign)
   extraSign = extraSign or ''
   logInfo('GlobalEvent', 'removeGlobalEvent', eventName .. extraSign, moduleName, fnIndex)
diff --git a/libs/ModuleBase.lua b/libs/ModuleBase.lua
index 48d10cf..17dc3bc 100644
--- a/libs/ModuleBase.lua
+++ b/libs/ModuleBase.lua
@@ -1,7 +1,7 @@
 ---@class ModuleBase
 ---@field name string
 ---@field lastIx number
----@field parts table[]
+---@field parts ModulePart[]
 ---@field migrations {version:number,name:string,value:string|function}[]|nil
 ---@field callbacks {fnCb: function, fnIndex: number, key: string}[]
 local ModuleBase = { name = '', callbacks = {}, lastIx = 0, migrations = nil };
@@ -62,6 +62,14 @@ function ModuleBase:createModule(name, depParts)
   return SubModule;
 end
 
+---@class ModulePart
+---@field name string
+---@field onLoad function
+---@field onUnload function
+---@field ___isPart boolean
+
+---@param name string
+---@return ModulePart
 function ModuleBase:createPart(name)
   local SubModule = {
     name = name,
diff --git a/libs/ModuleSystem.lua b/libs/ModuleSystem.lua
index 6ba33b4..355e108 100644
--- a/libs/ModuleSystem.lua
+++ b/libs/ModuleSystem.lua
@@ -25,6 +25,7 @@ end
 ---@field simpleModule boolean 是否兼容老的luaModule
 ---@field absolutePath boolean
 
+---解决兼容普通lua的问题
 local function forSimpleModule()
   local callInCtx;
   local function loadFile(file, cb)
diff --git a/libs/sql.lua b/libs/sql.lua
index 530316b..596fede 100644
--- a/libs/sql.lua
+++ b/libs/sql.lua
@@ -1,5 +1,6 @@
 _G.SQL = _G.SQL or {}
 local SQL = _G.SQL;
+
 function SQL.sqlValue(s)
   if s == nil then
     return 'null'
@@ -22,7 +23,8 @@ function SQL.sqlValue(s)
   end
   return 'null';
 end
-function SQL.querySQL(sql)
+
+function SQL.querySQL(sql, returnNil)
   local result = SQL.Run(sql)
   if type(result) == "table" then
     local res = {}
@@ -36,6 +38,9 @@ function SQL.querySQL(sql)
     end
     return res
   end
+  if result == SQL.CONST_RET_NO_ROW and returnNil then
+    return nil;
+  end
   return result
 end
 SQL.CONST_RET_NO_ROW = -3;