From ebee9ea38d37d2777a9dc9a801a41dbf3cd5885b Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 08 四月 2026 17:23:33 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（5028效果转化支持设置是否转化复制的buff；）

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt |   60 +++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
index 321f2dc..f7784c8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
@@ -1,11 +1,11 @@
 KEY	Numerical1	Numerical2	Numerical3	Numerical4	Numerical5
 GemOpen	0|2|5	0	0	0	0
 GemOpenVip	6	0	0	0	0
-GemType1	3|4|6|7	可镶嵌生命宝石	0	0	0
-GemType2	1|2|5|8	可镶嵌攻击宝石	0	0	0
-GemType3	9|10|11|12	可镶嵌璀璨炎晶	170	0	0
-GemType4	129|130|131|132	可镶嵌攻击宝石	171	0	0
-GemType5	129|130|131|132	可镶嵌附伤宝石	172	0	0
+GemType1	3|4|6|7		0	0	0
+GemType2	1|2|5|8		0	0	0
+GemType3	9|10|11|12		170	0	0
+GemType4	129|130|131|132		171	0	0
+GemType5	129|130|131|132		172	0	0
 GemTypeCount	3	0	0	0	0
 GemUpCostFormula	1_3501|2_3511|3_3521	2	{"4":[3531,1],"5":[3531,1],"6":[3532,1],"7":[3532,1],"8":[3532,1],"9":[3533,1],"10":[3533,2],"11":[3533,2],"12":[3533,2]}	0	0
 UnShowMsgBuffItemID	901|902|903	0	0	0	0
@@ -134,7 +134,7 @@
 FaQiUpItem	182	123			
 VIPCard	1_978|2_979|3_980				
 VIPLV	1_0|2_500|3_1000|4_2000|5_5000|6_10000|7_20000|8_50000|9_100000|10_200000|11_700000|12_1400000|13_3500000|14_7000000|15_10500000	5			
-VIPPrice	1_1288|2_788|3_288	1_4320|2_2160|3_720	1_至尊VIP（半年卡）|2_白金VIP（季度卡）|3_黄金VIP（包月卡）	1_增加180天VIP时长，赠送200点VIP经验，实力首选|2_增加90天VIP时长，赠送100点VIP经验|3_增加30天VIP时长	1_VipCard1|2_VipCard2|3_VipCard3
+VIPPrice	1_1288|2_788|3_288	1_4320|2_2160|3_720			1_VipCard1|2_VipCard2|3_VipCard3
 VIPTitle	1_1|2_1|3_2|4_2|5_3|6_5|7_6|8_7|9_8|10_9|11_98|12_99|13_100|14_101|15_102				
 VIPLimit	1095	["VIPAwardMail",30]	259200	1_200|2_100|3_5	
 VIPExperience	6_2|10_1|5_1	5400			
@@ -239,11 +239,11 @@
 OpenServerRedPacketCfg	3	10	3600	50	5
 FeastRedPacket	10	max(1,int((remainNum- 1*(remainPacketCnt-1))/float(remainPacketCnt)*random.uniform(0.5,min(remainPacketCnt-0.5, 1.5))))	[100,300,500,800,1000,1200,1500,1800]	0	
 RechargeRedPacket	2	{}	{}		
-CTG	20220201				
+CTG	20260213				
 ReloadQuests	0				
 GameNoticeReward	[[17,1,1],[103,5,1],[106,5,1]] 	5	1		
 ShareGameReward	[[20,20,1]] 	1	1	104	
-GoodGameReward	[[20,200,1],[103,5,1],[106,5,1]] 	1	1	[[30,5000,1],[600,100,1],[913,1,1]] 	6000
+GoodGameReward	[[5,5,0],[4,10,0]]			[]	
 FreeGoodsOpenTime	604800				
 BossRebornServerBoss	[[2247,1,0], [150,20,0], [2,1,0]]	{1:[[150,100,0]], 2:[[150,80,0]],5:[[150,60,0]], 10:[[150,50,0]],20:[[150,40,0]],99999:[[150,30,0]]}	60204100	[3,110,1]	
 FeastWishCfg	981	[1, 10]	[3, 5]	5000	
