From d41d2b6ff432bf615beb2981cf0b09e96c3d31d3 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期五, 07 九月 2018 21:09:51 +0800
Subject: [PATCH] Merge branch '1.0.15' of http://192.168.0.87:10010/r/snxx_server into 1.0.15
---
CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt | 1 +
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt | 2 +-
CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc | 0
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 28 ++++++++++++++--------------
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 15 +++++++++++++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt | 2 +-
6 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index 1cd9327..658d082 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -1,3 +1,4 @@
CfgID ActMark ServerIDList StartDate EndDate NotifyInfoStart NotifyInfoEnd LimitLV TemplateID
1 test1 [7001] 2018-9-14 2018-9-15 {0:["BossFHOpen", []]} {} 110 1
2 test2 [7002] 2018-9-15 2018-9-16 {0:["BossFHOpen", []]} {} 110 2
+3 test3 [7001,7002] 2018-9-9 2018-9-10 {0:["BossFHOpen", []]} {} 110 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index 7d365e8..c223238 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -1,5 +1,5 @@
CfgID ActMark ServerIDList StartDate EndDate NotifyInfoStart NotifyInfoEnd LimitLV IsDayReset TemplateIDList
1 test1 [7001] 2018-9-10 2018-9-11 {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]} {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]} 50 0 1
2 test2 [7002] 2018-9-11 2018-9-12 {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]} {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]} 50 0 1
-3 NationalDay [24] 2018-7-13 2018-7-15 {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]} {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]} 50 1 1|2|3
+3 test2 [7003] 2018-9-12 2018-9-13 {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]} {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]} 50 0 1
4 NationalDay1 [24] 2018-7-16 2018-7-17 {0:["ConsumptionRebate1", []], 240:["ConsumptionRebate1", []], 480:["ConsumptionRebate1", []]} {-240:["ConsumptionRebate1", []], -480:["ConsumptionRebate1", []], 0:["ConsumptionRebate4", [2]]} 50 1 1
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
index 74975c6..f8fdfc8 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index 334979e..bacd167 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -97,7 +97,7 @@
"PetVP_1_31010":"max(((aMinAtk + aMaxAtk)/2.0-dDef),(aMinAtk+aMaxAtk)/2.0*0.05 + (aMinAtk+aMaxAtk)/2.0*0.1*rand)",
#火炬特殊伤害
- "EVP_1_4" :"int(max((1250-(dMinAtk+dMaxAtk)/2.0)*10,1)+max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
+ "EVP_1_4" :"int(max((1250-(dMinAtk+dMaxAtk)/2.0)*10,1)+max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
#渡劫
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index 7e63a3b..30f40a8 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -92,3 +92,18 @@
snxxz.ios.98 828115704 98 0 6
snxxz.ios.128 828115704 128 0 7
snxxz.ios.168 828115704 168 0 8
+575 498mrgame 18 101 0
+576 498mrgame 10 102 0
+577 498mrgame 30 103 0
+578 498mrgame 98 104 0
+579 498mrgame 128 105 0
+580 498mrgame 198 106 0
+581 498mrgame 328 107 0
+582 498mrgame 648 108 0
+583 498mrgame 3000 109 0
+584 498mrgame 1 110 0
+570 498mrgame 6 0 2
+571 498mrgame 30 0 4
+572 498mrgame 68 0 5
+573 498mrgame 128 0 7
+574 498mrgame 168 0 8
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 2ee0f56..4607e76 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -551,8 +551,8 @@
31103009 2 0 嗜天斧幻象 300 0 7186 7186 0 0 0 0 90000 17959 0 0 0 0 0 0 0 0 2600 49350 45 0 300 2 5 10009 0 0 0 0 0 0 0 0 40 2 40197221 0 0 0 0 3 0 0 186 1 1
31203001 2 0 焚源之炬幻象 70 0 1016 1016 619 0 0 0 10000 782 0 0 0 0 0 0 59360 4 2600 9869 10 0 300 2 5 11000 11001 10300 0 0 0 0 0 0 40 2 30419 0 0 0 0 3 0 0 186 1 1
31203002 2 0 摄魂铃幻象 100 0 1603 1603 0 0 0 0 10000 2352 0 0 0 0 0 0 119423 0 2600 14100 14 0 300 2 5 11002 11003 10301 0 0 0 0 0 0 40 2 133345 0 0 0 0 3 0 0 186 1 1
-31203003 2 0 乾云镜幻象 125 0 3350 3474 0 0 0 0 10000 4770 0 0 0 0 0 0 262708 0 2600 18330 19 0 300 2 5 11004 11005 10302 0 0 0 0 0 0 40 2 435644 0 0 0 0 3 0 0 186 1 1
-31203004 2 0 天丝琴幻象 160 0 5251 5251 0 0 0 0 10000 7795 0 0 0 0 0 0 623154 0 2600 21150 21 0 300 2 5 11006 11007 10303 0 0 0 0 0 0 40 2 1371266 0 0 0 0 3 0 0 186 1 1
+31203003 2 0 乾云镜幻象 125 0 3703 3703 0 0 0 0 10000 5465 0 0 0 0 0 0 356022 0 2600 18330 19 0 300 2 5 11004 11005 10302 0 0 0 0 0 0 40 2 618460 0 0 0 0 3 0 0 186 1 1
+31203004 2 0 天丝琴幻象 160 0 4934 4934 0 0 0 0 10000 7402 0 0 0 0 0 0 587840 0 2600 21150 21 0 300 2 5 11006 11007 10303 0 0 0 0 0 0 40 2 1281823 0 0 0 0 3 0 0 186 1 1
31203005 2 0 九幽胄幻象 180 0 6402 6402 0 0 0 0 10000 9164 0 0 0 0 0 0 769936 0 2600 23970 24 0 300 2 5 11008 11009 10304 0 0 0 0 0 0 40 2 1647280 0 0 0 0 3 0 0 186 1 1
31203006 2 0 碧霄剑幻象 200 0 9440 9440 3205 0 0 0 10000 13150 0 0 0 0 0 0 1198336 0 2600 26790 26 0 300 2 5 11010 11011 10305 0 0 0 0 0 0 40 2 2259566 0 0 0 0 3 0 0 186 1 1
31203007 2 0 明心扇幻象 220 0 12977 12977 4330 0 0 0 10000 16970 0 0 0 0 0 0 1751951 0 2600 29610 28 0 300 2 5 11012 11013 10306 0 0 0 0 0 0 40 2 5254527 0 0 0 0 3 0 0 186 1 1
@@ -762,12 +762,12 @@
60203018 18 0 魔坛巨兽 405 2 111128 111128 0 15 0 0 10000 8142 0 0 0 0 0 0 0 0 2500 2203578 52 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 53075605 280626 0 0 0 5 0 0 186 1 1
60203019 18 0 魔坛炎兽 430 2 168371 168371 0 17 0 0 10000 9455 0 0 0 0 0 0 0 0 2500 2238691 55 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 80306981 391553 0 0 0 5 0 0 186 1 1
60203020 18 0 刑天之主 455 2 303827 303827 0 20 0 0 10000 10546 0 0 0 0 0 0 0 0 2500 2274753 57 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 72283925 477365 0 0 0 5 0 0 186 1 1
-61103000 2 0 境界·个人 80 2 915 915 207 1 0 0 10000 330 0 0 0 0 0 0 32406 0 2500 279006 12 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 74816 0 0 0 0 3 0 7 186 1 1
-61103001 2 0 境界·个人 110 2 1463 1463 526 2 0 0 10000 533 0 0 0 0 0 0 97301 0 2500 390039 16 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 134318 0 0 0 0 3 0 8 186 1 1
-61103002 2 0 境界·个人 140 2 3776 3776 1540 4 0 0 10000 1463 0 0 0 0 0 0 229079 0 2500 531440 20 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 939107 0 0 0 0 3 0 9 186 1 1
-61103003 2 0 境界·个人 160 2 5068 5068 2157 5 0 0 10000 1975 0 0 0 0 0 0 377626 0 2500 634880 22 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 1631537 0 0 0 0 3 0 10 186 1 1
-61103004 2 0 境界·个人 205 2 10109 10109 1300 7 0 0 10000 3582 0 0 0 0 0 0 1034753 0 2500 916733 28 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 7798849 0 0 0 0 3 0 11 186 1 1
-61103005 2 0 境界·个人 230 2 13205 13205 1914 9 0 0 10000 4529 0 0 0 0 0 0 1599712 0 2500 1105585 31 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 17033779 0 0 0 0 3 0 12 186 1 1
+61103000 2 0 境界·个人 80 2 816 816 160 1 0 0 10000 300 0 0 0 0 0 0 32406 0 2500 243893 10 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 70231 0 0 0 0 3 0 7 186 1 1
+61103001 2 0 境界·个人 110 2 1881 1881 531 2 0 0 10000 735 0 0 0 0 0 0 97301 0 2500 390039 16 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 193528 0 0 0 0 3 0 8 186 1 1
+61103002 2 0 境界·个人 140 2 4047 4047 1888 4 0 0 10000 1550 0 0 0 0 0 0 319964 0 2500 582685 21 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 1251688 0 0 0 0 3 0 9 186 1 1
+61103003 2 0 境界·个人 160 2 5392 5392 2439 5 0 0 10000 2057 0 0 0 0 0 0 429383 0 2500 685177 24 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 2049890 0 0 0 0 3 0 10 186 1 1
+61103004 2 0 境界·个人 205 2 10668 10668 1408 7 0 0 10000 3731 0 0 0 0 0 0 1132621 0 2500 951846 28 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 9281187 0 0 0 0 3 0 11 186 1 1
+61103005 2 0 境界·个人 230 2 14452 14452 2128 9 0 0 10000 4790 0 0 0 0 0 0 1825117 0 2500 1188148 32 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 21824876 0 0 0 0 3 0 12 186 1 1
61103006 2 0 境界·个人 260 2 22483 22483 3167 11 0 0 10000 7083 0 0 0 0 0 0 3076461 0 2500 1353274 34 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 45790147 0 0 0 0 3 0 13 186 1 1
61103007 2 0 境界·个人 270 2 25322 25322 3529 12 0 0 10000 7899 0 0 0 0 0 0 3861992 0 2500 1435837 35 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 61922664 0 0 0 0 3 0 14 186 1 1
61103008 2 0 境界·个人 300 2 36300 36300 4878 14 0 0 10000 10398 0 0 0 0 0 0 5905484 0 2500 1683526 39 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 13434613 1 0 0 0 3 0 15 186 1 1
@@ -783,18 +783,18 @@
61103018 2 0 境界·个人 420 2 126156 126156 13376 22 0 0 10000 47395 0 0 0 0 0 0 23535315 0 2500 2195986 52 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 95579892 6 0 0 0 3 0 25 186 1 1
61103019 2 0 境界·个人 430 2 131588 131588 13977 22 0 0 10000 48131 0 0 0 0 0 0 25450532 0 2500 2210221 53 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 33526629 7 0 0 0 3 0 26 186 1 1
61103020 2 0 境界·个人 440 2 136985 136985 14572 22 0 0 10000 48922 0 0 0 0 0 0 27657569 0 2500 2224456 54 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 54896181 9 0 0 0 3 0 27 186 1 1
-61203001 2 0 境界·组队 125 2 3151 3151 269 3 0 0 10000 1300 0 0 0 0 0 0 145814 0 2500 453622 18 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 605170 0 0 0 0 3 0 28 186 1 1
-61203002 2 0 境界·组队 190 2 7395 7395 1039 6 0 0 10000 2617 0 0 0 0 0 0 746532 0 2500 809496 26 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 4487771 0 0 0 0 3 0 29 186 1 1
-61203003 2 0 境界·组队 220 2 11223 11223 1631 8 0 0 10000 3784 0 0 0 0 0 0 1336445 0 2500 1023022 29 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 13221460 0 0 0 0 3 0 30 186 1 1
+61203001 2 0 境界·组队 125 2 3341 3341 400 3 0 0 10000 1310 0 0 0 0 0 0 202286 0 2500 480194 19 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 874966 0 0 0 0 3 0 28 186 1 1
+61203002 2 0 境界·组队 190 2 7931 7931 1121 6 0 0 10000 2811 0 0 0 0 0 0 851127 0 2500 845558 27 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 5148996 0 0 0 0 3 0 29 186 1 1
+61203003 2 0 境界·组队 220 2 11749 11749 1758 8 0 0 10000 4033 0 0 0 0 0 0 1452255 0 2500 1064778 30 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 15547798 0 0 0 0 3 0 30 186 1 1
61203004 2 0 境界·组队 250 2 16155 16155 2351 10 0 0 10000 5126 0 0 0 0 0 0 2179851 0 2500 1270711 33 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 28363570 0 0 0 0 3 0 31 186 1 1
61203005 2 0 境界·组队 290 2 34494 34494 4372 13 0 0 10000 10339 0 0 0 0 0 0 5251783 0 2500 1600963 38 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 3212140 1 0 0 0 3 0 32 186 1 1
61203006 2 0 境界·组队 320 2 46696 46696 5939 16 0 0 10000 14845 0 0 0 0 0 0 7805561 0 2500 1848652 41 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 88063227 1 0 0 0 3 0 33 186 1 1
61203007 2 0 境界·组队 350 2 64856 64856 8169 19 0 0 10000 29877 0 0 0 0 0 0 11509678 0 2500 2096341 45 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 31568220 3 0 0 0 3 0 34 186 1 1
61203008 2 0 境界·组队 380 2 94952 94952 10908 22 0 0 10000 41516 0 0 0 0 0 0 16261918 0 2500 2139046 48 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 16133735 5 0 0 0 3 0 35 186 1 1
61303001 14 0 仙盟采集桌 1 0 1 1 1 13 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 15 2 3000 0 0 0 0 0 0 0 214 0 1
-30601001 2 0 暗影剑士 105 0 643 643 0 2 0 0 0 159 0 0 0 0 0 0 0 0 2500 38634 16 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 47423 0 0 0 0 1 0 0 1 1 1
-30601002 2 0 剑魂 105 0 611 611 0 2 0 0 0 128 0 0 0 0 0 0 0 0 2500 38634 16 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 71135 0 0 0 0 1 0 0 1 1 1
-30603001 2 0 御剑尊者 105 0 1864 1864 0 3 0 0 0 1332 0 0 0 0 0 0 0 0 2500 38634 16 0 300 2 6 10041 23030 10042 0 0 0 0 0 0 15 2 474239 0 0 0 0 5 0 0 186 1 1
+30601001 2 0 暗影剑士 105 0 740 740 0 2 0 0 0 171 0 0 0 0 0 0 0 0 2500 46530 18 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 40950 0 0 0 0 1 0 0 1 1 1
+30601002 2 0 剑魂 105 0 706 706 0 2 0 0 0 138 0 0 0 0 0 0 0 0 2500 46530 18 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 61426 0 0 0 0 1 0 0 1 1 1
+30603001 2 0 御剑尊者 105 0 2081 2081 0 3 0 0 0 1447 0 0 0 0 0 0 0 0 2500 46530 18 0 300 2 6 10041 23030 10042 0 0 0 0 0 0 15 2 409519 0 0 0 0 5 0 0 186 1 1
30601003 2 0 魔化哨兵 150 0 1240 1240 0 5 0 0 0 419 0 0 0 0 0 0 0 0 2500 57715 21 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 158536 0 0 0 0 1 0 0 1 1 1
30601004 2 0 狂暴妖兵 150 0 1150 1150 0 5 0 0 0 335 0 0 0 0 0 0 0 0 2500 57715 21 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 203833 0 0 0 0 1 0 0 1 1 1
30601005 2 0 魔界冥魂 150 0 2957 2957 0 6 0 0 0 2018 0 0 0 0 0 0 0 0 2500 57715 21 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 905928 0 0 0 0 1 0 0 1 1 1
--
Gitblit v1.8.0