From c67832b53b2bd64b3f2818d8c86d57569835360f Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 15 九月 2025 19:42:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout

---
 Config/FuncConfig.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Config/FuncConfig.txt b/Config/FuncConfig.txt
index ff6a977..ee1c1c7 100644
--- a/Config/FuncConfig.txt
+++ b/Config/FuncConfig.txt
@@ -16,7 +16,7 @@
 TreasureSet	{0:10,1:10}	{2330:[4318,4313,4323,4328,4358,4393,4383,4433,4348,4438,4388,4443,4363,4428,4343,4353],2331:[4319,4314,4324,4329,4359,4394,4384,4434,4349,4439,4389,4444,4364,4429,4344,4354],2332:[4320,4315,4325,4330,4360,4395,4385,4435,4350,4440,4390,4445,4365,4430,4345,4355],2214:[4183,4185,195,199]}	200		
 HeroStarTalent	4	10	3	5	
 HeroWash	10	[20,40,60,100,150,230]	5		
-HeroRebirth	1	2	heroLV	80	80
+HeroRebirth	1	2	heroLV	100	80
 HeroAttrFormula	(lvValue+equipValue+bookValue)*(1+lineupHaloPer+bookPer+lineupInitAddPer+lineupLVAddPer+lineupBreakLVAddPer+lineupStarAddPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue	(lvValue+equipValue+bookValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue	int(Atk*AtkRatio+MaxHP*MaxHPRatio+Def*DefRatio+(StunRate*StunRateRatio+SuperHitRate*SuperHitRateRatio+ComboRate*ComboRateRatio+MissRate*MissRateRatio+ParryRate*ParryRateRatio+SuckHPPer*SuckHPPerRatio+StunRateDef*StunRateDefRatio+SuperHitRateDef*SuperHitRateDefRatio+ComboRateDef*ComboRateDefRatio+MissRateDef*MissRateDefRatio+ParryRateDef*ParryRateDefRatio+SuckHPPerDef*SuckHPPerDefRatio+FinalDamPer*FinalDamPerRatio+FinalDamPerDef*FinalDamPerDefRatio+PhyDamPer*PhyDamPerRatio+PhyDamPerDef*PhyDamPerDefRatio+MagDamPer*MagDamPerRatio+MagDamPerDef*MagDamPerDefRatio+NormalSkillPer*NormalSkillPerRatio+NormalSkillPerDef*NormalSkillPerDefRatio+AngerSkillPer*AngerSkillPerRatio+AngerSkillPerDef*AngerSkillPerDefRatio+SuperDamPer*SuperDamPerRatio+SuperDamPerDef*SuperDamPerDefRatio+CurePer*CurePerRatio+CurePerDef*CurePerDefRatio+ShieldPer*ShieldPerRatio+ShieldPerDef*ShieldPerDefRatio+DOTPer*DOTPerRatio+DOTPerDef*DOTPerDefRatio+WeiFinalDamPer*WeiFinalDamPerRatio+WeiFinalDamPerDef*WeiFinalDamPerDefRatio+ShuFinalDamPer*ShuFinalDamPerRatio+ShuFinalDamPerDef*ShuFinalDamPerDefRatio+WuFinalDamPer*WuFinalDamPerRatio+WuFinalDamPerDef*WuFinalDamPerDefRatio+QunFinalDamPer*QunFinalDamPerRatio+QunFinalDamPerDef*QunFinalDamPerDefRatio)/100.0)	SkillPower*OfficialLV	
 FuncLevelLimitClient	{"1":30}				
 DownReward	[(1,200,1),(2,5000,1),(3,500,1)] 	20	[[1,100,0],[3,200,0]]	1	1

--
Gitblit v1.8.0