@@ -263,7 +263,6 @@
 BindJadeWheelCfg	88	{"1":110,"2":300,"3":150,"4":200,"5":300,"6":150,"7":130,"8":200,"9":588}	[(3879,1),(3889,2),(4889,3),(5189,4),(5199,5),(6199,6),(9699,7),(9999,8),(10000,9)]	{1:[(6000,3),(10000,4)],30:[(10000,9)]}	[[12.0,67.4],[67.4,103.0],[103.0,148.1],[148.1,186.2],[186.2,221.8],[221.8,267.0],[267.0,311.7],[311.7,348],[348,372]]
 BindJadeWheelNotice	150				
 WishingWellCfg	14400	10	8	5	
-OperationAction	7	["ActGrowupBuy","ActTotalRecharge2","ActCostRebate","ActDailyGiftbag","ActTotalRecharge","ActFlashGiftbag","ActLunhuidian","ActYunshi"]	0	0	0
 HelpBattleCall	6	3	2	60	100
 HelpBattleRefresh	5	5	20	5	
 HelpBattlePoint	500	{"1":[8, 8], "2":[8, 8]}	1|2		
@@ -314,7 +313,6 @@
 ZhuXianBossCntCfg	2	4	0	5	
 ZhuXianTowerBossTime	int(min(max((playerPower/4.0+needPower)/(playerPower*1.0)*48,10),119))	8	5		
 LuckyAppraisal	30	10	8		
-MixServerMail	[[181,50,1],[4151,50,1],[953,1,1],[4680,1,1]]	[[1000,10,1],[1001,10,1],[1002,10,1],[1003,10,1],[1026,10,1],[1027,10,1],[1028,10,1],[1029,10,1],[1030,10,1]]	[200, 2000000]	[[947,1,1]]	100
 MysteryShopGoods	10	 [(3000,5),(5000,6),(7000,7),(10000,8)] 			
 MysteryShopRefresh	3809	 {"5":1,"10":2,"15":3,"100000":5}	10	0	{0:[4,20000]}
 EquipPartStar	{"4":{"1":6,"2":9,"3":9,"4":9,"5":12,"6":15,"7":15,"8":18,"9":18,"10":18,"11":18,"12":18,"13":18,"14":18,"15":18,"16":18,"17":18},"5":{"1":6,"2":9,"3":9,"4":9,"5":12,"6":15,"7":15,"8":18,"9":18,"10":18,"11":18,"12":18,"13":18,"14":18,"15":18,"16":18,"17":18},"6":{"1":6,"2":9,"3":9,"4":9,"5":12,"6":15,"7":15,"8":18,"9":18,"10":18,"11":18,"12":18,"13":18,"14":18,"15":18,"16":18,"17":18},"7":{"1":6,"2":9,"3":9,"4":9,"5":12,"6":15,"7":15,"8":18,"9":18,"10":18,"11":18,"12":18,"13":18,"14":18,"15":18,"16":18,"17":18},"8":{"1":6,"2":9,"3":9,"4":9,"5":12,"6":15,"7":15,"8":18,"9":18,"10":18,"11":18,"12":18,"13":18,"14":18,"15":18,"16":18,"17":18}}				
@@ -372,30 +370,32 @@
 EncodingTex	0	utf8			
 EventReport	[]		[1100,1101,9001]		
 CreateRole	主公%s				
-PlayerRename	["%s", "playerName"]	21	1|200		
+PlayerRename	["%s", "playerName"]	21	1|200	18	
 CreateFamily	100	1			
 FamilyNameFormat	["%s", "familyName"]	21	50000	{}	
 FamilyRename	1|1000	24			
-FamilyReqJoin	30	5	0		
+FamilyReqJoin	30	5	1		
 FamilyPower	{"1":2, "2":2, "3":2, "4":2}				
 FamilyLeave	[0, 60]	[]	15	[50]	[]
-FamilyLeaderAutoChange	72	24			
+FamilyLeaderAutoChange	72	24	3|24|6		
+FamilyCross	8				
 Zhenbaoge	1	2888	60	[5,10,20,30]	
 ZhenbaogeCut	-350	int(initPrice*cutWeight/totalWeight*1.0*(minRatio+randRatio*rand))	[3,10]		
 PersonalMail	200				
