From c09f709ded11ba545758921bdb6ed7389e9c076e Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期三, 21 十一月 2018 15:04:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 8 ++++----
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 8 ++++----
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 5 +++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt | 4 ++--
db/PyMongoDataServer/PySysDB/tagFightPowerParam.txt | 4 ++--
6 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index c71d5b1..85ccb9d 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -507,10 +507,10 @@
30303010 潮汐巨兽 300
30303011 极炎巨兽 350
30303012 白泽 400
-30303013 极冰之心 1
-30303014 潮汐巨兽 1
-30303015 极炎巨兽 1
-30303016 白泽 1
+30303013 蜘蛛皇后 1
+30303014 巨木石人 1
+30303015 剧毒蛇王 1
+30303016 古森之灵 1
30403001 仙魔之争NPC 90
30403002 仙魔守卫 90
30403003 仙魔守卫 90
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index b4eb2ae..ae84005 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -107,8 +107,8 @@
#符印塔特殊公式等级压制
#_100 前2座塔，等级碾压
"EVP_1_100" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0-dDef,0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+min(suppressLV,1)*0.2*dMaxHP+suppressValueFP-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
- #_101 后10座塔，等级压制
- "EVP_1_101" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0*(1+min(max(suppressLV-10,0)*0.01,0.2)+min(max(suppressFightPower*1.0/suppressNPCFightPower-0,-0.02),0.05)*8+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.05,0),0.15)*10+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.2,0),1)*15)-dDef,0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+suppressValueFP-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
+ #_101 后10座塔，战力压制
+ "EVP_1_101" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0*(1+min(max(suppressFightPower*1.0/suppressNPCFightPower-0,-0.02),0.05)*8+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.05,0),0.15)*10+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.2,0),1)*15)-dDef,0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+suppressValueFP-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
#BOSS境界压制公式
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerActivity.pyc
index 51504d9..cec2487 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/db/PyMongoDataServer/PySysDB/tagFightPowerParam.txt b/db/PyMongoDataServer/PySysDB/tagFightPowerParam.txt
index 3f7bf63..38203a9 100644
--- a/db/PyMongoDataServer/PySysDB/tagFightPowerParam.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFightPowerParam.txt
@@ -308,8 +308,8 @@
307 6340 6340 929553 1907531 669277 381506 38731 1239405 228903 371821 557731 1526024 929553 1907531 780353 669277 1239405 1239405 371821 501957 1239405 1734119
308 6360 6360 937942 1943237 675318 388647 39080 1250589 233188 375176 562765 1554589 937942 1943237 794960 675318 1250589 1250589 375176 506488 1250589 1766579
309 6380 6380 947032 1965104 681862 393020 39459 1262709 235812 378812 568219 1572083 947032 1965104 803906 681862 1262709 1262709 378812 511397 1262709 1786458
-310 6400 6400 944794 1944573 680251 388914 39366 1259726 233348 377917 566876 1555658 944794 1944573 795507 680251 1259726 1259726 377917 510188 1259726 1767794
-311 6420 6420 952281 1962737 685641 392547 39678 1269708 235528 380912 571368 1570189 952281 1962737 802938 685641 1269708 1269708 380912 514231 1269708 1784306
+310 6400 6400 949294 1966573 683491 393314 39553 1265726 235988 379717 569576 1573258 949294 1966573 804507 683491 1265726 1265726 379717 512618 1265726 1787794
+311 6420 6420 952281 1973737 685641 394747 39678 1269708 236848 380912 571368 1578989 952281 1973737 807438 685641 1269708 1269708 380912 514231 1269708 1794306
312 6440 6440 960021 1981283 691214 396256 40000 1280028 237753 384008 576012 1585026 960021 1981283 810524 691214 1280028 1280028 384008 518410 1280028 1801166
313 6460 6460 968430 1997846 697269 399569 40351 1291240 239741 387372 581058 1598276 968430 1997846 817300 697269 1291240 1291240 387372 522952 1291240 1816223
314 6480 6480 979855 2032930 705495 406586 40827 1306473 243951 391942 587913 1626344 979855 2032930 831653 705495 1306473 1306473 391942 529121 1306473 1848118
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 739cb92..132d16a 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -14,8 +14,8 @@
UnShowMsgBuffItemID 901|902|903 0 0 0 0
PackageSortPriority 1|5|81|4|14|13|8|9|26|28|125|27|41|22|124|21|25|20|45|58|54|39|52|6|34|35|36|76|11|12|15|17|29|44|48|50|51|60|80|7|101|102|103|104|105|106|107|108|109|111|112 0 0 0 0
IceLodeSweep {31401001:10,31403001:2} 0 0 0 0
-IceLodeCfg 50 [8,5] 200 [[16,1,1]] 3
IceLodeNeedPoint 1500 31401001_50|31403001_300 0 0 0
+IceLodeCfg 50 [8,5] 200 [[16,1,1]] 3
ClearDevilPoint 1200 {30102001:20,30102002:50,30102003:300} 0 0 0
AI197Point {"31040":[[16,34],[18,99]]}
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]]}
@@ -101,7 +101,8 @@
GodWeapon4 110|111|112 0 0 0 0
GodWeaponActive 1|2|4 {"2":[[1,10]], "3":[[1,15], [2,10]], "4":[[2,20], [3,10]]} 0 0 0
GodWeaponSys {1:'GetGodWeapon',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon2'}
-GodLv {1:[100,200,300,400],2:[100,200,300,400],3:[100,200,300,400]}
+GodLv {1:[50,150,200,250,325,500,650],2:[50,150,200,250,325,500,65],3:[50,150,200,250,325,500,65]}
+GodMagicExp {"1":[10,10],"2":[15,15],"4":[25,25]}
WorldLvExpRate int((max(min((worldLv-playerLv)*0.0075,0.15)-max(worldLv-playerLv-20,0),0)+min((max((worldLv-playerLv-20),0)/200.0),0.5)+min((math.sqrt(max((worldLv-playerLv-20),0)/100.0)*1.5),1.5))*10000) 0 0 0 0
EquipSuitLimit 4 2 3 0 0
EquipSuitColorStar {"1":[4,1],"2":[5,2]} 2
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 56790e4..064f03f 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -507,10 +507,10 @@
30303010 2 0 潮汐巨兽 300 0 22498 22498 0 13 0 0 10000 18455 0 1 0 0 0 0 0 3 3000 1365193 93 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 57905998 3 10000 0 0 5 0 0 186 1 1
30303011 2 0 极炎巨兽 350 0 33098 33098 0 17 0 0 10000 30106 0 1 0 0 0 0 0 3 3000 1655663 116 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 23040341 8 10000 0 0 5 0 0 186 1 1
30303012 2 0 白泽 400 0 56742 56742 0 22 0 0 10000 49103 0 1 0 0 0 0 0 3 3000 1989837 143 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 27378150 15 10000 0 0 5 0 0 186 1 1
-30303013 2 0 极冰之心 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1
-30303014 2 0 潮汐巨兽 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1
-30303015 2 0 极炎巨兽 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1
-30303016 2 0 白泽 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1
+30303013 2 0 蜘蛛皇后 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1
+30303014 2 0 巨木石人 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1
+30303015 2 0 剧毒蛇王 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1
+30303016 2 0 古森之灵 1 0 3 3 3 1 0 0 3 3 3 1 0 0 0 0 0 0 0 3 3 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 3 3 10000 0 0 5 0 0 186 1 1
30403001 2 0 仙魔之争NPC 90 0 341 361 53 0 0 0 10000 102 0 0 0 0 0 0 0 0 2000 128115 13 0 200 2 6 0 0 0 0 0 0 0 0 0 40 1 586760 0 10000 0 0 5 0 0 186 1 1
30403002 2 0 仙魔守卫 90 0 341 361 53 0 0 0 10000 102 0 0 0 0 0 0 0 0 2000 128115 13 0 200 2 6 0 0 0 0 0 0 0 0 0 40 1 586760 0 10000 0 0 5 0 0 186 1 1
30403003 2 0 仙魔守卫 90 0 341 361 53 0 0 0 10000 102 0 0 0 0 0 0 0 0 2000 128115 13 0 200 2 6 0 0 0 0 0 0 0 0 0 40 1 586760 0 10000 0 0 5 0 0 186 1 1
--
Gitblit v1.8.0