From e2bbfb92b85beec9a3674a390a9d8347f508adc3 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期四, 23 八月 2018 22:04:55 +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
db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt | 118 +++++++++++++++++++-------------------
db/PyMongoDataServer/PySysDB/tagSuccess.txt | 42 +++++++-------
db/PyMongoDataServer/PySysDB/tagRealm.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc | 0
6 files changed, 81 insertions(+), 81 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..51f3177 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/db/PyMongoDataServer/PySysDB/tagRealm.txt b/db/PyMongoDataServer/PySysDB/tagRealm.txt
index 25feac9..7ea1216 100644
--- a/db/PyMongoDataServer/PySysDB/tagRealm.txt
+++ b/db/PyMongoDataServer/PySysDB/tagRealm.txt
@@ -1,6 +1,6 @@
Lv IsBigRealm NeedPoint NeedGood NeedNum NeedActiveTreasure AddAttrType AddAttrNum BossID SitTime TeamAward
0 0 450 0 0 0 6|7 0|0 61103000 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
-1 0 580 0 0 0 6|7 4700|230 61103001 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
+1 0 540 0 0 0 6|7 4700|230 61103001 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
2 1 600 0 0 0 6|7 9900|490 61203001 {"1":0,"2":0,"3":0,"4":0,"5":0} {0:[(105,1,1),(102,3,1)]}
3 0 800 0 0 0 6|7|19 18700|940|1000 61103002 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
4 0 950 0 0 0 6|7|19 25100|1260|1000 61103003 {"1":0,"2":0,"3":0,"4":0,"5":0} 0
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index 9d254f7..452658d 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 94 36 6 0 2_10 0 0 110 10
+680 94 48 6 0 2_10 0 0 110 10
+681 94 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
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt b/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
index 2568511..49c726b 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
@@ -4,73 +4,73 @@
1 3 99980 10000 141|142|143|144 0|0|0|0 10000|10000|10000|10000
1 4 142911 1500 141|142|143|144 1|1|1|1 8000|8000|8000|8000
1 5 158649 1500 141|142|143|144 2|2|2|2 8000|8000|8000|8000
-1 6 191896 1500 141|142|143|144 4|4|4|4 8000|8000|8000|8000
+1 6 191896 1500 141|142|143|144 3|3|3|3 8000|8000|8000|8000
1 7 210569 1500 141|142|143|144 4|4|4|4 8000|8000|8000|8000
1 8 249072 1500 141|142|143|144 5|5|5|5 8000|8000|8000|8000
-1 9 269795 1500 141|142|143|144 7|7|7|7 8000|8000|8000|8000
+1 9 269795 1500 141|142|143|144 6|6|6|6 8000|8000|8000|8000
1 10 512473 1500 141|142|143|144 7|7|7|7 8000|8000|8000|8000
-1 11 583019 1500 141|142|143|144 9|9|9|9 8000|8000|8000|8000
-1 12 658325 1500 141|142|143|144 11|11|11|11 8000|8000|8000|8000
+1 11 583019 1500 141|142|143|144 8|8|8|8 8000|8000|8000|8000
+1 12 658325 1500 141|142|143|144 10|10|10|10 8000|8000|8000|8000
1 13 828443 1500 141|142|143|144 11|11|11|11 8000|8000|8000|8000
-1 14 877109 1500 141|142|143|144 14|14|14|14 8000|8000|8000|8000
-1 15 977697 1500 141|142|143|144 16|16|16|16 8000|8000|8000|8000
-1 16 1591679 1000 141|142|143|144 15|15|15|15 1100|6000|6000|6000
-1 17 1732645 1000 141|142|143|144 17|17|17|17 1100|6000|6000|6000
-1 18 1879975 1000 141|142|143|144 19|19|19|19 1100|6000|6000|6000
-1 19 1950011 1000 141|142|143|144 20|20|20|20 1100|6000|6000|6000
-1 20 2300866 1000 141|142|143|144 23|23|23|23 1100|6000|6000|6000
-1 21 2000561 500 141|142|143|144 18|18|18|18 600|800|6000|6000
-1 22 2175469 500 141|142|143|144 19|19|19|19 600|800|6000|6000
-1 23 2258250 500 141|142|143|144 25|25|25|25 600|800|6000|6000
-1 24 2445834 500 141|142|143|144 26|26|26|26 600|800|6000|6000
-1 25 2888102 500 141|142|143|144 34|34|34|34 600|800|6000|6000
+1 14 877109 1500 141|142|143|144 13|13|13|13 8000|8000|8000|8000
+1 15 977697 1500 141|142|143|144 14|14|14|14 8000|8000|8000|8000
+1 16 1591679 1000 141|142|143|144 14|14|14|14 1100|6000|6000|6000
+1 17 1732645 1000 141|142|143|144 16|16|16|16 1100|6000|6000|6000
+1 18 1879975 1000 141|142|143|144 17|17|17|17 1100|6000|6000|6000
+1 19 1950011 1000 141|142|143|144 18|18|18|18 1100|6000|6000|6000
+1 20 2300866 1000 141|142|143|144 20|20|20|20 1100|6000|6000|6000
+1 21 2000561 500 141|142|143|144 21|21|21|21 600|800|6000|6000
+1 22 2175469 500 141|142|143|144 22|22|22|22 600|800|6000|6000
+1 23 2258250 500 141|142|143|144 24|24|24|24 600|800|6000|6000
+1 24 2445834 500 141|142|143|144 29|29|29|29 600|800|6000|6000
+1 25 2888102 500 141|142|143|144 30|30|30|30 600|800|6000|6000
2 1 731188 1000 141|142|143|144 3|3|3|3 1100|8000|8000|8000
2 2 912493 1000 141|142|143|144 4|4|4|4 1100|8000|8000|8000
-2 3 960592 1000 141|142|143|144 6|6|6|6 1100|8000|8000|8000
-2 4 1066466 1000 141|142|143|144 9|9|9|9 1100|8000|8000|8000
-2 5 1118527 1000 141|142|143|144 12|12|12|12 1100|8000|8000|8000
-2 6 1231684 1000 141|142|143|144 20|20|20|20 1100|8000|8000|8000
+2 3 960592 1000 141|142|143|144 5|5|5|5 1100|8000|8000|8000
+2 4 1066466 1000 141|142|143|144 8|8|8|8 1100|8000|8000|8000
+2 5 1118527 1000 141|142|143|144 11|11|11|11 1100|8000|8000|8000
+2 6 1231684 1000 141|142|143|144 18|18|18|18 1100|8000|8000|8000
2 7 1287743 1000 141|142|143|144 23|23|23|23 1100|8000|8000|8000
-2 8 1558742 1000 141|142|143|144 28|28|28|28 1100|8000|8000|8000
+2 8 1558742 1000 141|142|143|144 26|26|26|26 1100|8000|8000|8000
2 9 1995084 500 141|142|143|144 17|17|17|17 600|800|8000|8000
-2 10 2066440 500 141|142|143|144 21|21|21|21 600|800|8000|8000
-2 11 2420842 500 141|142|143|144 22|22|22|22 600|800|8000|8000
-2 12 2499064 500 141|142|143|144 35|35|35|35 600|800|8000|8000
-2 13 2691975 500 141|142|143|144 29|29|29|29 600|800|8000|8000
-2 14 2776143 500 141|142|143|144 38|38|38|38 600|800|8000|8000
-2 15 3258801 500 141|142|143|144 40|40|40|40 600|800|8000|8000
-2 16 4937953 300 141|142|143|144 14|14|14|14 400|600|800|6000
-2 17 5798862 300 141|142|143|144 17|17|17|17 400|600|800|6000
+2 10 2066440 500 141|142|143|144 20|20|20|20 600|800|8000|8000
+2 11 2420842 500 141|142|143|144 25|25|25|25 600|800|8000|8000
+2 12 2499064 500 141|142|143|144 28|28|28|28 600|800|8000|8000
+2 13 2691975 500 141|142|143|144 35|35|35|35 600|800|8000|8000
+2 14 2776143 500 141|142|143|144 37|37|37|37 600|800|8000|8000
+2 15 3258801 500 141|142|143|144 43|43|43|43 600|800|8000|8000
+2 16 4937953 300 141|142|143|144 13|13|13|13 400|600|800|6000
+2 17 5798862 300 141|142|143|144 15|15|15|15 400|600|800|6000
2 18 6734879 300 141|142|143|144 21|21|21|21 400|600|800|6000
-2 19 7889366 300 141|142|143|144 24|24|24|24 400|600|800|6000
-2 20 8695163 300 141|142|143|144 24|24|24|24 400|600|800|6000
-2 21 9541900 300 141|142|143|144 28|28|28|28 400|600|800|6000
-2 22 10355743 300 141|142|143|144 31|31|31|31 400|600|800|6000
+2 19 7889366 300 141|142|143|144 22|22|22|22 400|600|800|6000
+2 20 8695163 300 141|142|143|144 25|25|25|25 400|600|800|6000
+2 21 9541900 300 141|142|143|144 26|26|26|26 400|600|800|6000
+2 22 10355743 300 141|142|143|144 28|28|28|28 400|600|800|6000
2 23 11029496 300 141|142|143|144 34|34|34|34 400|600|800|6000
-2 24 11703248 300 141|142|143|144 39|39|39|39 400|600|800|6000
+2 24 11703248 300 141|142|143|144 36|36|36|36 400|600|800|6000
2 25 12377001 300 141|142|143|144 43|43|43|43 400|600|800|6000
-3 1 840663 500 141|142|143|144 14|14|14|14 600|800|8000|8000
-3 2 902714 500 141|142|143|144 16|16|16|16 600|800|8000|8000
-3 3 1012188 500 141|142|143|144 21|21|21|21 600|800|8000|8000
-3 4 1078719 500 141|142|143|144 28|28|28|28 600|800|8000|8000
-3 5 1146159 500 141|142|143|144 30|30|30|30 600|800|8000|8000
-3 6 2303447 500 141|142|143|144 39|39|39|39 600|800|8000|8000
-3 7 2338531 500 141|142|143|144 42|42|42|42 600|800|8000|8000
-3 8 2703406 500 141|142|143|144 40|40|40|40 600|800|8000|8000
-3 9 3517383 300 141|142|143|144 17|17|17|17 400|600|800|8000
-3 10 4283005 300 141|142|143|144 20|20|20|20 400|600|800|8000
-3 11 4910626 300 141|142|143|144 24|24|24|24 400|600|800|8000
-3 12 5776034 300 141|142|143|144 27|27|27|27 400|600|800|8000
-3 13 6458234 300 141|142|143|144 33|33|33|33 400|600|800|8000
-3 14 7563019 300 141|142|143|144 36|36|36|36 400|600|800|8000
-3 15 8316268 300 141|142|143|144 34|34|34|34 400|600|800|8000
-3 16 9089116 300 141|142|143|144 43|43|43|43 400|600|800|6000
-3 17 9882849 300 141|142|143|144 49|49|49|49 400|600|800|6000
-3 18 10698799 300 141|142|143|144 52|52|52|52 400|600|800|6000
-3 19 11538341 300 141|142|143|144 51|51|51|51 400|600|800|6000
-3 20 12286910 300 141|142|143|144 66|66|66|66 400|600|800|6000
-3 21 12992746 300 141|142|143|144 75|75|75|75 400|600|800|6000
-3 22 13698581 300 141|142|143|144 70|70|70|70 400|600|800|6000
-3 23 14404417 300 141|142|143|144 84|84|84|84 400|600|800|6000
-3 24 15110253 300 141|142|143|144 89|89|89|89 400|600|800|6000
-3 25 15816089 300 141|142|143|144 92|92|92|92 400|600|800|6000
+3 1 840663 500 141|142|143|144 13|13|13|13 600|800|8000|8000
+3 2 902714 500 141|142|143|144 15|15|15|15 600|800|8000|8000
+3 3 1012188 500 141|142|143|144 20|20|20|20 600|800|8000|8000
+3 4 1078719 500 141|142|143|144 25|25|25|25 600|800|8000|8000
+3 5 1146159 500 141|142|143|144 31|31|31|31 600|800|8000|8000
+3 6 2303447 500 141|142|143|144 35|35|35|35 600|800|8000|8000
+3 7 2338531 500 141|142|143|144 40|40|40|40 600|800|8000|8000
+3 8 2703406 500 141|142|143|144 55|55|55|55 600|800|8000|8000
+3 9 3517383 300 141|142|143|144 15|15|15|15 400|600|800|8000
+3 10 4283005 300 141|142|143|144 18|18|18|18 400|600|800|8000
+3 11 4910626 300 141|142|143|144 21|21|21|21 400|600|800|8000
+3 12 5776034 300 141|142|143|144 28|28|28|28 400|600|800|8000
+3 13 6458234 300 141|142|143|144 31|31|31|31 400|600|800|8000
+3 14 7563019 300 141|142|143|144 33|33|33|33 400|600|800|8000
+3 15 8316268 300 141|142|143|144 36|36|36|36 400|600|800|8000
+3 16 9089116 300 141|142|143|144 40|40|40|40 400|600|800|6000
+3 17 9882849 300 141|142|143|144 45|45|45|45 400|600|800|6000
+3 18 10698799 300 141|142|143|144 48|48|48|48 400|600|800|6000
+3 19 11538341 300 141|142|143|144 53|53|53|53 400|600|800|6000
+3 20 12286910 300 141|142|143|144 61|61|61|61 400|600|800|6000
+3 21 12992746 300 141|142|143|144 69|69|69|69 400|600|800|6000
+3 22 13698581 300 141|142|143|144 73|73|73|73 400|600|800|6000
+3 23 14404417 300 141|142|143|144 78|78|78|78 400|600|800|6000
+3 24 15110253 300 141|142|143|144 82|82|82|82 400|600|800|6000
+3 25 15816089 300 141|142|143|144 97|97|97|97 400|600|800|6000
--
Gitblit v1.8.0