From d167a61b98ab5d43f86e0008bcdb82f7d2d82e88 Mon Sep 17 00:00:00 2001 From: gechangfu Date: Wed, 6 Aug 2025 20:52:10 +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 --- excel/cha.xlsx | Bin 14849 -> 15167 bytes excel/equipment.xlsx | Bin 11072 -> 11082 bytes excel/global.xlsx | Bin 22537 -> 22536 bytes src/ReplicatedStorage/Json/Equipment.json | 32 +++--- src/ReplicatedStorage/Json/Forge.json | 105 +++++++++--------- src/ReplicatedStorage/Json/QualityEffect.json | 8 +- src/ServerStorage/Proxy/LevelProxy.luau | 3 +- src/ServerStorage/Proxy/MobsProxy/init.luau | 5 +- .../Proxy/PlayerFightProxy/LevelLoop.luau | 4 + src/ServerStorage/Proxy/PlayerInfoProxy.luau | 2 +- .../Windows/EquipmentDetailWindow/init.luau | 4 + 11 files changed, 89 insertions(+), 74 deletions(-) diff --git a/excel/cha.xlsx b/excel/cha.xlsx index fecf1800143b7fa415ec99cbd9f3c1480be6e8ba..0da34986e3f38ac7e26d773a712b4388f03c14c9 100644 GIT binary patch delta 4617 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 delta 4294 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 S%HmgvVd$heh%)c}HvJzSECQPV diff --git a/excel/equipment.xlsx b/excel/equipment.xlsx index 4b5c35ef85b49b94c15ac1565ed4da21afb509d2..272934fdd9d8a2572c312f142a3d42f3700d8aa3 100644 GIT binary patch delta 3746 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 delta 3786 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 PiN^4W3Q*dC|3d!*W(Du@ diff --git a/excel/global.xlsx b/excel/global.xlsx index 34a2830b8f6005bbfed6ed2fd76d6aebca4a6e38..2880129410697c32f849a7fb30e69774893f7c6a 100644 GIT binary patch delta 4039 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 NzgqDSeKq?V`WIdncQ^n5 delta 3998 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 ZvatU@hAey$QVYO}CnH7ZXD$9f{{w6+VxIs2 diff --git a/src/ReplicatedStorage/Json/Equipment.json b/src/ReplicatedStorage/Json/Equipment.json index e1bfdaa..a889f74 100644 --- a/src/ReplicatedStorage/Json/Equipment.json +++ b/src/ReplicatedStorage/Json/Equipment.json @@ -1,18 +1,18 @@ [ -{"id":40000,"type":1,"name":40000,"attributes":[14,200,10,15,200,10,16,150,0],"modelName":"Zeus","recycle":100}, -{"id":40001,"type":1,"name":40001,"attributes":[14,200,10,15,200,10,16,150,0],"modelName":"Zeus","recycle":100}, -{"id":40002,"type":1,"name":40002,"attributes":[14,200,10,15,200,10,16,150,0],"modelName":"Zeus","recycle":100}, -{"id":40003,"type":1,"name":40003,"attributes":[14,200,10,15,200,10,16,150,0],"modelName":"Zeus","recycle":100}, -{"id":40004,"type":1,"name":40004,"attributes":[14,200,10,15,200,10,16,150,0],"modelName":"Zeus","recycle":100}, -{"id":40005,"type":1,"name":40005,"attributes":[14,200,10,15,200,10,16,150,0],"modelName":"Zeus","recycle":100}, -{"id":40006,"type":1,"name":40006,"attributes":[14,200,10,15,200,10,16,150,0],"modelName":"Zeus","recycle":100}, -{"id":40007,"type":1,"name":40007,"attributes":[14,200,10,15,200,10,16,150,0],"modelName":"Zeus","recycle":100}, -{"id":40008,"type":1,"name":40008,"attributes":[14,200,10,15,200,10,16,150,0],"modelName":"Zeus","recycle":100}, -{"id":40009,"type":1,"name":40009,"attributes":[14,200,10,15,200,10,16,150,0],"modelName":"Zeus","recycle":100}, -{"id":40010,"type":1,"name":40010,"attributes":[14,200,10,15,200,10,16,150,0],"modelName":"Zeus","recycle":100}, -{"id":40011,"type":1,"name":40011,"attributes":[14,200,10,15,200,10,16,150,0],"modelName":"Zeus","recycle":100}, -{"id":40012,"type":1,"name":40012,"attributes":[14,200,10,15,200,10,16,150,0],"modelName":"Zeus","recycle":100}, -{"id":40013,"type":1,"name":40013,"attributes":[14,200,10,15,200,10,16,150,0],"modelName":"Zeus","recycle":100}, -{"id":40014,"type":1,"name":40014,"attributes":[14,200,10,15,200,10,16,150,0],"modelName":"Zeus","recycle":100}, -{"id":40015,"type":1,"name":40015,"attributes":[14,200,10,15,200,10,16,150,0],"modelName":"Zeus","recycle":100} +{"id":40000,"type":1,"name":40000,"attributes":[14,100,0,15,100,0,16,100,0],"modelName":"Zeus","recycle":100}, +{"id":40001,"type":1,"name":40001,"attributes":[14,100,0,15,100,0,16,100,0],"modelName":"Zeus","recycle":100}, +{"id":40002,"type":1,"name":40002,"attributes":[14,100,0,15,100,0,16,100,0],"modelName":"Zeus","recycle":100}, +{"id":40003,"type":1,"name":40003,"attributes":[14,100,0,15,100,0,16,100,0],"modelName":"Zeus","recycle":100}, +{"id":40004,"type":1,"name":40004,"attributes":[14,100,0,15,100,0,16,100,0],"modelName":"Zeus","recycle":100}, +{"id":40005,"type":1,"name":40005,"attributes":[14,100,0,15,100,0,16,100,0],"modelName":"Zeus","recycle":100}, +{"id":40006,"type":1,"name":40006,"attributes":[14,100,0,15,100,0,16,100,0],"modelName":"Zeus","recycle":100}, +{"id":40007,"type":1,"name":40007,"attributes":[14,100,0,15,100,0,16,100,0],"modelName":"Zeus","recycle":100}, +{"id":40008,"type":1,"name":40008,"attributes":[14,100,0,15,100,0,16,100,0],"modelName":"Zeus","recycle":100}, +{"id":40009,"type":1,"name":40009,"attributes":[14,100,0,15,100,0,16,100,0],"modelName":"Zeus","recycle":100}, +{"id":40010,"type":1,"name":40010,"attributes":[14,100,0,15,100,0,16,100,0],"modelName":"Zeus","recycle":100}, +{"id":40011,"type":1,"name":40011,"attributes":[14,100,0,15,100,0,16,100,0],"modelName":"Zeus","recycle":100}, +{"id":40012,"type":1,"name":40012,"attributes":[14,100,0,15,100,0,16,100,0],"modelName":"Zeus","recycle":100}, +{"id":40013,"type":1,"name":40013,"attributes":[14,100,0,15,100,0,16,100,0],"modelName":"Zeus","recycle":100}, +{"id":40014,"type":1,"name":40014,"attributes":[14,100,0,15,100,0,16,100,0],"modelName":"Zeus","recycle":100}, +{"id":40015,"type":1,"name":40015,"attributes":[14,100,0,15,100,0,16,100,0],"modelName":"Zeus","recycle":100} ] \ No newline at end of file diff --git a/src/ReplicatedStorage/Json/Forge.json b/src/ReplicatedStorage/Json/Forge.json index 4478cab..454f484 100644 --- a/src/ReplicatedStorage/Json/Forge.json +++ b/src/ReplicatedStorage/Json/Forge.json @@ -1,52 +1,57 @@ [ -{"id":1,"cost":[2,10],"qualityRate":[1,80,2,20]}, -{"id":2,"cost":[2,20],"qualityRate":[1,80,2,20]}, -{"id":3,"cost":[2,30],"qualityRate":[1,80,2,20]}, -{"id":4,"cost":[2,40],"qualityRate":[1,60,2,25,3,15]}, -{"id":5,"cost":[2,50],"qualityRate":[1,60,2,25,3,15]}, -{"id":6,"cost":[2,60],"qualityRate":[1,60,2,25,3,15]}, -{"id":7,"cost":[2,70],"qualityRate":[1,40,2,30,3,20,4,10]}, -{"id":8,"cost":[2,80],"qualityRate":[1,40,2,30,3,20,4,10]}, -{"id":9,"cost":[2,90],"qualityRate":[1,40,2,30,3,20,4,10]}, -{"id":10,"cost":[2,100],"qualityRate":[1,30,2,30,3,20,4,15,5,5]}, -{"id":11,"cost":[2,110],"qualityRate":[1,30,2,30,3,20,4,15,5,5]}, -{"id":12,"cost":[2,120],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":13,"cost":[2,130],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":14,"cost":[2,140],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":15,"cost":[2,150],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":16,"cost":[2,160],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":17,"cost":[2,170],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":18,"cost":[2,180],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":19,"cost":[2,190],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":20,"cost":[2,200],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":21,"cost":[2,210],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":22,"cost":[2,220],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":23,"cost":[2,230],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":24,"cost":[2,240],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":25,"cost":[2,250],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":26,"cost":[2,260],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":27,"cost":[2,270],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":28,"cost":[2,280],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":29,"cost":[2,290],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":30,"cost":[2,300],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":31,"cost":[2,310],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":32,"cost":[2,320],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":33,"cost":[2,330],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":34,"cost":[2,340],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":35,"cost":[2,350],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":36,"cost":[2,360],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":37,"cost":[2,370],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":38,"cost":[2,380],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":39,"cost":[2,390],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":40,"cost":[2,400],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":41,"cost":[2,410],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":42,"cost":[2,420],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":43,"cost":[2,430],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":44,"cost":[2,440],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":45,"cost":[2,450],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":46,"cost":[2,460],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":47,"cost":[2,470],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":48,"cost":[2,480],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":49,"cost":[2,490],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, -{"id":50,"cost":[2,500],"qualityRate":[1,15,2,30,3,20,4,15,5,10]} +{"id":1,"cost":[2,5],"qualityRate":[1,80,2,20]}, +{"id":2,"cost":[2,10],"qualityRate":[1,80,2,20]}, +{"id":3,"cost":[2,10],"qualityRate":[2,100]}, +{"id":4,"cost":[2,15],"qualityRate":[1,60,2,25,3,15]}, +{"id":5,"cost":[2,15],"qualityRate":[1,60,2,25,3,15]}, +{"id":6,"cost":[2,20],"qualityRate":[3,100]}, +{"id":7,"cost":[2,25],"qualityRate":[1,50,2,25,3,20]}, +{"id":8,"cost":[2,30],"qualityRate":[1,50,2,25,3,20]}, +{"id":9,"cost":[2,40],"qualityRate":[1,50,2,25,3,20]}, +{"id":10,"cost":[2,50],"qualityRate":[1,50,2,25,3,20]}, +{"id":11,"cost":[2,60],"qualityRate":[4,100]}, +{"id":12,"cost":[2,70],"qualityRate":[1,40,2,30,3,20,4,10]}, +{"id":13,"cost":[2,80],"qualityRate":[1,40,2,30,3,20,4,10]}, +{"id":14,"cost":[2,90],"qualityRate":[1,40,2,30,3,20,4,10]}, +{"id":15,"cost":[2,100],"qualityRate":[1,40,2,30,3,20,4,10]}, +{"id":16,"cost":[2,110],"qualityRate":[1,40,2,30,3,20,4,10]}, +{"id":17,"cost":[2,120],"qualityRate":[1,40,2,30,3,20,4,10]}, +{"id":18,"cost":[2,130],"qualityRate":[1,40,2,30,3,20,4,10]}, +{"id":19,"cost":[2,140],"qualityRate":[1,40,2,30,3,20,4,10]}, +{"id":20,"cost":[2,150],"qualityRate":[1,40,2,30,3,20,4,10]}, +{"id":21,"cost":[2,160],"qualityRate":[1,30,2,30,3,20,4,15,5,5]}, +{"id":22,"cost":[2,170],"qualityRate":[1,30,2,30,3,20,4,15,5,5]}, +{"id":23,"cost":[2,180],"qualityRate":[1,30,2,30,3,20,4,15,5,5]}, +{"id":24,"cost":[2,190],"qualityRate":[1,30,2,30,3,20,4,15,5,5]}, +{"id":25,"cost":[2,200],"qualityRate":[1,30,2,30,3,20,4,15,5,5]}, +{"id":26,"cost":[2,210],"qualityRate":[1,30,2,30,3,20,4,15,5,5]}, +{"id":27,"cost":[2,220],"qualityRate":[1,30,2,30,3,20,4,15,5,5]}, +{"id":28,"cost":[2,230],"qualityRate":[1,30,2,30,3,20,4,15,5,5]}, +{"id":29,"cost":[2,240],"qualityRate":[1,30,2,30,3,20,4,15,5,5]}, +{"id":30,"cost":[2,250],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":31,"cost":[2,260],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":32,"cost":[2,270],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":33,"cost":[2,280],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":34,"cost":[2,290],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":35,"cost":[2,300],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":36,"cost":[2,310],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":37,"cost":[2,320],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":38,"cost":[2,330],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":39,"cost":[2,340],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":40,"cost":[2,350],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":41,"cost":[2,360],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":42,"cost":[2,370],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":43,"cost":[2,380],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":44,"cost":[2,390],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":45,"cost":[2,400],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":46,"cost":[2,410],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":47,"cost":[2,420],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":48,"cost":[2,430],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":49,"cost":[2,440],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":50,"cost":[2,450],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":51,"cost":[2,460],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":52,"cost":[2,470],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":53,"cost":[2,480],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":54,"cost":[2,490],"qualityRate":[1,15,2,30,3,20,4,15,5,10]}, +{"id":55,"cost":[2,500],"qualityRate":[1,15,2,30,3,20,4,15,5,10]} ] \ No newline at end of file diff --git a/src/ReplicatedStorage/Json/QualityEffect.json b/src/ReplicatedStorage/Json/QualityEffect.json index 0f0293c..675034a 100644 --- a/src/ReplicatedStorage/Json/QualityEffect.json +++ b/src/ReplicatedStorage/Json/QualityEffect.json @@ -1,8 +1,8 @@ [ {"id":1,"minValue":5,"maxValue":10}, {"id":2,"minValue":15,"maxValue":25}, -{"id":3,"minValue":25,"maxValue":45}, -{"id":4,"minValue":45,"maxValue":100}, -{"id":5,"minValue":100,"maxValue":200}, -{"id":6,"minValue":200,"maxValue":400} +{"id":3,"minValue":35,"maxValue":55}, +{"id":4,"minValue":75,"maxValue":120}, +{"id":5,"minValue":150,"maxValue":200}, +{"id":6,"minValue":250,"maxValue":400} ] \ No newline at end of file diff --git a/src/ServerStorage/Proxy/LevelProxy.luau b/src/ServerStorage/Proxy/LevelProxy.luau index d01e6fc..9fa1d18 100644 --- a/src/ServerStorage/Proxy/LevelProxy.luau +++ b/src/ServerStorage/Proxy/LevelProxy.luau @@ -223,7 +223,8 @@ function LevelProxy:ChallengeLevel(Player: Player, LevelId: number) local mobCount = waveData[i + 2] for _ = 1, mobCount do print("怪物增益", LevelData.atkBonus, LevelData.hpBonus) - local mob = MobsProxy:CreateMob(Player, mobId, LevelProxy.pData[Player.UserId].LevelPosition, LevelData.atkBonus, LevelData.hpBonus, OnMobDied) + local randomPos = LevelProxy.pData[Player.UserId].LevelPosition + Vector3.new(math.random(5, 10), 0, math.random(5, 10)) + local mob = MobsProxy:CreateMob(Player, mobId, randomPos, LevelData.atkBonus, LevelData.hpBonus, OnMobDied) table.insert(LevelProxy.pData[Player.UserId].Mobs, mob) end end diff --git a/src/ServerStorage/Proxy/MobsProxy/init.luau b/src/ServerStorage/Proxy/MobsProxy/init.luau index 1885067..40191a3 100644 --- a/src/ServerStorage/Proxy/MobsProxy/init.luau +++ b/src/ServerStorage/Proxy/MobsProxy/init.luau @@ -100,8 +100,9 @@ function MobsProxy:CreateMob(Player: Player, MobId: number, Position: Vector3, A -- 关卡系数 if AtkBonus then Mob:ChangeAttributeValue("attack", math.floor(Mob.Config.attack * (AtkBonus / 100))) end if HpBonus then - Mob:ChangeAttributeValue("hp", math.floor(Mob.Config.hp * (HpBonus / 100))) - Mob:ChangeAttributeValue("maxhp", math.floor(Mob.Config.maxhp * (HpBonus / 100))) + local hpResult = math.floor(Mob.Config.hp * (HpBonus / 100)) + Mob:ChangeAttributeValue("maxhp", hpResult) + Mob:ChangeAttributeValue("hp", hpResult) end MobsProxy.pData[Player.UserId][Mob.Instance] = Mob return Mob diff --git a/src/ServerStorage/Proxy/PlayerFightProxy/LevelLoop.luau b/src/ServerStorage/Proxy/PlayerFightProxy/LevelLoop.luau index f7deabd..724c128 100644 --- a/src/ServerStorage/Proxy/PlayerFightProxy/LevelLoop.luau +++ b/src/ServerStorage/Proxy/PlayerFightProxy/LevelLoop.luau @@ -56,6 +56,10 @@ function LevelLoop:OnChallengeLevel(isStart: boolean) if isStart then self:AutoChallenge() else + if self.TaskAutoChallenge then + task.cancel(self.TaskAutoChallenge) + self.TaskAutoChallenge = nil + end LevelProxy:TeleportToTown(self.Player) LevelProxy:ChallengeEnd(self.Player, false) self.PlayerRole:Recover() diff --git a/src/ServerStorage/Proxy/PlayerInfoProxy.luau b/src/ServerStorage/Proxy/PlayerInfoProxy.luau index 6321859..f76bd84 100644 --- a/src/ServerStorage/Proxy/PlayerInfoProxy.luau +++ b/src/ServerStorage/Proxy/PlayerInfoProxy.luau @@ -165,7 +165,7 @@ function PlayerInfoProxy:UpgradeAttribute(Player: Player, AttributeId: number) requireMoney = attributeData["cost"][2] requireBattleValue = attributeData["battleValueLimit"][1] else - requireMoney = math.floor(attributeData["cost"][2] ^ (nowLv - 1) * attributeData["cost"][3] / 100) + requireMoney = attributeData["cost"][2] requireBattleValue = attributeData["battleValueLimit"][1] + (nowLv - 1) * attributeData["battleValueLimit"][2] end diff --git a/src/StarterPlayerScripts/UI/Windows/EquipmentDetailWindow/init.luau b/src/StarterPlayerScripts/UI/Windows/EquipmentDetailWindow/init.luau index c74ee02..f797133 100644 --- a/src/StarterPlayerScripts/UI/Windows/EquipmentDetailWindow/init.luau +++ b/src/StarterPlayerScripts/UI/Windows/EquipmentDetailWindow/init.luau @@ -53,6 +53,7 @@ function EquipmentDetailWindow:Init(UIManager: table, Data: table?) ["_goBottomPanel"] = 0, ["_btnUnwear"] = 0, ["_btnWear"] = 0, + ["_btnReplace"] = 0, ["_goReplaceDetail"] = 0, ["__listReplace"] = 0, @@ -214,6 +215,9 @@ function EquipmentDetailWindow:OnOpenWindow() -- 穿戴状态按钮显示 self.Variables["_btnUnwear"].Visible = self.Data.base.wearing ~= 0 + + -- 有穿戴中的装备，显示替换按钮 + -- self.Variables["_btnReplace"].Visible = self.Data.base.wearing ~= 0 self.Variables["_btnWear"].Visible = self.Data.base.wearing == 0 -- 基础属性