Pulled in latest version changes

This commit is contained in:
gamer147
2022-07-23 00:21:14 -04:00
parent b9a5a8fe23
commit ac428166b0
32 changed files with 313 additions and 58 deletions

View File

@@ -350,9 +350,8 @@ end
if str == nil or type(str) ~= "string" then
return
end
print(str)
-- loadstring在lua5.2中已经被弃用了
--return loadstring("return " .. str)()
-- return loadstring("return " .. str)()
return load("return " .. str)()
end
@@ -418,7 +417,7 @@ end
-- 从文件中载入数据,来源对应加密数据
function table.loadkv(path)
--return table.fromstring(string.decode(string.loadkvfile(path), ""))
-- return table.fromstring(string.decode(string.loadkvfile(path), ""))
return table.fromstring(string.decode(string.loadkvfile(path), SERVER_KEY))
end