From 6ba185abeea9dfa0601b08f7658039d701b4e240 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期三, 14 一月 2026 10:20:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 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 64259cb..a34b744 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
@@ -390,7 +390,7 @@
 TalkCache	{0:100, 3:30}				
 PlayerViewCache	50	7			
 MailLVAward	{}	[]			
-PutInItemPack	{"35":[150], "8":[101,102,103,104,105,106,107,108,109,110,111,112]}	{"100":41,"101":42,"102":1,"103":53}			
+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
@@ -399,15 +399,16 @@
 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			
-ItemRecordRule	{0:4}	[]	[]	[101,102,103,104,105,106,107,108,109,110,111,112]	[]
+ItemRecordRule	{0:4}	[]	[]	[101,102,103,104,105,106,107,108,109,110,111,112,201,202,203,204,205,206,207,208,209,210,211,212]	[]
 ItemRecordEquip	2				
+BattleRecord	{2:1001}				
 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		
 NewRoleInit	{100101:100}	{520003:2}			
 HeroStarTalent	4	10	3	5	
 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)*(1+lineupHaloPer+realmPer+gubaoPer+hjgPer+horsePer+beautyPer+fatesPer+cardPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)*(1+dingjungePer)+heroSelfValue+heroLVValue	(lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue+fatesValue+dingjungeValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue	long(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+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+dingjungeValue)*(1+lineupHaloPer+realmPer+gubaoPer+hjgPer+horsePer+beautyPer+fatesPer+cardPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)*(1+dingjungePer)+heroSelfValue+heroLVValue	(lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue+fatesValue+dingjungeValue)+(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	
 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
@@ -449,7 +450,7 @@
 ArenaBillboradAward	{"1":[[1,300,0],[12,100,0],[10,20,0]],"2":[[1,200,0],[12,80,0],[10,10,0]],"3":[[1,100,0],[12,60,0],[10,5,0]],"5":[[1,80,0],[12,50,0]],"10":[[1,70,0],[12,40,0]],"50":[[1,60,0],[12,30,0]],"100":[[1,50,0],[12,25,0]],"200":[[1,40,0],[12,20,0]],"500":[[1,20,0],[12,10,0]],"9999":[[1,10,0],[12,5,0]]}	{"1":[[1,2000,0],[13,50,0],[10000,20,0]],"2":[[1,1500,0],[13,40,0],[10000,10,0]],"3":[[1,1000,0],[13,30,0],[10000,5,0]],"5":[[1,800,0],[13,25,0],[10000,3,0]],"10":[[1,600,0],[13,20,0],[10000,2,0]],"50":[[1,400,0],[13,20,0]],"100":[[1,300,0],[13,15,0]],"200":[[1,200,0],[13,13,0]],"500":[[1,100,0],[13,10,0]],"9999":[[1,50,0],[13,5,0]]}			
 TianziBillboradAward	{"1":[[1,300,0],[8,300,0],[7,20000,0]],"2":[[1,200,0],[8,200,0],[7,18000,0]],"3":[[1,100,0],[8,100,0],[7,16000,0]],"10":[[1,80,0],[8,80,0],[7,14000,0]],"50":[[1,50,0],[8,60,0],[7,12000,0]],"100":[[1,20,0],[8,40,0],[7,10000,0]],"500":[[1,10,0],[8,20,0],[7,8000,0]],"9999":[[1,5,0],[8,10,0],[7,5000,0]]}				
 SignInSet	1|30				
-Zhanling	{"1":[110], "2":[111], "3":[112], "4":[113], "5":[114], "6":[115]}		{}	{}	[2,1,3,5,4]
+Zhanling	{"1":[110], "2":[111], "3":[112], "4":[113], "5":[114], "6":[115], "7":[1000]}		{}	{}	[2,1,3,7,5,4]
 Gubao	{"2":[10002, 1],"3":[10003, 1], "4":[10004, 1], "5":[10005, 1]}				
 LLMJ	2				
 StoreHeroSoul	12	43|100	1		
@@ -462,5 +463,7 @@
 TravelSet	60	10	6|5		
 TravelRate	[1,8]	2000	[[60,1],[30,4],[10,6]]		
 DailyTehui	[220,221,222]	223	36		
-Dingjunge	2				
-DingjungeEff	[0,310,710,1010,2010,2210,2510,3010]	10	3	5	
+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]	[3,10,400]		
+DingjungeEff	[0,0,0,1010,2010,2210,2510,3010]	10	3	5	
+MinggeCfg	3	30	31		
+MinggeTY	7|10	[-3, 2]	long(round(baseValue*plusValue*attrProportion*randfloat(0.9,1.1)))	[201,202,203,204]	[9000011,9000021,9000031,9000041]

--
Gitblit v1.8.0