-BillboardSet	[]	{0:1000, 1:9999, 2:9999, 3:9999, 4:9999}	{}		
-OSABillboard	{"3":[1, 3], "4":[2, 4]}	{"1":[[5,40,0],[8,800,0],[7,40000,0]],"2":[[5,30,0],[8,600,0],[7,30000,0]],"3":[[5,20,0],[8,400,0],[7,20000,0]],"5":[[5,15,0],[8,300,0],[7,15000,0]],"10":[[5,10,0],[8,200,0],[7,10000,0]],"20":[[5,8,0],[8,160,0],[7,8000,0]],"50":[[5,6,0],[8,120,0],[7,6000,0]],"100":[[5,4,0],[8,80,0],[7,4000,0]],"200":[[5,4,0],[8,60,0],[7,3000,0]],"2000":[[5,2,0],[8,40,0],[7,2000,0]]}	{"1":[[1005,1,0],[1001,3,0],[1,2000,0]],"2":[[1013,40,0],[1001,3,0],[1,1800,0]],"3":[[1013,30,0],[1001,2,0],[1,1500,0]],"5":[[1013,20,0],[1001,2,0],[1,1000,0]],"10":[[1001,2,0],[7,10000,0]],"20":[[1001,1,0],[7,8000,0]],"50":[[1003,1,0],[7,6000,0]],"100":[[1003,1,0],[7,4000,0]],"200":[[1002,1,0],[7,3000,0]],"2000":[[1002,1,0],[7,2000,0]]}		
-OSACelebration	7	{"2000":[[3,100]],"4000":[[7,10000]],"6000":[[2,20000]],"9000":[[8,100]],"12000":[[1005,1]]}	20		
+BillboardSet	[]	{0:1000, 1:9999, 2:9999, 3:9999, 4:9999, 6:9999, 7:9999, 8:9999, 9:9999, 10:10000, 150:10000}	{}		
+OSABillboard	{"3":[1, 3], "4":[2, 4], "8":[3, 5], "7":[4, 6], "9":[5, 7]}	{"1":[[5,40],[8,800],[3,800],[7,40000],[3002,1]],"2":[[5,30],[8,600],[3,600],[7,30000],[3003,1]],"3":[[5,20],[8,400],[3,400],[7,20000],[3004,1]],"5":[[5,15],[8,300],[3,300],[7,15000]],"10":[[5,10],[8,200],[3,200],[7,10000]],"20":[[5,8],[8,160],[3,160],[7,8000]],"50":[[5,6],[8,120],[3,120],[7,6000]],"100":[[5,4],[8,80],[3,80],[7,4000]],"200":[[5,4],[8,60],[3,60],[7,3000]],"2000":[[5,2],[8,40],[3,40],[7,2000]]}	{"1":[[1005,1],[1001,3],[7,40000],[1,2000],[3005,1]],"2":[[1013,40],[1001,3],[7,30000],[1,1800],[3006,1]],"3":[[1013,30],[1001,2],[7,20000],[1,1500],[3007,1]],"5":[[1013,20],[1001,2],[7,15000],[1,1000]],"10":[[1001,2],[7,10000],[1,800]],"20":[[1001,1],[7,8000],[1,500]],"50":[[1003,1],[7,6000],[1,400]],"100":[[1003,1],[7,4000],[1,200]],"200":[[1002,1],[7,3000],[1,150]],"2000":[[1002,1],[7,2000],[1,100]]}	{"1":[[202,120],[32,120],[200,500],[1,2000],[3011,1]],"2":[[202,100],[32,100],[200,400],[1,1800],[3012,1]],"3":[[202,80],[32,80],[200,300],[1,1500],[3013,1]],"5":[[202,60],[32,60],[200,250],[1,1000]],"10":[[201,100],[32,50],[200,220],[1,800]],"20":[[201,80],[32,40],[200,200],[1,500]],"50":[[201,60],[32,30],[200,180],[1,400]],"100":[[201,40],[32,20],[200,150],[1,200]],"200":[[201,30],[32,10],[200,100],[1,150]],"2000":[[201,20],[32,10],[200,50],[1,100]]}	
+OSABillboardTrain	{"7":0.04, "8":10, "9":500, "10":100}	{"1":10, "2":25, "3":50, "4":200, "5":500}	{"1":[[1005,1],[10,100],[8,800],[1,2000],[3008,1]],"2":[[1013,40],[10,80],[8,600],[1,1800],[3009,1]],"3":[[1013,30],[10,60],[8,400],[1,1500],[3010,1]],"5":[[1013,20],[10,50],[8,300],[1,1000]],"10":[[10,40],[8,200],[1,800]],"20":[[10,35],[8,160],[1,500]],"50":[[10,30],[8,120],[1,400]],"100":[[10,20],[8,80],[1,200]],"200":[[10,10],[8,60],[1,150]],"2000":[[10,5],[8,40],[1,100]]}	10|100	{"1":[[31,160],[30,800],[1,2000],[10000,400],[3014,1]],"2":[[31,120],[30,600],[1,1800],[10000,300],[3015,1]],"3":[[31,80],[30,400],[1,1500],[10000,240],[3016,1]],"5":[[31,60],[30,300],[1,1000],[10000,160]],"10":[[31,40],[30,200],[1,800],[10000,100]],"20":[[31,32],[30,160],[1,500],[10000,50]],"50":[[31,24],[30,120],[1,400]],"100":[[31,16],[30,80],[1,200]],"200":[[31,12],[30,60],[1,150]],"2000":[[31,8],[30,40],[1,100]]}
+OSACelebration	7	{"2000":[[3,100]],"4000":[[7,20000]],"6000":[[2,20000]],"9000":[[8,200]],"12000":[[1005,1]]}	20		
 TalkCD	{"0":3,"3":3}				
