From f0e76e345d4cb0aae3c24ac6dd791e1022d61a4e Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期四, 18 十二月 2025 09:33:35 +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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 a790162..6cc57d2 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
@@ -383,8 +383,8 @@
ZhenbaogeCut -500 int(initPrice*cutWeight/totalWeight*1.0*(minRatio+randRatio*rand))
PersonalMail 200
BillboardSet [] {0:1000, 1:9999, 2:9999, 3:9999, 4:9999} {}
-OSABillboard {"3":[1, 2], "4":[2, 3]} {"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]],"3000":[[2,20000]],"5000":[[7,50000]],"8000":[[8,100]],"10000":[[5,10]]} 20
+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
TalkCD {"0":3,"3":3}
TalkCache {0:100, 3:30}
PlayerViewCache 50 7
@@ -403,7 +403,7 @@
NewRoleInit {100101:100} {520003:2}
HeroStarTalent 4 10 3 5
HeroWash 10 [20,40,60,100,150,230] 5
-HeroRebirth 1 2 heroLV 100 80
+HeroRebirth 1 2 max(0,heroLV-40) 100 80
HeroAttrFormula (lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue+fatesValue)*(1+lineupHaloPer+realmPer+gubaoPer+hjgPer+horsePer+beautyPer+fatesPer+cardPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue+heroLVValue (lvValue+equipValue+realmValue+gubaoValue+hjgValue+horseValue+beautyValue+fatesValue)+(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)/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
@@ -441,8 +441,8 @@
ArenaSet 1000 30 3 [[2,1000],[12,2]]
ArenaMatch [[30,15],[25,12],[20,10],[15,7],[10,5]] 2|10 42|100
ArenaMatchRobot 1.3 [[-30, -20], [-5, -5], [5, 10], [10, 12], [12, 15]] 1
-ArenaBillboradAward {"1":[[1,300,0],[12,80,0]],"2":[[1,200,0],[12,60,0]],"3":[[1,100,0],[12,40,0]],"5":[[1,80,0],[12,20,0]],"10":[[1,60,0],[12,16,0]],"50":[[1,40,0],[12,12,0]],"500":[[1,30,0],[12,10,0]],"9999":[[1,20,0],[12,10,0]]} {"1":[[1,2000,0],[13,50,0]],"2":[[1,1600,0],[13,40,0]],"3":[[1,1200,0],[13,30,0]],"5":[[1,1000,0],[13,25,0]],"10":[[1,800,0],[13,20,0]],"50":[[1,600,0],[13,15,0]],"500":[[1,400,0],[13,10,0]],"9999":[[1,200,0],[13,5,0]]}
-TianziBillboradAward {"1":[[1,300,0],[8,100,0],[7,500,0]],"2":[[1,200,0],[8,80,0],[7,450,0]],"3":[[1,100,0],[8,60,0],[7,400,0]],"10":[[1,80,0],[8,50,0],[7,350,0]],"50":[[1,60,0],[8,40,0],[7,300,0]],"100":[[1,40,0],[8,30,0],[7,250,0]],"500":[[1,20,0],[8,20,0],[7,200,0]],"9999":[[1,20,0],[8,10,0],[7,150,0]]}
+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,300,0],[12,100,0],[10000,20,0]],"2":[[1,200,0],[12,80,0],[10000,10,0]],"3":[[1,100,0],[12,60,0],[10000,5,0]],"5":[[1,80,0],[12,50,0],[10000,3,0]],"10":[[1,70,0],[12,40,0],[10000,2,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]]}
+TianziBillboradAward {"1":[[1,300,0],[8,300,0],[7,5000,0]],"2":[[1,200,0],[8,120,0],[7,4500,0]],"3":[[1,100,0],[8,80,0],[7,4000,0]],"10":[[1,80,0],[8,60,0],[7,3500,0]],"50":[[1,50,0],[8,40,0],[7,3000,0]],"100":[[1,20,0],[8,20,0],[7,2500,0]],"500":[[1,10,0],[8,10,0],[7,2000,0]],"9999":[[1,5,0],[8,5,0],[7,1500,0]]}
SignInSet 1|30
Zhanling {"1":[110], "2":[111], "3":[112], "4":[113], "5":[114], "6":[115]} {} {} [2,1,3,5,4]
Gubao {"3":[12, 100], "4":[12, 200], "5":[12, 300]}
--
Gitblit v1.8.0