From 879ae4efb8a6a80318957784528ea3725d4dc878 Mon Sep 17 00:00:00 2001 From: gechangfu Date: Tue, 12 Aug 2025 16:42:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 特殊属性ui显示-但是没符文镶嵌功能 --- excel/ability.xlsx | Bin 17374 -> 17460 bytes excel/attribute.xlsx | Bin 13198 -> 13200 bytes excel/equipment.xlsx | Bin 11458 -> 11459 bytes excel/language.xlsx | Bin 24389 -> 24642 bytes src/ReplicatedStorage/Json/Ability.json | 4 +- .../Json/Language_En_US.json | 5 ++ .../Json/Language_Zh_CN.json | 7 +- src/ReplicatedStorage/Tools/Localization.luau | 12 ++++ src/ServerStorage/Proxy/EquipmentProxy.luau | 1 - .../UI/Common/SpecialShow.luau | 61 ++++++++++++++++++ .../Windows/EquipmentDetailWindow/init.luau | 14 ++++ .../UI/Windows/GetEquipmentsWindow/init.luau | 12 ++++ 12 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 src/StarterPlayerScripts/UI/Common/SpecialShow.luau diff --git a/excel/ability.xlsx b/excel/ability.xlsx index daf3b440aa9dfe0ba5a0d346a29d108e6b14ff8b..adf63a1ffdd400efb6f44054ebca377e4ed4238f 100644 GIT binary patch delta 4567 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 delta 4477 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 HyX}7fR2gD7 diff --git a/excel/attribute.xlsx b/excel/attribute.xlsx index 3416d175581307b2f85e1632c99063cda5e4bbc5..0f0f8963512a5ddecd91a3ae91f917baf2c3be01 100644 GIT binary patch delta 1876 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 A^Z)<= delta 1898 zcmV-w2bK84S;ASc&<1~k$cgq>0{{Se2mk;N0001ZY%h0ja%*C5Z)+}iZEUPnU2mH( z6n&qx|A72X!2~ElrBlO)7O9=Ou4`W^RSuY96)-cVp_=yJcMbVmrYY-&5*z#4$LHRA zd^!8jSEcqsMay^{AbesXjn*m8Sp5{BueXWrA+439&Pd5?8lZny+M*BV@86v*xp-c1 z{;UB&-3F+TvhfY0O$%C)_JlXI220LGMI;QxlhHPUlB_K#l~rk2rs*0LVKo{Nd~pm0 z&vTa2h^JjeYdL}lS`rEL+k!Ri8m&r?fvbpk?ixMiRRa(URxt@seUH=;QkZWcN}%UMb9M(Jv#X+DukWvWD4Nm?0aOwues zr!eG8x}5;8MAytZR)W>?9Lq(<`9{vy0tS%#i&9ci6G?wVUQ3YLiu%9GYQPQ)4kFfW z=(mmu3U>!21nxjfQlBi^Ya$D+6J>xR|3NJJc~;VUN*Z22&_1Q*!;bXGq0aw8d?Z!A z8{qHAX?*|Hcc3QxwZN{W(BOR@T|$t*kQWF!BsN>!$T`FmPaf-3`1tX=6JLa(>3X^o zo1t!dv7>)`?qsS*c4WsFc;dLB^#hy{uAg$!$zqjF1sxz8Qg>jwBK_KeO}}H=md1B; z_2{bqrCHm4D2G+ux?^#j4uPEV+)*m-5)Lo<2}n{0m7M@HY^$EK2r8n z0AuWUY7+FVm<4E$Q8Y42;L%mH$H>^BG*n2SHuQg5J*YYcsWhtOK{Zwdbcizu*;mJi zd4`o+yBj`tL>03*&uO~5X|l7)8j`<0E+u7pEi}~)=u>Q3Q?-Kj^0Jjf52|F~7Pifc zQ*&zTW;}5quTx9+?1`m^c4WoQX&l8fN99$08T|iIABW4~uRl48WkH0z6(oIz57iCL zXQY1xAr4V6fbTBZnd8mO2~e~Xoai>5n)+Y-N&_K4#5h>%yzys?Z5BXA*5=gG%5-{#_&GxIrxO>{Z7@<28@-u z$q9=S5s<_`0> zm2B;iro=Tk#m#En4un=MA{MfiZXci|QX+d^Hrnt-jdkzXh>K`v@R#B_JlcfyGbbg5 z(N>o(MlwC*d|v*9PAC^W>Ae1{Fl)L(S z+b59A%AxTne@<_(Sl=yKv3~?BuuaiD4qTyYgy0w{iGQ~db{XG=xRr&gax%m>CDzty z_4}~Ed^)`V(LsQ*6EGIv-Qwi}teZ=p!9~Eh17LguxZrx*i7*~T!+7lLywVlFAt7yy zZvYouC!GjmFS^>1;dd-p`bj6B#P4QI!v_5a00960v$zi56$MJAqVG$yoFpaze_v07 zFcih#P5cg|@6eY0ach7jYUYbeOvGq>YuXDVLLqIH?b};mLl%vX_ny<=J@=;3=1`U1 z7id$|Dn>LQ$O9#6S*SclFX`4_Av4@JAz&Vr?vszc&f4WlVxZ&c1=YT^(mbe1TCAS=RK))G@=!BGFL^hwg z>;Y0>D4_yn4Wo#IZ}QVingKA2)Owrv}Uu=#pI zJOh$G_vK$mz5%lYCv5`-g2;*XSCe)sQUOMj$to=y7kHA3mIeR-5gz~m7ytkO00000 z00000004lK5i3OkOcRr86B?6pD=Gn8lbtI-0TGklD>?!BlNl^08%m|3?@Ivy09XP5 k01*HH00000000000001olUpo40SS|uEF%WyDF6Tf0F!ES(f|Me diff --git a/excel/language.xlsx b/excel/language.xlsx index 3199228ca211402c8d88b1a2718188df1e5f0a17..1ef273c0f06d3a84a894bd90c44154b34d418c4f 100644 GIT binary patch delta 9666 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 PrVV>z2nI^({$u_Zfo3?@ delta 9436 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 X6iHSe0DzhqP(s Variables local LocalPlayer = game.Players.LocalPlayer +--> Common +local CommonFolder = LocalPlayer:WaitForChild("PlayerScripts"):WaitForChild("UI"):WaitForChild("Common") +local SpecialShow = require(CommonFolder:WaitForChild("SpecialShow")) + local FolderEquipment = ReplicatedStorage:WaitForChild("Prefabs"):WaitForChild("Equipments") -------------------------------------------------------------------------------- @@ -36,6 +40,7 @@ function EquipmentDetailWindow:Init(UIManager: table, Data: table?) local self = UIWindow:Init(UIManager, Data) setmetatable(self, EquipmentDetailWindow) self.Variables = { + ["__listSpecial"] = 0, ["__listBaseAttributes"] = 0, ["_goExAttributesPanel"] = 0, ["__listExAttributes"] = 0, @@ -250,6 +255,15 @@ function EquipmentDetailWindow:OnOpenWindow() else self.Variables["_goElementDefPanel"].Visible = false end + + -- 特殊属性 + if equipmentInstance:GetAttribute("specialType") then + self.Variables["__listSpecial"].Visible = true + self.Variables["__listSpecial"]:AddComponent(SpecialShow) + self.Variables["__listSpecial"]:SetData({[1] = equipmentInstance:GetAttributes()}) + else + self.Variables["__listSpecial"].Visible = false + end end diff --git a/src/StarterPlayerScripts/UI/Windows/GetEquipmentsWindow/init.luau b/src/StarterPlayerScripts/UI/Windows/GetEquipmentsWindow/init.luau index 263daff..c29c2aa 100644 --- a/src/StarterPlayerScripts/UI/Windows/GetEquipmentsWindow/init.luau +++ b/src/StarterPlayerScripts/UI/Windows/GetEquipmentsWindow/init.luau @@ -17,6 +17,9 @@ local EquipmentShow = require(script.EquipmentShow) local LocalPlayer = game:GetService("Players").LocalPlayer +local CommonFolder = LocalPlayer:WaitForChild("PlayerScripts"):WaitForChild("UI"):WaitForChild("Common") +local SpecialShow = require(CommonFolder:WaitForChild("SpecialShow")) + -------------------------------------------------------------------------------- local function centerSpecificListItem(scrollingFrame, targetItem) @@ -91,6 +94,7 @@ function GetEquipmentsWindow:Init(UIManager: table, Data: table?) ["_goRewardsPanel"] = 0, ["_goDetailPanel"] = 0, + ["__listSpecial"] = 0, ["_goBase"] = 0, ["_goExAttributesPanel"] = 0, ["_goElementPanel"] = 0, @@ -166,6 +170,12 @@ function GetEquipmentsWindow:ShowDetail(equipmentInstance: Instance) else self.Variables["_goElementDefPanel"].Visible = false end + + -- 特殊属性显示 + if equipmentInstance:GetAttribute("specialType") then + self.Variables["__listSpecial"].Visible = true + self.Variables["__listSpecial"]:SetData({[1] = equipmentInstance:GetAttributes()}) + end end function GetEquipmentsWindow:SetCenter(listName, equipmentData) @@ -233,6 +243,8 @@ function GetEquipmentsWindow:OnOpenWindow() self.Variables["__listElement"]:AddComponent(AttributeShow) self.Variables["__listElementDef"]:AddComponent(AttributeShow) + self.Variables["__listSpecial"]:AddComponent(SpecialShow) + -- 找到对应的原始equipmentInstance来显示详情 for _, equipmentInstance in self.Data do if equipmentInstance:GetAttribute("quality") == showDetailData.quality then