From 371985dae5e7e67e0a1a61629429dc27d7bab9a7 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期一, 27 十月 2025 17:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt | 6 ++++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt | 6 ++++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt | 10 +++++-----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/BuffAtkType_1005.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt | 4 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt | 10 +++++-----
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt | 4 ++--
13 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
index 3e6d2de..05c7dba 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index 77ca162..b587c2d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc
index 333a533..e62f456 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/BuffAtkType_1005.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/BuffAtkType_1005.pyc
new file mode 100644
index 0000000..b4f1c07
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/BuffAtkType_1005.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
index 2f2062b..e3b16f3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
index 6c444f1..176f6b3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
@@ -418,7 +418,7 @@
MainBootyDrop {7:5, 8:10,6:15, 5:50, 1:20} {7:[50, 100], 8:[0, 5], 6:[0, 2], 5:[0, 1], 1:[5, 10]}
MainDropAppoint {1:[100101,0,101],2:[100203,0,102],3:[100104,0,103],4:[100107,0,104],5:[100106,0,105],6:[100305,0,106],7:[100102,0,107],8:[100209,0,108],9:[100111,0,109],10:[100407,0,110],11:[100110,0,111],12:[100105,2,0],13:[100212,0,112],14:[100107,3,0],15:[100301,0,113],16:[100206,1,0],17:[100105,0,114],18:[100201,2,0],19:[100103,1,115],20:[100110,1,0],21:[100112,2,0],22:[100209,0,116],23:[100107,2,0],24:[100109,1,0],25:[100308,0,117]}
TreeLVUP 42 4|300 5 120 30
-TurnFightCD 20 1000
+TurnFightCD 0 800
TurnMax 15 20 {}
AngerXP 50 100 50 5 {"1":25, "2":25, "3":15, "4":15, "5":15, "6":5}
MissCfg int(min((dMissRate-aMissRateDef)*pow(0.7,missNum), 8000))
@@ -431,7 +431,7 @@
DOTFormula long((aAtk-dDef)*atkSkillPer*(1+aAddSkillPer)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef))
CalcTypeFormula long((aAtk-dDef)*atkSkillPer*(1+aAddSkillPer)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1)) long(aAtk*atkSkillPer*(1+aAddSkillPer))
CureFormula long(max((baseValue*skillPer)*(1+curePer-cureDefPer)*(1+angerOverflow/100.0), baseValue*0.05))
-BuffStateGroup {1:[1,3,12,15], 2:[9,10,13,16,17], 3:[1,3,12,15,13], 4:[1,3,12,15,9,10,17], 5:[1,3,12,15,10,17]}
+BuffStateGroup {"1":[1,3,12,15], "2":[9,10,13,16,17], "3":[1,3,12,15,13], "4":[1,3,12,15,9,10,17], "5":[1,3,12,15,10,17]}
InvestCost {} {} {"7":[101],"12":[102]} {} {}
InvestMaxDay {"7":28,"12":0} [7,8]
GoldRush 12|12 60|60 10
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt
index 8bf78e2..5e319e2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt
@@ -69,7 +69,7 @@
610004 榛勫肪寮撴墜 0 1 1 2 1 2 6100040 6004010 6004020 12000 9500 11500 {} 0 3
610005 鐦熺柅姣掑紦 0 1 1 2 1 4 6100050 6005010 6005020 12000 9500 11500 {} 0 1
610006 灞犲か 0 1 1 1 1 1 6100060 6006010 6006020 12000 9500 11500 {} 0 6
-610007 鐩堥噹楠ㄥ紦 0 1 1 2 1 4 6100050 6005010 6005020 12000 9500 11500 {"29":1500} 0 1
+610007 楠烽珔鍏� 0 1 1 2 1 4 6100070 6007010 6007020 12000 9500 11500 {"29":1500} 0 1
610008 鐩堥噹灞犲か 0 1 1 1 1 1 6100060 6006010 6006020 12000 9500 11500 {"31":1500} 0 6
610009 榄斿寲鍒樺 0 2 5 1 1 3 5200130 2013010 2013020 11500 9500 12000 {} 0 3
610010 榄斿寲鏇规搷 0 1 5 1 1 2 5100140 1014010 1014020 12000 9500 11500 {} 0 2
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt
index 9d3dc1d..317c3b8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt
@@ -1678,11 +1678,11 @@
1047014 吕布 540014 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
1047015 张角 540015 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"21":1500}
1047016 左慈 540016 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":1500}
-3001001 盈野骨弓 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
-3001002 盈野骨弓 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
-3001003 盈野骨弓 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
-3001004 盈野骨弓 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
-3001005 盈野骨弓 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
+3001001 骷髅兵 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
+3001002 骷髅兵 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
+3001003 骷髅兵 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
+3001004 骷髅兵 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
+3001005 骷髅兵 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
3001006 盈野屠夫 610008 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"31":1500}
3002001 魔化刘备 610009 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
3002002 魔化曹操 610010 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
index 61cab8d..d4edc8e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
@@ -589,8 +589,10 @@
3014220 3014220 1 1 破境
3014230 3014230 1 1 离火净秽·狂
3014240 3014240 1 1 神格
-3015010 3015010 1 1 炎斩 1 1 2 1 1 0 1 1 0 7000 0 0 10000 0 0 0 0 3|1 0 0 0 0 0 0 0 attack
-3015020 3015020 1 1 赤壁樯橹 2 1 2 1 2 0 0 3 0 24000 0 0 10000 0 0 0 0 4|1 0 0 0 0 0 0 0 angerskill
+3015010 3015010 1 1 炎斩 1 1 2 1 1 0 0 1 0 7000 0 0 10000 5010 30150101|[4,23] 13 0 0 0 3|1 0 0 0 0 0 0 0 attack
+30150101 30150101 1 1 炎斩 0 2 0 2 5 0 0 0 1 1000 0 0 10000 0 0 0 0 0 0 0 0 0
+3015020 3015020 1 1 赤壁樯橹 2 1 2 1 2 0 0 3 0 24000 0 0 10000 5010 30150201 13 0 0 0 4|1 0 0 0 0 0 0 0 angerskill
+30150201 30150201 1 1 赤壁樯橹 0 5 0 1005 5 0 0 0 0 0 0 0 10000 0 [4,23]|27|1000 27 2000 0 0 0 2 0 0 0 0
3015030 3015030 1 1 焚羽 3 0 0
3015050 3015050 1 1 火雾 3 2 0 0
3015070 3015070 1 1 吴钩饮血 3 0 0
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 6c444f1..176f6b3 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
@@ -418,7 +418,7 @@
MainBootyDrop {7:5, 8:10,6:15, 5:50, 1:20} {7:[50, 100], 8:[0, 5], 6:[0, 2], 5:[0, 1], 1:[5, 10]}
MainDropAppoint {1:[100101,0,101],2:[100203,0,102],3:[100104,0,103],4:[100107,0,104],5:[100106,0,105],6:[100305,0,106],7:[100102,0,107],8:[100209,0,108],9:[100111,0,109],10:[100407,0,110],11:[100110,0,111],12:[100105,2,0],13:[100212,0,112],14:[100107,3,0],15:[100301,0,113],16:[100206,1,0],17:[100105,0,114],18:[100201,2,0],19:[100103,1,115],20:[100110,1,0],21:[100112,2,0],22:[100209,0,116],23:[100107,2,0],24:[100109,1,0],25:[100308,0,117]}
TreeLVUP 42 4|300 5 120 30
-TurnFightCD 20 1000
+TurnFightCD 0 800
TurnMax 15 20 {}
AngerXP 50 100 50 5 {"1":25, "2":25, "3":15, "4":15, "5":15, "6":5}
MissCfg int(min((dMissRate-aMissRateDef)*pow(0.7,missNum), 8000))
@@ -431,7 +431,7 @@
DOTFormula long((aAtk-dDef)*atkSkillPer*(1+aAddSkillPer)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef))
CalcTypeFormula long((aAtk-dDef)*atkSkillPer*(1+aAddSkillPer)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1)) long(aAtk*atkSkillPer*(1+aAddSkillPer))
CureFormula long(max((baseValue*skillPer)*(1+curePer-cureDefPer)*(1+angerOverflow/100.0), baseValue*0.05))
-BuffStateGroup {1:[1,3,12,15], 2:[9,10,13,16,17], 3:[1,3,12,15,13], 4:[1,3,12,15,9,10,17], 5:[1,3,12,15,10,17]}
+BuffStateGroup {"1":[1,3,12,15], "2":[9,10,13,16,17], "3":[1,3,12,15,13], "4":[1,3,12,15,9,10,17], "5":[1,3,12,15,10,17]}
InvestCost {} {} {"7":[101],"12":[102]} {} {}
InvestMaxDay {"7":28,"12":0} [7,8]
GoldRush 12|12 60|60 10
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt
index 8bf78e2..5e319e2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt
@@ -69,7 +69,7 @@
610004 榛勫肪寮撴墜 0 1 1 2 1 2 6100040 6004010 6004020 12000 9500 11500 {} 0 3
610005 鐦熺柅姣掑紦 0 1 1 2 1 4 6100050 6005010 6005020 12000 9500 11500 {} 0 1
610006 灞犲か 0 1 1 1 1 1 6100060 6006010 6006020 12000 9500 11500 {} 0 6
-610007 鐩堥噹楠ㄥ紦 0 1 1 2 1 4 6100050 6005010 6005020 12000 9500 11500 {"29":1500} 0 1
+610007 楠烽珔鍏� 0 1 1 2 1 4 6100070 6007010 6007020 12000 9500 11500 {"29":1500} 0 1
610008 鐩堥噹灞犲か 0 1 1 1 1 1 6100060 6006010 6006020 12000 9500 11500 {"31":1500} 0 6
610009 榄斿寲鍒樺 0 2 5 1 1 3 5200130 2013010 2013020 11500 9500 12000 {} 0 3
610010 榄斿寲鏇规搷 0 1 5 1 1 2 5100140 1014010 1014020 12000 9500 11500 {} 0 2
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt
index 9d3dc1d..317c3b8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt
@@ -1678,11 +1678,11 @@
1047014 吕布 540014 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
1047015 张角 540015 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"21":1500}
1047016 左慈 540016 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"27":1500}
-3001001 盈野骨弓 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
-3001002 盈野骨弓 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
-3001003 盈野骨弓 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
-3001004 盈野骨弓 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
-3001005 盈野骨弓 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
+3001001 骷髅兵 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
+3001002 骷髅兵 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
+3001003 骷髅兵 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
+3001004 骷髅兵 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
+3001005 骷髅兵 610007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"29":1500}
3001006 盈野屠夫 610008 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {"31":1500}
3002001 魔化刘备 610009 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
3002002 魔化曹操 610010 1 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
index 61cab8d..d4edc8e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
@@ -589,8 +589,10 @@
3014220 3014220 1 1 破境
3014230 3014230 1 1 离火净秽·狂
3014240 3014240 1 1 神格
-3015010 3015010 1 1 炎斩 1 1 2 1 1 0 1 1 0 7000 0 0 10000 0 0 0 0 3|1 0 0 0 0 0 0 0 attack
-3015020 3015020 1 1 赤壁樯橹 2 1 2 1 2 0 0 3 0 24000 0 0 10000 0 0 0 0 4|1 0 0 0 0 0 0 0 angerskill
+3015010 3015010 1 1 炎斩 1 1 2 1 1 0 0 1 0 7000 0 0 10000 5010 30150101|[4,23] 13 0 0 0 3|1 0 0 0 0 0 0 0 attack
+30150101 30150101 1 1 炎斩 0 2 0 2 5 0 0 0 1 1000 0 0 10000 0 0 0 0 0 0 0 0 0
+3015020 3015020 1 1 赤壁樯橹 2 1 2 1 2 0 0 3 0 24000 0 0 10000 5010 30150201 13 0 0 0 4|1 0 0 0 0 0 0 0 angerskill
+30150201 30150201 1 1 赤壁樯橹 0 5 0 1005 5 0 0 0 0 0 0 0 10000 0 [4,23]|27|1000 27 2000 0 0 0 2 0 0 0 0
3015030 3015030 1 1 焚羽 3 0 0
3015050 3015050 1 1 火雾 3 2 0 0
3015070 3015070 1 1 吴钩饮血 3 0 0
--
Gitblit v1.8.0