-TalkCache	{0:100, 3:30}				
+TalkCache	{0:100, 1:100, 3:30}				
 PlayerViewCache	50	7			
-MailLVAward	{}	[]			
+MailLVAward	{}	[]	{"ryzj":{"RYZJNewPlayer":[[1,200],[3,100],[7,1500]]}}		
 PutInItemPack	{"35":[150], "8":[101,102,103,104,105,106,107,108,109,110,111,112], "37":[201,202,203,204,205,206,207,208,209,210,211,212]}	{"100":41,"101":42,"102":1,"103":53}			
 TransferItemPack	{}				
 InitDepotCellCount	200	0	0	0	0
-DepotSortPriority	81|15|16|147	0	0	0	0
+DepotSortPriority	81|15|16|147|151	0	0	0	0
 InitBagCellCount	200	{"35":350}	0	0	0
-PackageSortPriority	81|15|16|147	0	0	0	0
+PackageSortPriority	81|15|16|147|151	0	0	0	0
 OpenPack	{"35":1}	{"35":[300,300,300,300,500]}	{"35":[25,25,25,25,50]}		
 MoneyRecord	[52, 53]	{3:500000, 41:100, 42:100}	[41, 52, 53]	{3:500000, 41:100}	
 ItemRecord	1	0			
@@ -408,7 +408,9 @@
 HeroWash	10	[20,40,60,100,150,230]	5		
 HeroRebirth	1	2	max(0,heroLV-40)	100	80
 HeroRebirth2	max(0,breakLV-4)*10				
