From 8c1e63d1bebc26be8a4b7b13d05bfdb00ff652cd Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期一, 08 十月 2018 09:53:09 +0800
Subject: [PATCH] Merge branch '1.0.18' of http://192.168.0.87:10010/r/snxx_server into 1.0.18
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc | 0
db/PyMongoDataServer/PySysDB/tagItemCompound.txt | 16 ++++++++--------
db/PyMongoDataServer/PySysDB/tagStore.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc | 0
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 2 +-
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt | 18 +++++++++---------
CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt | 12 ++++++------
10 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt b/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
index a989e15..a0d984a 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBStateTime.txt
@@ -14,11 +14,11 @@
13 31160 2 20 30 21 0 1 1 {}
14 31160 4 20 30 21 0 1 1 {}
15 31160 6 20 30 21 0 1 1
-16 31220 2 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
-17 31220 2 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-18 31220 2 21 21 21 25 0 13 {}
-19 31220 2 21 25 21 30 0 21 {0:["FamilyMatchTime", []]}
-20 31220 2 21 30 21 50 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-21 31220 2 21 51 23 59 0 23 {}
+16 31220 5 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
+17 31220 5 21 0 21 20 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+18 31220 5 21 21 21 25 0 13 {}
+19 31220 5 21 25 21 30 0 21 {0:["FamilyMatchTime", []]}
+20 31220 5 21 30 21 50 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+21 31220 5 21 51 23 59 0 23 {}
23 31010 3 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
24 31010 7 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
diff --git a/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt b/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt
index 69d1213..1a5515d 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt
@@ -1,10 +1,10 @@
WorldLvNum Rank Award
-0 1 {"1":[[2278,1,1]],"2":[[2278,1,1]]}
-0 2 {"1":[[10871,1,1]],"2":[[20871,1,1]]}
-0 3 {"1":[[10872,1,1]],"2":[[20872,1,1]]}
-1 1 {"1":[[2278,1,1]],"2":[[2278,1,1]]}
-1 2 {"1":[[10871,1,1]],"2":[[20871,1,1]]}
-1 3 {"1":[[10872,1,1]],"2":[[20872,1,1]]}
-2 1 {"1":[[2278,1,1]],"2":[[2278,1,1]]}
-2 2 {"1":[[10871,1,1]],"2":[[20871,1,1]]}
-2 3 {"1":[[10872,1,1]],"2":[[20872,1,1]]}
+0 1 {"1":[[2278,1,0]],"2":[[2278,1,0]]}
+0 2 {"1":[[10871,1,0]],"2":[[20871,1,0]]}
+0 3 {"1":[[10872,1,0]],"2":[[20872,1,0]]}
+1 1 {"1":[[2278,1,0]],"2":[[2278,1,0]]}
+1 2 {"1":[[10871,1,0]],"2":[[20871,1,0]]}
+1 3 {"1":[[10872,1,0]],"2":[[20872,1,0]]}
+2 1 {"1":[[2278,1,0]],"2":[[2278,1,0]]}
+2 2 {"1":[[10871,1,0]],"2":[[20871,1,0]]}
+2 3 {"1":[[10872,1,0]],"2":[[20872,1,0]]}
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
index ede57ea..7bd542e 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc
index 0a2c670..127bdad 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_EquipWash.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
index 10e1567..6c1a5f2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ItemControler.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index 9fa0613..bb50d05 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.pyc
index fddd73f..87fde06 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 585669f..aeea339 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -175,5 +175,5 @@
2388 0 [[2000,[8352,1]],[2500,[8201,1]],[3000,[8214,1]],[3500,[8227,1]],[4000,[8240,1]],[4500,[8253,1]],[5400,[8202,1]],[6300,[8215,1]],[7200,[8228,1]],[8100,[8241,1]],[9000,[8254,1]],[9200,[8203,1]],[9400,[8216,1]],[9600,[8229,1]],[9800,[8242,1]],[10000,[8255,1]]] 1
2389 0 8353_2 [[571,[8202,1]],[1142,[8215,1]],[1714,[8228,1]],[2285,[8241,1]],[2857,[8254,1]],[4057,[8203,1]],[5257,[8216,1]],[6457,[8229,1]],[7657,[8242,1]],[8857,[8255,1]],[9085,[8204,1]],[9314,[8217,1]],[9542,[8230,1]],[9771,[8243,1]],[10000,[8256,1]]] 7 [[1333,[8205,1]],[2666,[8218,1]],[4000,[8231,1]],[5333,[8244,1]],[6666,[8257,1]],[7111,[8206,1]],[7555,[8219,1]],[8000,[8232,1]],[8444,[8245,1]],[8888,[8258,1]],[8933,[8207,1]],[8977,[8220,1]],[9022,[8233,1]],[9066,[8246,1]],[9111,[8259,1]],[9288,[8209,1]],[9466,[8222,1]],[9644,[8235,1]],[9822,[8248,1]],[10000,[8261,1]]] [[7750,0],[10000,1]] {2:[[2000,[8208,1]],[4000,[8221,1]],[6000,[8234,1]],[8000,[8247,1]],[10000,[8260,1]]], 10:[[2000,[8211,1]],[4000,[8224,1]],[6000,[8237,1]],[8000,[8250,1]],[10000,[8263,1]]]} [8205,8218,8231,8244,8257,8206,8219,8232,8245,8258,8207,8220,8233,8246,8259,8209,8222,8235,8248,8261]
2390 [[1200,[8205,1]],[2400,[8218,1]],[3600,[8231,1]],[4800,[8244,1]],[6000,[8257,1]],[6760,[8206,1]],[7520,[8219,1]],[8280,[8232,1]],[9040,[8245,1]],[9800,[8258,1]],[9840,[8207,1]],[9880,[8220,1]],[9920,[8233,1]],[9960,[8246,1]],[10000,[8259,1]]] 1
-2391 [[50,[3803,1]],[80,[5409,1]],[100,[8067,1]],[200,[3505,1]],[300,[3515,1]],[320,[4607,1]],[520,[4606,1]],[560,[4608,1]],[960,[3504,1]],[1360,[3514,1]],[2860,[4151,8]],[4360,[181,8]],[5900,[2324,2]],[7300,[3503,1]],[8700,[3513,1]],[8950,[142,60]],[9200,[143,45]],[9450,[144,30]],[9700,[153,15]],[10000,[5303,50]]] 1 [5409,3803,8067,4607,4606,4608,3515,3505]
+2391 [[100,[3803,1]],[110,[5409,1]],[130,[8067,1]],[230,[3505,1]],[330,[3515,1]],[350,[4607,1]],[550,[4606,1]],[590,[4608,1]],[990,[3504,1]],[1390,[3514,1]],[2890,[4151,8]],[4390,[181,8]],[5900,[2324,1]],[7300,[3503,1]],[8700,[3513,1]],[8950,[142,60]],[9200,[143,45]],[9450,[144,30]],[9700,[153,15]],[10000,[5303,50]]] 1 [5409,3803,8067,4607,4606,4608,3515,3505]
2392 4184_2|1145_15|952_3|913_2
diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
index 6975772..0961a23 100644
--- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
+++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
@@ -197,14 +197,14 @@
196 21185 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2 1
197 21186 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2 1
198 21187 21171|21172|21173|21174|21175|21176|21177 3 0 0 0 7500 0 0 EquipComposeSuccess2 1
-199 9003 9001|9002 3 0 0 0 10000 0 0 EquipComposeSuccess4 1
-200 9004 9001|9002 3 0 0 0 10000 0 0 EquipComposeSuccess4 1
-201 9005 9003|9004 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
-202 9006 9003|9004 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
-203 9015 9013|9014 3 0 0 0 10000 0 0 EquipComposeSuccess4 1
-204 9016 9013|9014 3 0 0 0 10000 0 0 EquipComposeSuccess4 1
-205 9017 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
-206 9018 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
+199 6603 9001|9002 3 0 0 0 10000 0 0 EquipComposeSuccess4 1
+200 6604 9001|9002 3 0 0 0 10000 0 0 EquipComposeSuccess4 1
+201 6605 9003|9004 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
+202 6606 9003|9004 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
+203 6615 9013|9014 3 0 0 0 10000 0 0 EquipComposeSuccess4 1
+204 6616 9013|9014 3 0 0 0 10000 0 0 EquipComposeSuccess4 1
+205 6617 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
+206 6618 9015|9016 3 0 0 0 10000 0 0 EquipComposeSuccess5 1
207 9075 9074 3 0 0 0 10000 0 0 EquipComposeSuccess6 1
208 9077 9075 3 5305 10 0 10000 0 0 EquipComposeSuccess1 1
209 9078 9077 3 5306 20 0 10000 0 0 EquipComposeSuccess2 1
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 1627fdc..711be01 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -156,7 +156,7 @@
773 29 1 4606 1 1 [[2213,40,1]] 4606 0 0 0 1 1 888 3000 0 LimitGift7
774 31 1 2390 1 1 [[913,1,1]] 2390 0 0 0 1 1 388 1000 0 LimitGift6
775 32 1 147 10 1 [[143,300,1]] 143 0 0 0 1 1 288 750 0 LimitGift6
-776 33 1 30 500 1 [[2389,2,1]] 2389 0 0 0 1 1 388 900 0 LimitGift6
+776 33 1 15 1 1 [[2389,2,1]] 2389 0 0 0 1 1 388 900 0 LimitGift6
777 34 1 109 6 1 [[108,15,1]] 109 0 0 0 1 1 388 1100 0 LimitGift6
778 35 1 2213 15 1 [[4606,1,1]] 4606 0 0 0 1 1 688 1450 0 LimitGift6
779 36 1 30 500 1 [[1128,1,1]] 1128 0 0 0 1 1 388 1000 0 LimitGift6
--
Gitblit v1.8.0