diff --git a/excel/cha.xlsx b/excel/cha.xlsx index fecf180..0da3498 100644 Binary files a/excel/cha.xlsx and b/excel/cha.xlsx differ diff --git a/excel/equipment.xlsx b/excel/equipment.xlsx index 4b5c35e..272934f 100644 Binary files a/excel/equipment.xlsx and b/excel/equipment.xlsx differ diff --git a/excel/global.xlsx b/excel/global.xlsx index 34a2830..2880129 100644 Binary files a/excel/global.xlsx and b/excel/global.xlsx differ 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 -- 基础属性