diff --git a/SoloKing/DeleteFiles.txt b/SoloKing/DeleteFiles.txt index e69de29b..ff66f7b9 100644 --- a/SoloKing/DeleteFiles.txt +++ b/SoloKing/DeleteFiles.txt @@ -0,0 +1,17 @@ +SoloKing/Script/Global/Tool/StateMachine.lua +SoloKing/Script/Global/RepData.lua +SoloKing/Script/Global/Plugin/Plugins/MapTool.lua +SoloKing/Script/Global/Plugin/Plugins/BuffManager_PC.lua +SoloKing/Script/Global/Plugin/Plugins/MiniConfig.lua +SoloKing/Script/Global/Plugin/Plugins/ArchiveManager.lua +SoloKing/Script/Global/Plugin/Plugins/SkillConfig.lua +SoloKing/Script/Global/Plugin/Plugins/PoisonManager.lua +SoloKing/Script/Global/Plugin/Plugins/ServerTimeManager.lua +SoloKing/Script/Global/Plugin/Plugins/Skill/Skill_Base.lua +SoloKing/Script/Global/Plugin/Plugins/BuffConfig.lua +SoloKing/Script/Global/Plugin/Plugins/BuffManager.lua +SoloKing/Script/Global/Plugin/Plugins/Buff/Buff_Base.lua +SoloKing/Script/Global/Plugin/Plugins/SkillManager.lua +SoloKing/Script/Global/Plugin/PluginConfig.lua +SoloKing/Script/Global/Plugin/PluginManager.lua +SoloKing/Script/Global/Plugin/MiniManager.lua diff --git a/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua b/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua index 36daf679..67ad34b6 100644 --- a/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua +++ b/SoloKing/Script/Global/Mini/Script/Mini_Solo.lua @@ -110,10 +110,6 @@ function Mini_Solo:ShowSelectWeaponUI() end end -function Mini_Solo:AddPlayer(PlayerKey) - self:LoadArchive(); -end - function Mini_Solo:OnClientAlready() if IsServer then for _, PS in pairs(UGCGameSystem.GetAllPlayerController(false)) do @@ -1640,6 +1636,15 @@ function Mini_Solo:PlayerAddWeapon(PlayerKey, Weapon) if Weapon then UGCLogSystem.Log("[Mini_Solo:PlayerAddWeapon] 开始添加") Pawn:AddItem(Weapon, 1, true, EFillBulletType.ClipInfinite); + + -- 添加其他倍镜 + local NeedAddTelescope = ItemTool.GetOtherTelescopes(Pawn); + -- 检查当前武器上是否有倍镜 + + for i, v in pairs(NeedAddTelescope) do + --Pawn:AddItem(i, ); + end + -- 启动检测 self:CloseCheckWeaponTimer(); self.CheckWeaponTimer = UGCEventSystem.SetTimerLoop(GameState, function() diff --git a/SoloKing/Script/Global/Table/A_TableInclude.lua b/SoloKing/Script/Global/Table/A_TableInclude.lua index ccf9e648..713df6db 100644 --- a/SoloKing/Script/Global/Table/A_TableInclude.lua +++ b/SoloKing/Script/Global/Table/A_TableInclude.lua @@ -28,7 +28,6 @@ function UnableTable() WeaponTypeParts = nil; WeaponParts = nil; NamedWeaponParts = nil; - WeaponSuits = nil; WeaponNameTable = nil; WeaponAmmoIdMap = nil; AmmoTable = nil; diff --git a/SoloKing/Script/Global/Tool/GlobalBeginTool.lua b/SoloKing/Script/Global/Tool/GlobalBeginTool.lua deleted file mode 100644 index 21a7c1df..00000000 --- a/SoloKing/Script/Global/Tool/GlobalBeginTool.lua +++ /dev/null @@ -1,37 +0,0 @@ -GlobalBeginTool = {}; ----@type table 回调函数 -GlobalBeginTool.BeginPlayFunctions = {}; - -GlobalBeginTool.ClientAlreadyFunctions = {}; - ----@generic T ----@param o T ----@param f fun(o:T) 初始化函数 -function GlobalBeginTool:AddBeginPlay(o, f) - if o == nil then return end - if GlobalBeginTool.BeginPlayFunctions[o] ~= nil then return end - if type(f) ~= "function" then return end - GlobalBeginTool.BeginPlayFunctions[o] = f; -end - ----@generic T ----@param o T ----@param f fun(o:T) 初始化函数 -function GlobalBeginTool:AddClientAlready(o, f) - if o == nil then return end - if GlobalBeginTool.ClientAlreadyFunctions[o] ~= nil then return end - if type(f) ~= "function" then return end - GlobalBeginTool.ClientAlreadyFunctions[o] = f; -end - -function GlobalBeginTool:ReceiveBeginPlay() - for o, f in pairs(self.BeginPlayFunctions) do f(o); end - self.BeginPlayFunctions = {}; -end - -function GlobalBeginTool:ReceiveClientAlready() - for o, f in pairs(self.ClientAlreadyFunctions) do f(o); end - self.ClientAlreadyFunctions = {}; -end - -return GlobalBeginTool; \ No newline at end of file diff --git a/SoloKing/Script/Global/Tool/ItemTool.lua b/SoloKing/Script/Global/Tool/ItemTool.lua index 268317d3..df86756f 100644 --- a/SoloKing/Script/Global/Tool/ItemTool.lua +++ b/SoloKing/Script/Global/Tool/ItemTool.lua @@ -571,6 +571,19 @@ function ItemTool.GetWeaponPartList(Weapon) return Parts; end +function ItemTool.GetWeaponPartMap(Weapon) + local Parts = {}; + if Weapon and UE.IsValid(Weapon) and ItemTool.IsShootWeapon(Weapon) then + local ItemDefineIDs = UGCGunSystem.GetWeaponAllAttachmentIDList(Weapon); + for i, ItemDefineID in pairs(ItemDefineIDs) do + if ItemDefineID.bValidItem and ItemDefineID.bValidInstance then + Parts[ItemDefineID.TypeSpecificID] = 1; + end + end + end + return Parts; +end + function ItemTool.GetCurrWeaponPartList(Pawn) local Weapon = UGCWeaponManagerSystem.GetCurrentWeapon(Pawn); return ItemTool.GetWeaponPartList(Weapon); @@ -733,3 +746,27 @@ function ItemTool.GetFirstWeaponID(PlayerKey) return nil; end +--- 给玩家添加其他倍镜 +function ItemTool.GetOtherTelescopes(Pawn) + local NeedAdd = {}; + for i, Enum in pairs(ShootWeaponEnums) do + local Weapon = UGCWeaponManagerSystem.GetWeaponBySlot(Pawn, Enum); + if ItemTool.IsShootWeapon(Weapon) then + local WeaponID = Weapon:GetWeaponItemID(); + if WeaponSuits[WeaponID] then + if WeaponSuits[WeaponID][EWeaponPartType.Telescope] then + for _, PartID in pairs(WeaponSuits[WeaponID][EWeaponPartType.Telescope]) do + NeedAdd[PartID] = 1; + end + local PartList = ItemTool.GetWeaponPartMap(Weapon) + for PartID, C in pairs(PartList) do + if NeedAdd[PartID] then + NeedAdd[PartID] = nil; + end + end + end + end + end + end + return NeedAdd; +end diff --git a/SoloKing/Script/Global/Tool/UGCSystemLibrary.lua b/SoloKing/Script/Global/Tool/UGCSystemLibrary.lua index d07dfe52..19e7686c 100644 --- a/SoloKing/Script/Global/Tool/UGCSystemLibrary.lua +++ b/SoloKing/Script/Global/Tool/UGCSystemLibrary.lua @@ -153,6 +153,23 @@ function UGCSystemLibrary.AsyncLoadAsset(AssetPath, CallBackFunc, Obj, SaveAsset end end +--- 通过路径获取DataTable +---@param DataTablePath string +---@param ToNumberKey bool 是否将Key值转化为Number类型再返回 +function UGCSystemLibrary.GetDataTableFromPath(DataTablePath, ToNumberKey) + local ResDataTable = Gameplay.GetTable(DataTablePath) + + if ToNumberKey then + local Res = {} + for i, v in pairs(ResDataTable) do + Res[tonumber(i)] = v + end + return Res + else + return ResDataTable + end +end + ---@param AssetPath:string ---@param SaveAsset:bool 是否保存 function UGCSystemLibrary.LoadAsset(AssetPath, SaveAsset) diff --git a/SoloKing/Script/Global/Tool/json.lua b/SoloKing/Script/Global/Tool/json.lua deleted file mode 100644 index 711ef786..00000000 --- a/SoloKing/Script/Global/Tool/json.lua +++ /dev/null @@ -1,388 +0,0 @@ --- --- json.lua --- --- Copyright (c) 2020 rxi --- --- Permission is hereby granted, free of charge, to any person obtaining a copy of --- this software and associated documentation files (the "Software"), to deal in --- the Software without restriction, including without limitation the rights to --- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies --- of the Software, and to permit persons to whom the Software is furnished to do --- so, subject to the following conditions: --- --- The above copyright notice and this permission notice shall be included in all --- copies or substantial portions of the Software. --- --- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR --- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, --- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE --- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER --- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, --- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE --- SOFTWARE. --- - -local json = { _version = "0.1.2" } - -------------------------------------------------------------------------------- --- Encode -------------------------------------------------------------------------------- - -local encode - -local escape_char_map = { - [ "\\" ] = "\\", - [ "\"" ] = "\"", - [ "\b" ] = "b", - [ "\f" ] = "f", - [ "\n" ] = "n", - [ "\r" ] = "r", - [ "\t" ] = "t", -} - -local escape_char_map_inv = { [ "/" ] = "/" } -for k, v in pairs(escape_char_map) do - escape_char_map_inv[v] = k -end - - -local function escape_char(c) - return "\\" .. (escape_char_map[c] or string.format("u%04x", c:byte())) -end - - -local function encode_nil(val) - return "null" -end - - -local function encode_table(val, stack) - local res = {} - stack = stack or {} - - -- Circular reference? - if stack[val] then error("circular reference") end - - stack[val] = true - - if rawget(val, 1) ~= nil or next(val) == nil then - -- Treat as array -- check keys are valid and it is not sparse - local n = 0 - for k in pairs(val) do - if type(k) ~= "number" then - error("invalid table: mixed or invalid key types") - end - n = n + 1 - end - if n ~= #val then - error("invalid table: sparse array") - end - -- Encode - for i, v in ipairs(val) do - table.insert(res, encode(v, stack)) - end - stack[val] = nil - return "[" .. table.concat(res, ",") .. "]" - - else - -- Treat as an object - for k, v in pairs(val) do - if type(k) ~= "string" then - error("invalid table: mixed or invalid key types") - end - table.insert(res, encode(k, stack) .. ":" .. encode(v, stack)) - end - stack[val] = nil - return "{" .. table.concat(res, ",") .. "}" - end -end - - -local function encode_string(val) - return '"' .. val:gsub('[%z\1-\31\\"]', escape_char) .. '"' -end - - -local function encode_number(val) - -- Check for NaN, -inf and inf - if val ~= val or val <= -math.huge or val >= math.huge then - error("unexpected number value '" .. tostring(val) .. "'") - end - return string.format("%.14g", val) -end - - -local type_func_map = { - [ "nil" ] = encode_nil, - [ "table" ] = encode_table, - [ "string" ] = encode_string, - [ "number" ] = encode_number, - [ "boolean" ] = tostring, -} - - -encode = function(val, stack) - local t = type(val) - local f = type_func_map[t] - if f then - return f(val, stack) - end - error("unexpected type '" .. t .. "'") -end - - -function json.encode(val) - return ( encode(val) ) -end - - -------------------------------------------------------------------------------- --- Decode -------------------------------------------------------------------------------- - -local parse - -local function create_set(...) - local res = {} - for i = 1, select("#", ...) do - res[ select(i, ...) ] = true - end - return res -end - -local space_chars = create_set(" ", "\t", "\r", "\n") -local delim_chars = create_set(" ", "\t", "\r", "\n", "]", "}", ",") -local escape_chars = create_set("\\", "/", '"', "b", "f", "n", "r", "t", "u") -local literals = create_set("true", "false", "null") - -local literal_map = { - [ "true" ] = true, - [ "false" ] = false, - [ "null" ] = nil, -} - - -local function next_char(str, idx, set, negate) - for i = idx, #str do - if set[str:sub(i, i)] ~= negate then - return i - end - end - return #str + 1 -end - - -local function decode_error(str, idx, msg) - local line_count = 1 - local col_count = 1 - for i = 1, idx - 1 do - col_count = col_count + 1 - if str:sub(i, i) == "\n" then - line_count = line_count + 1 - col_count = 1 - end - end - error( string.format("%s at line %d col %d", msg, line_count, col_count) ) -end - - -local function codepoint_to_utf8(n) - -- http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=iws-appendixa - local f = math.floor - if n <= 0x7f then - return string.char(n) - elseif n <= 0x7ff then - return string.char(f(n / 64) + 192, n % 64 + 128) - elseif n <= 0xffff then - return string.char(f(n / 4096) + 224, f(n % 4096 / 64) + 128, n % 64 + 128) - elseif n <= 0x10ffff then - return string.char(f(n / 262144) + 240, f(n % 262144 / 4096) + 128, - f(n % 4096 / 64) + 128, n % 64 + 128) - end - error( string.format("invalid unicode codepoint '%x'", n) ) -end - - -local function parse_unicode_escape(s) - local n1 = tonumber( s:sub(1, 4), 16 ) - local n2 = tonumber( s:sub(7, 10), 16 ) - -- Surrogate pair? - if n2 then - return codepoint_to_utf8((n1 - 0xd800) * 0x400 + (n2 - 0xdc00) + 0x10000) - else - return codepoint_to_utf8(n1) - end -end - - -local function parse_string(str, i) - local res = "" - local j = i + 1 - local k = j - - while j <= #str do - local x = str:byte(j) - - if x < 32 then - decode_error(str, j, "control character in string") - - elseif x == 92 then -- `\`: Escape - res = res .. str:sub(k, j - 1) - j = j + 1 - local c = str:sub(j, j) - if c == "u" then - local hex = str:match("^[dD][89aAbB]%x%x\\u%x%x%x%x", j + 1) - or str:match("^%x%x%x%x", j + 1) - or decode_error(str, j - 1, "invalid unicode escape in string") - res = res .. parse_unicode_escape(hex) - j = j + #hex - else - if not escape_chars[c] then - decode_error(str, j - 1, "invalid escape char '" .. c .. "' in string") - end - res = res .. escape_char_map_inv[c] - end - k = j + 1 - - elseif x == 34 then -- `"`: End of string - res = res .. str:sub(k, j - 1) - return res, j + 1 - end - - j = j + 1 - end - - decode_error(str, i, "expected closing quote for string") -end - - -local function parse_number(str, i) - local x = next_char(str, i, delim_chars) - local s = str:sub(i, x - 1) - local n = tonumber(s) - if not n then - decode_error(str, i, "invalid number '" .. s .. "'") - end - return n, x -end - - -local function parse_literal(str, i) - local x = next_char(str, i, delim_chars) - local word = str:sub(i, x - 1) - if not literals[word] then - decode_error(str, i, "invalid literal '" .. word .. "'") - end - return literal_map[word], x -end - - -local function parse_array(str, i) - local res = {} - local n = 1 - i = i + 1 - while 1 do - local x - i = next_char(str, i, space_chars, true) - -- Empty / end of array? - if str:sub(i, i) == "]" then - i = i + 1 - break - end - -- Read token - x, i = parse(str, i) - res[n] = x - n = n + 1 - -- Next token - i = next_char(str, i, space_chars, true) - local chr = str:sub(i, i) - i = i + 1 - if chr == "]" then break end - if chr ~= "," then decode_error(str, i, "expected ']' or ','") end - end - return res, i -end - - -local function parse_object(str, i) - local res = {} - i = i + 1 - while 1 do - local key, val - i = next_char(str, i, space_chars, true) - -- Empty / end of object? - if str:sub(i, i) == "}" then - i = i + 1 - break - end - -- Read key - if str:sub(i, i) ~= '"' then - decode_error(str, i, "expected string for key") - end - key, i = parse(str, i) - -- Read ':' delimiter - i = next_char(str, i, space_chars, true) - if str:sub(i, i) ~= ":" then - decode_error(str, i, "expected ':' after key") - end - i = next_char(str, i + 1, space_chars, true) - -- Read value - val, i = parse(str, i) - -- Set - res[key] = val - -- Next token - i = next_char(str, i, space_chars, true) - local chr = str:sub(i, i) - i = i + 1 - if chr == "}" then break end - if chr ~= "," then decode_error(str, i, "expected '}' or ','") end - end - return res, i -end - - -local char_func_map = { - [ '"' ] = parse_string, - [ "0" ] = parse_number, - [ "1" ] = parse_number, - [ "2" ] = parse_number, - [ "3" ] = parse_number, - [ "4" ] = parse_number, - [ "5" ] = parse_number, - [ "6" ] = parse_number, - [ "7" ] = parse_number, - [ "8" ] = parse_number, - [ "9" ] = parse_number, - [ "-" ] = parse_number, - [ "t" ] = parse_literal, - [ "f" ] = parse_literal, - [ "n" ] = parse_literal, - [ "[" ] = parse_array, - [ "{" ] = parse_object, -} - - -parse = function(str, idx) - local chr = str:sub(idx, idx) - local f = char_func_map[chr] - if f then - return f(str, idx) - end - decode_error(str, idx, "unexpected character '" .. chr .. "'") -end - - -function json.decode(str) - if type(str) ~= "string" then - error("expected argument of type string, got " .. type(str)) - end - local res, idx = parse(str, next_char(str, 1, space_chars, true)) - idx = next_char(str, idx, space_chars, true) - if idx <= #str then - decode_error(str, idx, "trailing garbage") - end - return res -end - - -return json diff --git a/SoloKing/UGCmap.umap b/SoloKing/UGCmap.umap index 2a37f8a9..ee1636ab 100644 Binary files a/SoloKing/UGCmap.umap and b/SoloKing/UGCmap.umap differ