-HeroAttrFormula	(lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue+fatesValue+dingjungeValue+minggeValue)*(1+lineupHaloPer+realmPer+gubaoPer+hjgPer+horsePer+beautyPer+fatesPer+cardPer+minggePer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)*(1+dingjungePer)+heroSelfValue+heroLVValue	(lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue+fatesValue+dingjungeValue+minggeValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue	long(Atk*AtkRatio+MaxHP*MaxHPRatio+Def*DefRatio+AtkSpeed*AtkSpeedRatio+(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+PVPDamPer*PVPDamPerRatio+PVPDamPerDef*PVPDamPerDefRatio+Guanchuan*GuanchuanRatio+GuanchuanDef*GuanchuanDefRatio+Zhaojia*ZhaojiaRatio+ZhaojiaDef*ZhaojiaDefRatio)/100.0-55000)	SkillPower*OfficialLV	
+HeroAttrFormula	(lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue+fatesValue+skinValue+dingjungeValue+minggeValue)*(1+lineupHaloPer+realmPer+gubaoPer+hjgPer+horsePer+beautyPer+fatesPer+skinPer+cardPer+minggePer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)*(1+dingjungePer)+heroSelfValue+heroLVValue+heroSkinValue	(lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue+fatesValue+dingjungeValue+minggeValue)+(heroSelfValue+heroSkinValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue	long(Atk*AtkRatio+MaxHP*MaxHPRatio+Def*DefRatio+AtkSpeed*AtkSpeedRatio+(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+PVPDamPer*PVPDamPerRatio+PVPDamPerDef*PVPDamPerDefRatio+Guanchuan*GuanchuanRatio+GuanchuanDef*GuanchuanDefRatio+Zhaojia*ZhaojiaRatio+ZhaojiaDef*ZhaojiaDefRatio)/100.0-55000)	SkillPower*OfficialLV	
+HeroBatView	{6:10000,7:1000,8:100000000000}	2|100|40|8|3			
+HeroSkin	{"1":30, "2":128, "3":328}				
 DownReward	[[1,100,1]] 	1			
 DailyPackBuyGift	{"0":[[20,10,0]], "1":[[2222,1,0],[1099,1,0],[20,100,0]], "2":[[2222,1,0],[4694,1,0],[20,50,0]], "3":[[2222,3,0],[1099,3,0],[20,150,0]]}	{"1":[146], "2":[147], "3":[148]}	[149]	10	
 PlayerMaxLV	1000	-1	0	0	0
@@ -429,7 +431,7 @@
 ZhaojiaCfg	100|1	1|50	3000		
 ComboCfg	0 if comboNum>4 else int(min((aComboRate-dComboRateDef),10000)*pow(0.5,comboNum))				
 SuperHitCfg	max(aSuperHitRate - dSuperHitRateDef, 0)	1.5			
-StunCfg	min(aStunRate - dStunRateDef, 8000)	200			
+StunCfg	min(aStunRate - dStunRateDef, 7000)	200			
 SuckHPCfg	long(hurtHP*max(aSuckHPPer -dSuckHPPerDef, 0)*(1+aCurePer-dCureDefPer))				
 HurtFormula	long(max(1,(aAtk-dDef)*atkSkillPer*(1+max(-0.7,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))*(1+max(-0.7,(aNormalSkillPer-dNormalSkillPerDef)+(aPMDamPer-dPMDamPerDef)+(aComboDamPer-dComboDamPerDef)+(aPursueDamPer-dPursueDamPerDef)))*(1+max(-0.7,aPVPDamPer-dPVPDamPerDef))*(1+max(-0.7,aBatDamPer-dBatDamPerDef))*(max(1,aSuperDamPer-dSuperDamPerDef))))	long(max(1,(aAtk-dDef)*atkSkillPer*(1+angerOverflow/100)*(1+max(-0.7,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))*(1+max(-0.7,(aAngerSkillPer-dAngerSkillPerDef)+(aPMDamPer-dPMDamPerDef)+(aPursueDamPer-dPursueDamPerDef)))*(1+max(-0.7,aPVPDamPer-dPVPDamPerDef))*(1+max(-0.7,aBatDamPer-dBatDamPerDef))*(max(1,aSuperDamPer-dSuperDamPerDef))))	long(max(1,(aAtk-dDef)*atkSkillPer*(1+max(-0.7,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))*(1+max(-0.7,(aPMDamPer-dPMDamPerDef)+(aComboDamPer-dComboDamPerDef)+(aPursueDamPer-dPursueDamPerDef)))*(1+max(-0.7,aPVPDamPer-dPVPDamPerDef))*(1+max(-0.7,aBatDamPer-dBatDamPerDef))*(max(1,aSuperDamPer-dSuperDamPerDef))))		
 DOTFormula	long(max(1,(aAtk-dDef)*atkSkillPer*(1+max(-0.99,(aFinalDamPer-dFinalDamPerDef)+(aCountryDamPer-dCountryDamPerDef)))*(1+max(-0.99,aPVPDamPer-dPVPDamPerDef))*(1+max(-0.7,aBatDamPer-dBatDamPerDef))*(1+max(-0.99,aDOTPer-dDOTPerDef))))				
@@ -440,7 +442,7 @@
 InvestCost	{"1":[116],"2":[117]} 				
 InvestDay	{"1":30}	{"1":180}	{"1":[[4,10],[3,100]], "2":[[1,100], [3,100]]} 		
 InvestPower	{"1":{"30010":2}}	{"2":[30010]}	{"1":3, "2":3}	{"2":3}	{"1":60}
-AutoGuaji	[1,5,8,12,16]	1260	3	[1.4,2.2,3]	5
+AutoGuaji	[1,5,8,10,12,14,16,18,20,22]	1260	3	[1.4,2.2,3]	5
 GoldRush	12|12	60|60	10		
 GoldRushAuto	[3,  30]	[[1]]	[1,2,3,4]		
 GoldRushRefresh	1	42	[10,20,30,40,50]	720	
@@ -460,10 +462,18 @@
 HorseUpItem	12	13	3		
 RechargeLimit	[210,211,212,213,214,215,216,217,218,219]				
 BeautyLVUP	[200,201,202]	[1,3,10]	10	20	
-TravelSet	60	10	6|5		
+TravelSet	60	10	6|5	32	1
 TravelRate	[1,8]	2000	[[60,1],[30,4],[10,6]]		
 DailyTehui	[220,221,222]	223	36		
-Dingjunge	2	[6,7,8,9,12,13,14,15,16,17,18,19,21,22,23,24,25,26,27,28,29,30,31,32,35,36,37,38,39,40,41,42,43,44,45,46,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80]	[1010,0,156]	[1010,0,156]	3
+Dingjunge	2	[6,7,8,9,12,13,14,15,16,17,18,19,21,22,23,24,25,26,27,28,29,30,31,32,35,36,37,38,39,40,41,42,43,44,45,46,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80]	[10,10,156]	[10,10,156]	3
 DingjungeEff	[0,0,0,1010,2010,2510,3010,3510]	10	3	5	
 MinggeCfg	[6,11,21]	30	31		
 MinggeTY	7|10	[-1, 1]	long(round(baseValue*plusValue*attrProportion*randfloat(0.95,1.05)))	[201,202,203,204]	[9000011,9000021,9000031,9000041,9000051,9000061,9000071,9000081,9000091,9000101]
+OperationAction	7	["ActLunhuidian"]			
+HeroAppear	[97,98,99]	{"5":[[113,35,35,255],[191,29,29,255]]}	[[0,10],[9,25],[21,40]]		
+QunyingSet	8	[5100010,5200010,5300010,5400010]			
+QunyingChallenge	10	180	[[34,25]]		
+QunyingMatch	{1:[[10, 5]], 2:[[-1, 1], [10, 4]], 3:[[-2, 2], [10, 3]], 4:[[-3, 3], [10, 2]], 10:[[-9, 4], [10, 1]],50:[[-10, 1], [-8, 1], [-6, 1], [-4, 1], [10, 1]], 200:[[-20, 1], [-15, 1], [-10, 1], [-5, 1], [20, 1]], 500:[[-100, 1],[-80, 1],[-50, 1],[-10, 1],[50, 1]], 1500:[[-200, 1], [-150, 1], [-100, 1],[-50, 1],[50, 1]], 5000:[[-400, 1], [-300, 1], [-100, 1],[-50, 1],[50, 1]], 9999:[[-650, 1], [-550, 1], [-100, 1],[-50, 1],[50, 1]], 10001:[[-650, 1], [-550, 1], [-100, 1],[-50, 1]]}	1|10	99		
+QunyingAward	{"1":[[1012,5,0],[5,15,0]],"2":[[1012,4,0],[5,12,0]],"3":[[1012,3,0],[5,10,0]],"5":[[1012,2,0],[5,8,0]],"10":[[1008,3,0],[5,6,0]],"20":[[1008,2,0],[5,5,0]],"50":[[1008,1,0],[5,4,0]],"100":[[1010,4,0],[5,3,0]],"200":[[1010,3,0],[5,2,0]],"2000":[[1010,2,0],[5,2,0]],"5000":[[1010,1,0],[5,1,0]]}	{"1":[[1013,20,0],[5,50,0]],"2":[[1013,15,0],[5,40,0]],"3":[[1013,10,0],[5,30,0]],"5":[[1013,8,0],[5,25,0]],"10":[[1013,6,0],[5,20,0]],"20":[[1013,5,0],[5,15,0]],"50":[[1009,10,0],[5,13,0]],"100":[[1009,8,0],[5,10,0]],"200":[[1009,6,0],[5,8,0]],"2000":[[1009,5,0],[5,5,0]],"5000":[[1009,4,0],[5,3,0]]}	{"1":[[1,1500],[10,40]],"2":[[1,1200],[10,35]],"3":[[1,1000],[10,30]],"5":[[1,800],[10,25]],"10":[[1,600],[10,20]],"20":[[1,500],[10,18]],"50":[[1,400],[10,15]],"100":[[1,350],[10,12]],"200":[[1,300],[10,10]],"2000":[[1,150],[10,6]],"5000":[[1,100],[10,3]]}	{"1":0,"2":1,"3":2,"5":3,"10":4,"20":5,"50":6,"100":7,"200":8,"2000":9,"5000":10}	
+QunyingCross	11				
+DeleteTestRebate	ryzj	5	20260326	20261226	120

--
Gitblit v1.8.0