From de34308a2dfa17c98d0113953b942827636b70b2 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期六, 29 十二月 2018 04:29:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFBLine.txt | 3 +++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt | 6 +++---
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 4 ++--
db/PyMongoDataServer/SysDB/tagChinMap.txt | 3 +++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/GMCommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 5 ++++-
CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc | 0
db/PyMongoDataServer/GMToolLogicProcess/Commands/GMCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagChinMap.txt | 3 +++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.pyc | 0
CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc | 0
CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossServerMaintain.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc | 0
CoreServerGroup/GameServer/Script/GM/Commands/GMCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc | 0
26 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
index b8b02a1..6cd6e49 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
@@ -39,4 +39,7 @@
52020 封魔坛 1 0
32010 跨服竞技场 10 0
32011 跨服竞技场 10 0
+32012 跨服竞技场 10 0
+32013 跨服竞技场 10 0
+32014 跨服竞技场 10 0
31340 幽暗迷森 1 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
index fc0ec94..52ba958 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
@@ -97,3 +97,6 @@
31340 0 31340
32010 0 32010
32010 1 32011
+32010 2 32012
+32010 3 32013
+32010 4 32014
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index ade3f80..c396013 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -77,6 +77,6 @@
HelpBattleCheckIn 48 3 {3:[60010], 20:[60010], 60:[60010]}
PlayerViewCache 100 [0,4]
CrossRealmCfg 5
-CrossRealmPKMatch 5 3 60 [32010,32011] [(10, 7), (40,37)]
-CrossRealmPKCfg [100, 10] 180 50
+CrossRealmPKMatch 5 10 60 [32010,32011,32012,32013,32014] [(10, 7), (40,37)]
+CrossRealmPKCfg [100, 5] 180 50
CrossRealmPKScore 0 [100, 30] min(cWinCount*10,100)
diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/GMCommon.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/GMCommon.pyc
index a040faf..21c0cfd 100644
--- a/CoreServerGroup/GameServer/Script/GM/Commands/GMCommon.pyc
+++ b/CoreServerGroup/GameServer/Script/GM/Commands/GMCommon.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossServerMaintain.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossServerMaintain.pyc
new file mode 100644
index 0000000..b5cc7c3
--- /dev/null
+++ b/CoreServerGroup/GameServer/Script/GM/Commands/GMT_CrossServerMaintain.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
index b97ccc9..b720c26 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
index c1fe6c1..716c588 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
index 63313eb..ad64e0a 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
index c576f08..945ae3a 100644
--- a/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc
index 25f606a..8e2a400 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index aff0ab9..db3d0f1 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt
index 85cac47..e6cd860 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt
@@ -67,10 +67,10 @@
["IceAtk","IceAtkCoefficient/10000.0*ReIceAtk"],
["IceDef","IceDefCoefficient/10000.0*ReIceDef"],
["Def","ReAtk*AtkCoefficient/10000.0"],
- ["MinAtk","(((ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))+max((RePetAtk-Def)*(1+RePetDamPer/10000.0)*RePetSkillAtkRate/10000.0,0)+max((ReIceAtk-IceDef)*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0)),0)+ReFinalHurt)*HitTime/100.0*math.sqrt((ReAtkSpeed+10000)/10000.0)+(ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReBleedDamage/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))*HitTime/100.0)*max((1-max(strengthenLV-350,0)/10*0.02),0.8)/60.0"],
- ["MaxAtk","(((ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))+max((RePetAtk-Def)*(1+RePetDamPer/10000.0)*RePetSkillAtkRate/10000.0,0)+max((ReIceAtk-IceDef)*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0)),0)+ReFinalHurt)*HitTime/100.0*math.sqrt((ReAtkSpeed+10000)/10000.0)+(ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReBleedDamage/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))*HitTime/100.0)*max((1-max(strengthenLV-350,0)/10*0.02),0.8)/60.0"],
+ ["MinAtk","(((ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))+max((RePetAtk-Def)*(1+RePetDamPer/10000.0)*RePetSkillAtkRate/10000.0,0)+max((ReIceAtk-IceDef)*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0)),0)+ReFinalHurt)*HitTime/100.0*math.sqrt((ReAtkSpeed+10000)/10000.0)+(ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReBleedDamage/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))*HitTime/100.0)*max((1-max(strengthenLV-350,0)/10*0.03),0.75)/60.0"],
+ ["MaxAtk","(((ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))+max((RePetAtk-Def)*(1+RePetDamPer/10000.0)*RePetSkillAtkRate/10000.0,0)+max((ReIceAtk-IceDef)*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0)),0)+ReFinalHurt)*HitTime/100.0*math.sqrt((ReAtkSpeed+10000)/10000.0)+(ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReBleedDamage/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))*HitTime/100.0)*max((1-max(strengthenLV-350,0)/10*0.03),0.75)/60.0"],
["FireAtk","0"],
- ["MaxHP","(((ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))+max((RePetAtk-Def)*(1+RePetDamPer/10000.0)*RePetSkillAtkRate/10000.0,0)+max((ReIceAtk-IceDef)*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0)),0)+ReFinalHurt)*HitTime/100.0*math.sqrt((ReAtkSpeed+10000)/10000.0)+(ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReBleedDamage/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))*HitTime/100.0)*max((1-max(strengthenLV-350,0)/10*0.02),0.8)"],
+ ["MaxHP","(((ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))+max((RePetAtk-Def)*(1+RePetDamPer/10000.0)*RePetSkillAtkRate/10000.0,0)+max((ReIceAtk-IceDef)*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0)),0)+ReFinalHurt)*HitTime/100.0*math.sqrt((ReAtkSpeed+10000)/10000.0)+(ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReBleedDamage/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))*HitTime/100.0)*max((1-max(strengthenLV-350,0)/10*0.03),0.75)"],
],
},
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/GMCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/GMCommon.pyc
index aef1567..8111937 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/GMCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/GMCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc
index 15b7b4a..817e0d4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc
index cec2487..1640b82 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index 25f6d59..7b62063 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
index 945dc8c..35e92bc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index 9e848bc..f8d51bc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc
index 3c18a20..1452dc5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
index e9d6207..65171e1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.pyc
index 6fb2e85..c92172d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4519.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.pyc
index 09d81fe..3a6d866 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveSkill_4028.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/GMToolLogicProcess/Commands/GMCommon.pyc b/db/PyMongoDataServer/GMToolLogicProcess/Commands/GMCommon.pyc
index 5529187..07aa7ab 100644
--- a/db/PyMongoDataServer/GMToolLogicProcess/Commands/GMCommon.pyc
+++ b/db/PyMongoDataServer/GMToolLogicProcess/Commands/GMCommon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index 4ac1845..6ff8e78 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -53,7 +53,7 @@
31190 4 31190 200 500 0 0 0 0 120 0 0 [24,3] [3,480,10,5,15] [[(101,30201004,2),(102,30201014,1),(105,30201024,1),(103,30201004,2)], [(104,30203004,1)]] [(4151,8,9),(1142,1,1)]
31190 5 31190 230 500 0 0 0 0 120 0 0 [24,3] [3,480,10,5,15] [[(101,30201005,2),(102,30201015,1),(105,30201025,1),(103,30201005,2)], [(104,30203005,1)]] [(4151,10,11),(1142,1,1)]
31220 0 31220 110 0 0 0 0 0 0 0 0 [12,23]
-31230 0 31230 0 0 0 0 0 0 0 0 0 [12,6] [900,[30,20,10,9,8,7,6,5,4,3,2,1]]
+31230 0 31230 0 0 0 0 0 0 0 0 0 [12,6] [1200,[30,20,10,9,8,7,6,5,4,3,2,1]]
31240 0 31240 0 0 0 4010 2 80 0 0 0 [32,16] [3,1800,15,101]
51010 0 51010 155 500 0 0 0 0 0 0 0 [24,20,3] [3,360,10] [{5101011:1},{5101012:1},{5101013:1},{5101014:1}] [60,40,40,20,20] [793536, [141,45]]
51010 1 51010 155 500 0 0 0 0 0 0 0 [70,19,3] [3,360,10] [{5101021:1},{5101022:1},{5101023:1},{5101024:1}] [60,40,40,20,20] [831840, [141,36], [142,6]]
@@ -97,3 +97,6 @@
31340 0 31340 300 0 0 0 0 0 0 0 0 [23,29,3] [1800,10,33409003,24,102,5000,{33409001:6,33409002:2},33403001,40,101,1000,10000] [[33402001,33402001,33402001,33402001,33402001,33402001,33402001,33402001],[33402002,33402002,33402002,33402002,33402002,33402002,33402002,33402002,33403002],[33402003,33402003,33402003,33402003,33402003,33402003,33402003,33402003],[33402004,33402004,33402004,33402004,33402004,33402004,33402004,33402004,33403004],[33402005,33402005,33402005,33402005,33402005,33402005,33402005,33402005],[33402006,33402006,33402006,33402006,33402006,33402006,33402006,33402006,33403006]]
32010 0 32010 150 0 0 0 0 0 0 0 0 [26,6] [180,3,10]
32010 1 32011 150 0 0 0 0 0 0 0 0 [26,6] [180,3,10]
+32010 2 32012 150 0 0 0 0 0 0 0 0 [26,6] [180,3,10]
+32010 3 32013 150 0 0 0 0 0 0 0 0 [26,6] [180,3,10]
+32010 4 32014 150 0 0 0 0 0 0 0 0 [26,6] [180,3,10]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index e4542c4..3fcc10e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -19,7 +19,7 @@
IceLodeSpecial [31403002] [23043,23044]
ClearDevilPoint 1200 {30102001:20,30102002:50,30102003:300} 0 0 0
AI197Point {"31040":[[16,34],[18,99]],"31340":[[10,29],[58,29],[58,10],[23,10],[23,40]]}
-AI198Point {"3119000":[[15,19],[7,16],[13,22],[21,26]],"3119001":[[15,19],[7,16],[13,22],[21,26]],"3119002":[[15,19],[7,16],[13,22],[21,26]],"3119003":[[15,19],[7,16],[13,22],[21,26]],"3119004":[[15,19],[7,16],[13,22],[21,26]],"3119005":[[15,19],[7,16],[13,22],[21,26]],"3119006":[[15,19],[7,16],[13,22],[21,26]],"3118000":[[71,17],[73,63],[21,48]],"5101002":[[114,19]],"5101004":[[56,65],[83,88]],"3101000":[[6,25]],"4111000":[[17,16]],"4111001":[[17,16]],"4111002":[[17,16]],"4111003":[[17,16]],"4111004":[[17,16]],"4111005":[[17,16]],"4111006":[[17,16]],"4111007":[[17,16]],"4111008":[[17,16]],"4111009":[[77,17]],"4111010":[[77,17]],"4111011":[[77,17]],"4111012":[[77,17]],"4111013":[[77,17]],"4111014":[[77,17]],"4111015":[[77,17]],"4111016":[[77,17]],"4111017":[[77,17]],"4111018":[[77,17]],"4111019":[[77,17]],"4111020":[[77,17]],"4111021":[[77,17]],"4111022":[[77,17]],"4111023":[[17,16]],"4111024":[[17,16]],"3116000":[[59,25],[116,27],[88,53],[114,65],[36,78],[135,82],[99,93],[109,111],[66,111],[41,120]],"6001000":[[46,16],[10,18]],"6001001":[[198,24],[184,21],[144,23],[123,23]],"6001002":[[294,21],[279,21],[264,21],[236,23]],"3121000":[[12,38]],"5101007":[[66,118]],"5101003":[[18,66]],"5101005":[[122,70]],"5101006":[[8,109],[17,109],[12,119]],"5101001":[[63,13],[63,30],[76,27],[78,13]],"3114000":[[16,14]],"3114001":[[16,14]],"3114002":[[16,14]],"3114003":[[16,14]],"3114004":[[16,14]],"3114005":[[16,14]],"3114006":[[16,14]],"3114007":[[16,14]],"3201000":[[24,23]],"3201001":[[24,23]],"3201100":[[24,23]],"3201101":[[24,23]]}
+AI198Point {"3119000":[[15,19],[7,16],[13,22],[21,26]],"3119001":[[15,19],[7,16],[13,22],[21,26]],"3119002":[[15,19],[7,16],[13,22],[21,26]],"3119003":[[15,19],[7,16],[13,22],[21,26]],"3119004":[[15,19],[7,16],[13,22],[21,26]],"3119005":[[15,19],[7,16],[13,22],[21,26]],"3119006":[[15,19],[7,16],[13,22],[21,26]],"3118000":[[71,17],[73,63],[21,48]],"5101002":[[114,19]],"5101004":[[56,65],[83,88]],"3101000":[[6,25]],"4111000":[[17,16]],"4111001":[[17,16]],"4111002":[[17,16]],"4111003":[[17,16]],"4111004":[[17,16]],"4111005":[[17,16]],"4111006":[[17,16]],"4111007":[[17,16]],"4111008":[[17,16]],"4111009":[[77,17]],"4111010":[[77,17]],"4111011":[[77,17]],"4111012":[[77,17]],"4111013":[[77,17]],"4111014":[[77,17]],"4111015":[[77,17]],"4111016":[[77,17]],"4111017":[[77,17]],"4111018":[[77,17]],"4111019":[[77,17]],"4111020":[[77,17]],"4111021":[[77,17]],"4111022":[[77,17]],"4111023":[[17,16]],"4111024":[[17,16]],"3116000":[[59,25],[116,27],[88,53],[114,65],[36,78],[135,82],[99,93],[109,111],[66,111],[41,120]],"6001000":[[46,16],[10,18]],"6001001":[[198,24],[184,21],[144,23],[123,23]],"6001002":[[294,21],[279,21],[264,21],[236,23]],"3121000":[[12,38]],"5101007":[[66,118]],"5101003":[[18,66]],"5101005":[[122,70]],"5101006":[[8,109],[17,109],[12,119]],"5101001":[[63,13],[63,30],[76,27],[78,13]],"3114000":[[16,14]],"3114001":[[16,14]],"3114002":[[16,14]],"3114003":[[16,14]],"3114004":[[16,14]],"3114005":[[16,14]],"3114006":[[16,14]],"3114007":[[16,14]],"3201000":[[24,23]],"3201001":[[24,23]],"3201100":[[24,23]],"3201101":[[24,23]],"3201200":[[24,23]],"3201201":[[24,23]],"3201300":[[24,23]],"3201301":[[24,23]],"3201400":[[24,23]],"3201401":[[24,23]]}
AIRefreshPointNPCRun {101:[[7,15]],102:[[13,22]],103:[[21,25]]}
RuneUnlock 0|204|304|404|504|604|704|804 8_100 8_120 9 0
RuneDoubleInlayCnt 101_1|908_2|1008_3|1108_4|1208_5|1308_6|1408_7|1508_8|1608_9
diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt
index 6709f45..19141fa 100644
--- a/db/PyMongoDataServer/SysDB/tagChinMap.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt
@@ -39,4 +39,7 @@
52020 封魔坛 1 0 900000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
32010 跨服竞技场 1 0 900000 10 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 1 2
32011 跨服竞技场 1 0 900000 10 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 1 2
+32012 跨服竞技场 1 0 900000 10 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 1 2
+32013 跨服竞技场 1 0 900000 10 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 1 2
+32014 跨服竞技场 1 0 900000 10 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 1 2
31340 幽暗迷森 1 0 3600000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
--
Gitblit v1.8.0