From ca12c024956fd6cb3e2bf7008ad2c8753ad1240d Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 23 八月 2018 22:48:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagSuccess.txt | 42 +++++++++++++++++++++---------------------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 3 ++-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagAttrFruit.txt | 2 +-
7 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
index ac9403e..9e610ad 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 4464482..b124259 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc
index 690fa9b..8a783a2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
index 5b8d95c..4d5e331 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
index 16cb3a1..bee7af1 100644
--- a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
@@ -63,7 +63,7 @@
4724 2 24 625
4727 2 25 625
4729 2 20 625
-4740 2 1 1000
+4740 2 2 1000
4730 2 2 1000
4731 2 2 1000
4732 2 5 1000
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index c98c344..a1af635 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -103,6 +103,7 @@
GoldModel [(500,2100),(2000,2101),(10000,2102)] 0 0 0 0
MapItemProtectTime 60000 0 0 0 0
MapItemDisappearTime 60000 0 0 0 0
+DropEquipPlaceMode 0 3 0 0 0
EquipDropBindingRule 0 [108] 0 0
MonsterDropBindingRule [4003,4002,4005,4006,956,4501,4502,5012,5022] 0 0 0 0
BossDropBindingRule [959,984,958,4184,987,988,989,990,991,994,995,996,997,998,999,181,2339] 0 0 0 0
@@ -192,7 +193,7 @@
XjmjMonsterExp baseExp*expMulti*min((hurtValue*1.0/npcMaxHP),2.8)*reExp*(1+max(min(playerCnt-1,1),0)*0.06+max(min(playerCnt-2,1),0)*0.02-max(min(playerCnt-3,1),0)*0.03)*0.8 2 0 0 0
XjmjFirstEnter [5000, 25, 911] 350000
AlchemyNotify 3 4716 4712|4708|4721|4713|4709|4722|4714|4710|4723|4728|4715|4724|4729
-SpecialAlchemy {103:{2:[[1,4717,1]]},104:{8:[[1,4730,1]]}} {1:{2:[[1,1128,1]]},11:{2:[[1,4681,1]]},31:{3:[[1,4206,1]]},21:{2:[[1,4680,1]]},32:{5:[[1,253,1]]},22:{2:[[1,4680,1]]}} {4206:1,253:1}
+SpecialAlchemy {102:{1:[[1,4707,1]],2:[[1,4716,1]]},103:{3:[[1,4717,1]],6:[[1,4740,1]]},104:{8:[[1,4730,1]]}} {1:{2:[[1,1128,1]]},11:{2:[[1,4681,1]]},31:{3:[[1,4206,1]]},21:{2:[[1,4680,1]]},32:{5:[[1,253,1]]},22:{2:[[1,4680,1]]}} {4206:1,253:1}
TreasureUpRateItem 101|105|106|107|104|102|109|110 4601|4602|4603|4604|4605
ClientFightEnable 1 0 0 0 0
GodAreaExpAward {"Exp":"int(reExp*10)"} 5 0
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index 9d254f7..eae6bee 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -49,13 +49,13 @@
324 4 4 0 0 2_10 0 0 107 10
325 36 1 60203007 0 2_10 0 0 107 10
326 10 1 100|4 0 2_10 0 0 107 10
-327 94 1 4706 0 2_10 0 0 107 10
-328 94 3 4706 0 2_10 0 0 107 10
-329 94 1 4707 0 2_10 0 0 107 10
+327 127 1 1 0 2_10 0 0 107 10
+328 127 3 1 0 2_10 0 0 107 10
+329 127 2 2 0 2_10 0 0 107 10
330 2 20 0 0 2_10 0 0 107 10
341 50 3 0 0 2_10 0 0 107 10
-342 94 5 4706 0 2_10 0 0 107 10
-343 94 3 4707 0 2_10 0 0 107 10
+342 127 5 1 0 2_10 0 0 107 10
+343 127 6 2 0 2_10 0 0 107 10
344 6 1 0 0 2_10 0 0 107 10
345 26 140 0 0 2_10 0 0 107 10
346 49 1 3 0 2_10 0 0 107 10
@@ -80,7 +80,7 @@
401 26 160 0 0 2_10 0 0 108 10
402 48 18 0 0 2_10 0 0 108 10
403 48 21 0 0 2_10 0 0 108 10
-404 94 5 4707 0 2_10 0 0 108 10
+404 127 10 2 0 2_10 0 0 108 10
405 2 80 0 0 2_10 0 0 108 10
406 58 1 50106001|15 0 2_10 0 0 108 10
407 42 1 308 0 2_10 0 0 108 10
@@ -89,7 +89,7 @@
423 121 2 0 0 2_10 0 0 108 10
424 63 1 1 0 2_10 0 0 108 10
425 58 1 50106001|20 0 2_10 0 0 108 10
-426 94 1 4708 0 2_10 0 0 108 10
+426 127 4 3 0 2_10 0 0 108 10
427 10 1 100|15 0 2_10 0 0 108 10
428 10 1 100|20 0 2_10 0 0 108 10
429 10 1 201|4 0 2_10 0 0 108 10
@@ -99,7 +99,7 @@
433 7 8 0 0 2_10 0 0 108 10
434 39 5 4|4 0 2_10 0 0 108 10
441 33 1 307|0 0 2_10 0 0 108 10
-442 94 3 4708 0 2_10 0 0 108 10
+442 127 12 3 0 2_10 0 0 108 10
443 42 1 404 0 2_10 0 0 108 10
444 46 6 0 0 2_10 0 0 108 10
445 46 8 0 0 2_10 0 0 108 10
@@ -130,9 +130,9 @@
521 50 7 0 0 2_10 0 0 109 10
522 50 8 0 0 2_10 0 0 109 10
523 58 1 50106102|10 0 2_10 0 0 109 10
-524 94 5 4708 0 2_10 0 0 109 10
-525 94 2 4709 0 2_10 0 0 109 10
-526 94 4 4709 0 2_10 0 0 109 10
+524 127 20 3 0 2_10 0 0 109 10
+525 127 10 4 0 2_10 0 0 109 10
+526 127 20 4 0 2_10 0 0 109 10
527 63 1 3 0 2_10 0 0 109 10
528 42 1 504 0 2_10 0 0 109 10
529 92 5 1|1|1 0 2_10 0 0 109 10
@@ -148,12 +148,12 @@
545 10 1 101|20 0 2_10 0 0 109 10
546 58 1 50106002|15 0 2_10 0 0 109 10
547 58 1 50106002|20 0 2_10 0 0 109 10
-548 94 6 4709 0 2_10 0 0 109 10
+548 127 30 4 0 2_10 0 0 109 10
549 63 1 4 0 2_10 0 0 109 10
550 62 1 30 0 2_10 0 0 109 10
551 92 5 2|1|1 0 2_10 0 0 109 10
561 50 10 0 0 2_10 0 0 109 10
-562 94 2 4710 0 2_10 0 0 109 10
+562 127 12 5 0 2_10 0 0 109 10
563 92 5 3|1|1 0 2_10 0 0 109 10
564 42 1 604 0 2_10 0 0 109 10
565 62 1 40 0 2_10 0 0 109 10
@@ -165,7 +165,7 @@
602 125 2 0 0 2_10 0 0 110 10
603 10 1 201|15 0 2_10 0 0 110 10
604 36 1 60203012 0 2_10 0 0 110 10
-605 94 4 4710 0 2_10 0 0 110 10
+605 127 24 5 0 2_10 0 0 110 10
606 26 320 0 0 2_10 0 0 110 10
621 50 11 0 0 2_10 0 0 110 10
622 70 1 2 0 2_10 0 0 110 10
@@ -177,8 +177,8 @@
628 58 1 50106102|20 0 2_10 0 0 110 10
629 125 4 0 0 2_10 0 0 110 10
630 125 6 0 0 2_10 0 0 110 10
-631 94 6 4710 0 2_10 0 0 110 10
-632 94 8 4710 0 2_10 0 0 110 10
+631 127 36 5 0 2_10 0 0 110 10
+632 127 48 5 0 2_10 0 0 110 10
633 42 1 608 0 2_10 0 0 110 10
634 92 3 1|2|1 0 2_10 0 0 110 10
635 71 1 2 0 2_10 0 0 110 10
@@ -192,8 +192,8 @@
648 125 10 0 0 2_10 0 0 110 10
649 125 12 0 0 2_10 0 0 110 10
650 125 14 0 0 2_10 0 0 110 10
-651 94 2 4711 0 2_10 0 0 110 10
-652 94 4 4711 0 2_10 0 0 110 10
+651 127 12 6 0 2_10 0 0 110 10
+652 127 24 6 0 2_10 0 0 110 10
653 26 360 0 0 2_10 0 0 110 10
654 42 1 704 0 2_10 0 0 110 10
655 42 1 708 0 2_10 0 0 110 10
@@ -210,9 +210,9 @@
676 125 16 0 0 2_10 0 0 110 10
677 125 18 0 0 2_10 0 0 110 10
678 125 20 0 0 2_10 0 0 110 10
-679 94 6 4711 0 2_10 0 0 110 10
-680 94 8 4711 0 2_10 0 0 110 10
-681 94 10 4711 0 2_10 0 0 110 10
+679 127 36 6 0 2_10 0 0 110 10
+680 127 48 6 0 2_10 0 0 110 10
+681 127 60 6 0 2_10 0 0 110 10
682 49 1 6 0 2_10 0 0 110 10
683 42 1 804 0 2_10 0 0 110 10
684 42 1 808 0 2_10 0 0 110 10
--
Gitblit v1.8.0