huangyuhao hace 1 año
padre
commit
8237025937

+ 2 - 1
dev/utils/util_3rd.lua

@@ -6,6 +6,7 @@ Date: 2023-11-19 21:20:05
6
 LastEditors: Neo,Huang
6
 LastEditors: Neo,Huang
7
 LastEditTime: 2023-11-19 21:23:40
7
 LastEditTime: 2023-11-19 21:23:40
8
 --]]
8
 --]]
9
+local skynet = require("skynet")
9
 local const = require("const.const")
10
 local const = require("const.const")
10
 local httpc = require("http.httpc")
11
 local httpc = require("http.httpc")
11
 local md5 = require("md5")
12
 local md5 = require("md5")
@@ -29,7 +30,7 @@ function root:is_sensitive(words)
29
             word = word .. c
30
             word = word .. c
30
         end
31
         end
31
     end
32
     end
32
-    set_log("is_sensitive words[%s] word[%s]", tostring(words), tostring(word))
33
+    log.info("is_sensitive words[%s] word[%s]", tostring(words), tostring(word))
33
     if is_nil(word) then
34
     if is_nil(word) then
34
         return false
35
         return false
35
     end
36
     end

+ 1 - 1
nodes/game/lib/role.lua

@@ -60,7 +60,7 @@ function root:load_modules()
60
 end
60
 end
61
 
61
 
62
 -- 登出各个模块
62
 -- 登出各个模块
63
-function root:logout_modules()
63
+function root:logout()
64
     for _, cname in pairs(self.moduleList) do
64
     for _, cname in pairs(self.moduleList) do
65
         self[cname]:do_logout()
65
         self[cname]:do_logout()
66
         self[cname]:backup_to_db()
66
         self[cname]:backup_to_db()

+ 3 - 3
nodes/game/lib/roleMgr.lua

@@ -2,9 +2,9 @@
2
 Descripttion:角色管理
2
 Descripttion:角色管理
3
 version:
3
 version:
4
 Author: Neo,Huang
4
 Author: Neo,Huang
5
-Date: 2021-08-31 20:45:03
5
+Date: 2023-11-08 22:38:51
6
 LastEditors: Neo,Huang
6
 LastEditors: Neo,Huang
7
-LastEditTime: 2021-09-24 09:55:30
7
+LastEditTime: 2023-11-23 23:31:37
8
 --]]
8
 --]]
9
 local role = require "role"
9
 local role = require "role"
10
 
10
 
@@ -30,7 +30,7 @@ function root:logout_role(uid)
30
     end
30
     end
31
 
31
 
32
     log.print("logout_role %s", uid)
32
     log.print("logout_role %s", uid)
33
-    roleObj:logout_modules()
33
+    roleObj:logout()
34
     self.roleList[uid] = nil
34
     self.roleList[uid] = nil
35
     self.amount = self.amount - 1
35
     self.amount = self.amount - 1
36
 end
36
 end

+ 3 - 3
nodes/global/service/itemrecordSrv.lua

@@ -1,10 +1,10 @@
1
 --[[
1
 --[[
2
-Descripttion:战斗记录
2
+Descripttion:明细
3
 version:
3
 version:
4
 Author: Neo,Huang
4
 Author: Neo,Huang
5
-Date: 2023-11-18 13:56:05
5
+Date: 2023-11-23 23:22:46
6
 LastEditors: Neo,Huang
6
 LastEditors: Neo,Huang
7
-LastEditTime: 2023-11-18 13:57:08
7
+LastEditTime: 2023-11-23 23:23:57
8
 --]]
8
 --]]
9
 local timer = require("timer")
9
 local timer = require("timer")
10
 local baseService = require("baseService")
10
 local baseService = require("baseService")

+ 0 - 1
nodes/web/controllers/usr.lua

@@ -4,7 +4,6 @@ local serverLogUtil = require("utils.serverLogUtil")
4
 local util_user = require("utils.util_user")
4
 local util_user = require("utils.util_user")
5
 local util_global = require("utils.util_global")
5
 local util_global = require("utils.util_global")
6
 local lib_game_mysql = require("lib_game_mysql")
6
 local lib_game_mysql = require("lib_game_mysql")
7
-local lib_game_redis = require("lib_game_redis")
8
 local util_3rd = require("utils.util_3rd")
7
 local util_3rd = require("utils.util_3rd")
9
 
8
 
10
 local accountModule = require("modules.account")
9
 local accountModule = require("modules.account")

+ 1 - 1
nodes/web/lib/webapp.lua

@@ -204,7 +204,7 @@ local function POST(path, body, response)
204
 
204
 
205
 	local func = controller[name]
205
 	local func = controller[name]
206
 	if not func then
206
 	if not func then
207
-		log.error("controller[%s] has no method[%s] ", controllerName, method)
207
+		log.error("controller[%s] has no method[%s] ", controllerName, name)
208
 		return l_get_unmatch_process(res)
208
 		return l_get_unmatch_process(res)
209
 	end
209
 	end
210
 	local isGmJson = controllerName == "gm"
210
 	local isGmJson = controllerName == "gm"