From 735b2dc404d090bc2b8fc75562d18e05f9d4a5f9 Mon Sep 17 00:00:00 2001
From: jiaoyangna <3046463818@qq.com>
Date: Tue, 23 Nov 2021 14:00:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E5=AE=9D=E4=B9=8B=E7=81=B5=E5=B1=95?=
=?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua | 11 +++++++++++
.../~Lua/Modules/TailsManSoul/TailsManSouPanel.lua | 11 +++++++++--
.../Modules/TailsManSoul/TailsmanSoulMainPanel.lua | 4 ++--
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
index f140600d4e..73f027c43c 100644
--- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
@@ -246,6 +246,17 @@ function this.GetManyItems(text)
end)
return
end
+ if text == "一键法宝之灵" then
+ local config = (ConfigManager.TryGetAllConfigsDataByKey(ConfigName.ItemConfig,"ItemType",ItemType.talismanSoulChip))
+ local cor = coroutine.start(function()
+ for k,v in ipairs(config) do
+ local str = "1#" .. v.Id .."#" .. 500
+ NetManager.GMEvent(str)
+ coroutine.wait(0.1)
+ end
+ end)
+ return
+ end
if text and text ~= "" then
local list = string.split(text, "|")
local cor = coroutine.start(function()
diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua
index 4eaec59cbc..bc5fbd4014 100644
--- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSouPanel.lua
@@ -53,9 +53,16 @@ function TailsManSouPanel:BindEvent()
local s = function(data)
local lis1 = {}
for k,v in pairs(data) do
- table.insert(lis1,string.format("%s+%s",propertyConfig[k].Info,GetPropertyFormatStr(propertyConfig[k].Style,v)))
+ table.insert(lis1,{str = string.format("%s+%s",propertyConfig[k].Info,GetPropertyFormatStr(propertyConfig[k].Style,v)),sort = propertyConfig[k].SortId})
end
- return lis1
+ table.sort(lis1,function(a,b)
+ return a.sort < b.sort
+ end)
+ local list2 = {}
+ for i = 1,#lis1 do
+ table.insert(list2,lis1[i].str)
+ end
+ return list2
end
local data = {}
local singData = {}
diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
index 4f8f302cc5..42f222a333 100644
--- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua
@@ -178,9 +178,9 @@ function TailsmanSoulMainPanel:GetProData()
end
local str = ""
for i = 1,#curData do
- str = string.format("%s:%s",propertyConfig[curData[i][1]].Info,GetEquipPropertyFormatStr(propertyConfig[curData[i][1]].Style,curData[i][2]) )
+ str = string.format("%s:%s",propertyConfig[curData[i][1]].Info,GetPropertyFormatStr(propertyConfig[curData[i][1]].Style,curData[i][2]) )
if nextProData[curData[i][1]] then
- str = str..string.format("(+%s)",GetEquipPropertyFormatStr(propertyConfig[curData[i][1]].Style,nextProData[curData[i][1]] - curData[i][2]))
+ str = str..string.format("(+%s)",GetPropertyFormatStr(propertyConfig[curData[i][1]].Style,nextProData[curData[i][1]] - curData[i][2]))
end
table.insert(proData,str)
end