From d4c4453fc09fb18ee8600286ecb61ceac7780928 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 27 十一月 2018 15:18:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagStore.txt | 3 +
db/PyMongoDataServer/PySysDB/tagResourcesBack.txt | 6 +-
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 10 +-
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 89 ++++++++++++++++++++++++-----
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 3 +
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 6 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc | 0
db/PyMongoDataServer/PySysDB/tagAttrFruit.txt | 2
11 files changed, 92 insertions(+), 31 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 7f3d017..df512ac 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -13,7 +13,7 @@
CreatRolePoint2 2_12|3_19|4_15|5_51 0 0 0 0
CreatRolePoint3 2_52|3_20|4_13|5_12 0 0 0 0
PlayerMaxLV 500 0 0 0 0
-RealmFBHelpAward ["RealmFBHelp",3,[(101,3,1)]]
+RealmFBHelpAward ["RealmFBHelp",3,[(101,1,1)]]
RealmFBHelpAttr {"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}} 10000 6
RealmFBHelpLimit 10
GlobalDropCD {3802:100,3803:2880,3804:4320,3805:86400,9051:1440,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160,5408:1440} {50103001:{1:[0,{4202:1,4253:2,4151:10},[]]},50103002:{1:[0,{250:1,224:2,181:20},[]]},50103003:{1:[0,{4213:1,4252:2,4151:20},[]]},50103004:{1:[0,{222:3,181:50},[]]},50103005:{1:[0,{4250:3,4151:50},[]]}} 0 0 0
@@ -32,7 +32,7 @@
PartyReward [(26,12800,1),(28,25,1)] [200,0] ["PartyKing",1,[(28,25,1)]] 1
FairyCorrectAnswer 30
FamilyMatchSet 2 0 0 0 0
-FamilyMatchRankReward {1:[[28,200,1,0],[26,59400,1,0]],4:[[28,160,1,0],[26,49500,1,0]],10:[[28,140,1,0],[26,39600,1,0]],20:[[28,120,1,0],[26,29700,1,0]],21:[[28,100,1,0],[26,19800,1,0]]} [40,50,60,80,100] [[103,5,1],[26,13200,1]]
+FamilyMatchRankReward {1:[[28,200,1,0],[26,59400,1,0]],4:[[28,160,1,0],[26,49500,1,0]],10:[[28,140,1,0],[26,39600,1,0]],20:[[28,120,1,0],[26,29700,1,0]],21:[[28,100,1,0],[26,19800,1,0]]} [40,50,60,80,100] [[102,6,1],[26,13200,1]]
FamilyMatchLianWinReward [[2278,1,0]] 3 3
FamilyMatchOtherReward [[28,60,1],[26,28000,1]] [60,70,80,90,100] 5
MailDefaultCount 50 0 0 0 0
@@ -49,7 +49,7 @@
SetWorldPosShunt {10010:10, 10020:10, 10030:10, 10040:10, 10050:10, 10060:10,10070:10,10080:10,10090:10} 350
DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',6,6,6], (161):[20302003,8,'7200',8,8,8], (162):[20302004,8,'7200',8,8,8], (163):[20302005,8,'7200',8,8,8], (164):[20302008,8,'7200',8,8,8], (165):[20302009,8,'7200',8,8,8], (166):[20302006,8,'7200',8,8,8], (167):[20302007,8,'7200',8,8,8]} 20303001 [20302002, 20302003]
XMZZBetCfg {}
-XMZZAward {"3":[[104,3,1]],"6":[[105,1,1]],"9":[[105,2,1]],"12":[[106,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
+XMZZAward {"3":[[181,5,1]],"6":[[181,5,1]],"9":[[197,1,1]],"12":[[197,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
XMZZDogFallLimit 1000
XMZZPKPowerRange [[30,10],[50,50]] [4,5] 3
XMZZSpecialNPCRate min(5000,(conWinCnt*625+10)) max(0,(conWinCnt-10)*1000)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index ad13f3a..10463b5 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -46,6 +46,9 @@
114 3 0 0
115 3 0 0
116 3 0 0
+117 3 0 0
+118 3 0 0
+119 3 0 0
151 4 0 0
152 4 0 0
153 4 0 0
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc
index 0fce39d..de7ee34 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 68a3092..37a2639 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
index 0a92076..51c876d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
index 545d270..5265e67 100644
--- a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
@@ -20,7 +20,7 @@
194 1 60 100
195 1 60 100
196 1 10 100
-197 1 500 100
+197 1 999 100
198 1 300 100
199 1 100 100
200 1 10 500
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 3e8fe86..21c8f86 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -190,11 +190,11 @@
2403 0 [[1600,[10953,1]],[3200,[10954,1]],[4800,[10955,1]],[6400,[10956,1]],[8000,[10957,1]],[8400,[10973,1]],[8800,[10974,1]],[9200,[10975,1]],[9600,[10976,1]],[10000,[10977,1]]] 1 [[10953,20953,30953],[10954,20954,30954],[10955,20955,30955],[10956,20956,30956],[10957,20957,30957],[10973,20973,30973],[10974,20974,30974],[10975,20975,30975],[10976,20976,30976],[10977,20977,30977]] [10953,20953,30953,10954,20954,30954,10955,20955,30955,10956,20956,30956,10957,20957,30957,10973,20973,30973,10974,20974,30974,10975,20975,30975,10976,20976,30976,10977,20977,30977]
2404 [[5000,[5410,1]],[7500,[5410,2]],[10000,[5411,1]]] 1 [5411]
2405 [[1800,[5410,2]],[3000,[5410,3]],[9000,[5411,1]],[10000,[5411,2]]] 1 [5411]
-2406 4611_2|4612_2|4613_2|4614_2|4615_2 [[10000,[4622,1]]] 1 [4622]
-2407 4611_2|4612_2|4613_2|4614_2|4615_2 [[10000,[4622,1]]] [[5000,0],[10000,1]] [4622]
-2408 4611_2|4612_2|4613_2|4614_2|4615_2 [[10000,[4622,1]]] [[7000,0],[10000,1]] [4622]
-2409 4611_2|4612_2|4613_2|4614_2|4615_2 [[10000,[4622,1]]] [[8000,0],[10000,1]] [4622]
-2410 4611_2|4612_2|4613_2|4614_2|4615_2 [[10000,[4622,1]]] [[9000,0],[10000,1]] [4622]
+2406 4611_6|4612_6|4613_6|4614_6|4615_6 [[10000,[4622,1]]] 1 [4622]
+2407 4611_6|4612_6|4613_6|4614_6|4615_6 [[10000,[4622,1]]] [[5000,0],[10000,1]] [4622]
+2408 4611_6|4612_6|4613_6|4614_6|4615_6 [[10000,[4622,1]]] [[7000,0],[10000,1]] [4622]
+2409 4611_6|4612_6|4613_6|4614_6|4615_6 [[10000,[4622,1]]] [[8000,0],[10000,1]] [4622]
+2410 4611_6|4612_6|4613_6|4614_6|4615_6 [[10000,[4622,1]]] [[9000,0],[10000,1]] [4622]
2411 0 181_300
4008 4011_5
4009 4011_5
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 9a2d670..49116d3 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -153,7 +153,7 @@
FamilyMatchCollect 10|10 3|3
FamilyMatchPersonalScore 12 12 {0:20, 30909004:40} 16 10
FamilyMatchPlayTime [60,1140,30]
-FamilyMatchRankReward {1:[[28,200,1,0],[26,59400,1,0]],4:[[28,160,1,0],[26,49500,1,0]],10:[[28,140,1,0],[26,39600,1,0]],20:[[28,120,1,0],[26,29700,1,0]],21:[[28,100,1,0],[26,19800,1,0]]} [40,50,60,80,100] [[103,5,1],[26,13200,1]]
+FamilyMatchRankReward {1:[[28,200,1,0],[26,59400,1,0]],4:[[28,160,1,0],[26,49500,1,0]],10:[[28,140,1,0],[26,39600,1,0]],20:[[28,120,1,0],[26,29700,1,0]],21:[[28,100,1,0],[26,19800,1,0]]} [40,50,60,80,100] [[102,6,1],[26,13200,1]]
FamilyMatchRankOneReward {215:[[2299,1,0]],265:[[2279,1,0]],315:[[2281,1,0]],365:[[2283,1,0]],415:[[2285,1,0]]} {215:[[2398,1,0]],265:[[2399,1,0]],315:[[2400,1,0]],365:[[2401,1,0]],415:[[2402,1,0]]}
FamilyMatchSRankOneReward {215:[[2300,1,0]],265:[[2280,1,0]],315:[[2282,1,0]],365:[[2284,1,0]],415:[[2286,1,0]]} {215:[[2398,1,0]],265:[[2399,1,0]],315:[[2400,1,0]],365:[[2401,1,0]],415:[[2402,1,0]]}
FamilyMatchDayReward [[914,1,1],[911,1,1],[2213,1,1]] 11|12 41
@@ -269,7 +269,7 @@
DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',6,6,6], (161):[20302003,8,'7200',8,8,8], (162):[20302004,8,'7200',8,8,8], (163):[20302005,8,'7200',8,8,8], (164):[20302008,8,'7200',8,8,8], (165):[20302009,8,'7200',8,8,8], (166):[20302006,8,'7200',8,8,8], (167):[20302007,8,'7200',8,8,8]} 20303001 [20302002, 20302003]
DogzFBCollect {20302001:2,20302002:2} {20302001:2,20302002:4}
XMZZBetCfg {}
-XMZZAward {"3":[[104,3,1]],"6":[[105,1,1]],"9":[[105,2,1]],"12":[[106,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
+XMZZAward {"3":[[181,5,1]],"6":[[181,5,1]],"9":[[197,1,1]],"12":[[197,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
XMZZRobot [30403002,30403003,30403004] 30403001
XMZZRobotSkill {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
XMZZPKAward [0,10,20,30,40,50,60,70,80,90] addPer+100 + int(math.ceil(HPPer/10.0)) 50 reExp*216*(100+addPer)/100 reExp*108
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index 132fbde..e085af7 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -20,17 +20,24 @@
lxj.3000 226114725 3000 109 0
lxj.1 226114725 1 110 0
snqxz.ios.6 424064855 6 0 2
+snqxz.ios.18 424064855 18 0 3
snqxz.ios.30 424064855 30 0 4
snqxz.ios.68 424064855 68 0 5
snqxz.ios.98 424064855 98 0 6
snqxz.ios.128 424064855 128 0 7
snqxz.ios.168 424064855 168 0 8
+snqxz.ios.198 424064855 198 0 9
+snqxz.ios.jbch 424064855 18 111 0
+snqxz.ios.ntlc 424064855 30 112 0
+snqxz.ios.jszq 424064855 98 113 0
sn.android.6 226114725 6 0 2
+sn.android.18 226114725 18 0 3
sn.android.30 226114725 30 0 4
sn.android.68 226114725 68 0 5
sn.android.98 226114725 98 0 6
sn.android.128 226114725 128 0 7
sn.android.168 226114725 168 0 8
+sn.android.198 226114725 198 0 9
sn.android.jbch 226114725 18 111 0
sn.android.ntlc 226114725 30 112 0
sn.android.jszq 226114725 98 113 0
@@ -44,11 +51,16 @@
lxj.648 508021130 648 108 0
lxj.1 508021130 1 110 0
lxj.ios.6 508021130 6 0 2
+lxj.ios.18 508021130 18 0 3
lxj.ios.30 508021130 30 0 4
lxj.ios.68 508021130 68 0 5
lxj.ios.98 508021130 98 0 6
lxj.ios.128 508021130 128 0 7
lxj.ios.168 508021130 168 0 8
+lxj.ios.198 508021130 198 0 9
+lxj.ios.jbch 508021130 18 111 0
+lxj.ios.ntlc 508021130 30 112 0
+lxj.ios.jszq 508021130 98 113 0
lxj.18 813015059 18 101 0
lxj.10 813015059 10 102 0
lxj.30 813015059 30 103 0
@@ -60,11 +72,13 @@
lxj.3000 813015059 3000 109 0
lxj.1 813015059 1 110 0
lxj.android.6 813015059 6 0 2
+lxj.android.18 813015059 18 0 3
lxj.android.30 813015059 30 0 4
lxj.android.68 813015059 68 0 5
lxj.android.98 813015059 98 0 6
lxj.android.128 813015059 128 0 7
lxj.android.168 813015059 168 0 8
+lxj.android.198 813015059 198 0 9
lxj.android.jbch 813015059 18 111 0
lxj.android.ntlc 813015059 30 112 0
lxj.android.jszq 813015059 98 113 0
@@ -79,11 +93,13 @@
snxxz.3000 822055139 3000 109 0
snxxz.1 822055139 1 110 0
snxxz.android.6 822055139 6 0 2
+snxxz.android.18 822055139 18 0 3
snxxz.android.30 822055139 30 0 4
snxxz.android.68 822055139 68 0 5
snxxz.android.98 822055139 98 0 6
snxxz.android.128 822055139 128 0 7
snxxz.android.168 822055139 168 0 8
+snxxz.android.198 822055139 198 0 9
snxxz.android.jbch 822055139 18 111 0
snxxz.android.ntlc 822055139 30 112 0
snxxz.android.jszq 822055139 98 113 0
@@ -97,11 +113,16 @@
snxxz.648 828115704 648 108 0
snxxz.1 828115704 1 110 0
snxxz.ios.6 828115704 6 0 2
+snxxz.ios.18 828115704 18 0 3
snxxz.ios.30 828115704 30 0 4
snxxz.ios.68 828115704 68 0 5
snxxz.ios.98 828115704 98 0 6
snxxz.ios.128 828115704 128 0 7
snxxz.ios.168 828115704 168 0 8
+snxxz.ios.198 828115704 198 0 9
+snxxz.ios.jbch 828115704 18 111 0
+snxxz.ios.ntlc 828115704 30 112 0
+snxxz.ios.jszq 828115704 98 113 0
575 mrgame 18 101 0
576 mrgame 10 102 0
577 mrgame 30 103 0
@@ -113,13 +134,16 @@
583 mrgame 3000 109 0
584 mrgame 1 110 0
570 mrgame 6 0 2
+1098 mrgame 18 0 3
571 mrgame 30 0 4
572 mrgame 68 0 5
+1099 mrgame 98 0 6
573 mrgame 128 0 7
574 mrgame 168 0 8
-585 mrgame 18 111 0
-586 mrgame 30 112 0
-587 mrgame 98 113 0
+1100 mrgame 198 0 9
+1101 mrgame 18 111 0
+1102 mrgame 30 112 0
+1103 mrgame 98 113 0
sgsbl.18 815035927 18 101 0
sgsbl.6 815035927 6 2 0
sgsbl.30 815035927 30 103 0
@@ -131,10 +155,16 @@
sgsbl.1 815035927 1 110 0
sgsbl.0.1 815035927 0.1 210 0
sgsbl.ios.6 815035927 6 0 2
+sgsbl.ios.18 815035927 18 0 3
sgsbl.ios.30 815035927 30 0 4
sgsbl.ios.68 815035927 68 0 5
+sgsbl.ios.98 815035927 98 0 6
sgsbl.ios.128 815035927 128 0 7
sgsbl.ios.168 815035927 168 0 8
+sgsbl.ios.198 815035927 198 0 9
+sgsbl.ios.jbch 815035927 18 111 0
+sgsbl.ios.ntlc 815035927 30 112 0
+sgsbl.ios.jszq 815035927 98 113 0
test.18 test 18 101 0
test.10 test 10 102 0
test.30 test 30 103 0
@@ -146,10 +176,13 @@
test.3000 test 3000 109 0
test.1 test 1 110 0
test.libao.6 test 6 0 2
+test.libao.18 test 18 0 3
test.libao.30 test 30 0 4
test.libao.68 test 68 0 5
+test.libao.98 test 98 0 6
test.libao.128 test 128 0 7
test.libao.168 test 168 0 8
+test.libao.198 test 198 0 9
test.libao.jbch test 18 111 0
test.libao.ntlc test 30 112 0
test.libao.jszq test 98 113 0
@@ -164,10 +197,13 @@
xj.3000 spxjgame 3000 109 0
xj.1 spxjgame 1 110 0
xj.android.6 spxjgame 6 0 2
+xj.android.18 spxjgame 18 0 3
xj.android.30 spxjgame 30 0 4
xj.android.68 spxjgame 68 0 5
+xj.android.98 spxjgame 98 0 6
xj.android.128 spxjgame 128 0 7
xj.android.168 spxjgame 168 0 8
+xj.android.198 spxjgame 198 0 9
xj.android.jbch spxjgame 18 111 0
xj.android.ntlc spxjgame 30 112 0
xj.android.jszq spxjgame 98 113 0
@@ -181,10 +217,16 @@
jkjk.0648 mrgameios 648 108 0
jkjk.1 mrgameios 1 110 0
jkjk.6 mrgameios 6 0 2
+jkjk.18 mrgameios 18 0 3
jkjk.30 mrgameios 30 0 4
jkjk.68 mrgameios 68 0 5
+jkjk.98 mrgameios 98 0 6
jkjk.128 mrgameios 128 0 7
jkjk.168 mrgameios 168 0 8
+jkjk.198 mrgameios 198 0 9
+jkjk.jbch mrgameios 18 111 0
+jkjk.ntlc mrgameios 30 112 0
+jkjk.jszq mrgameios 98 113 0
com.price18.xylb spyxxjios 18 101 0
com.price6.xyxz spyxxjios 6 2 0
com.price30.xyxz spyxxjios 30 103 0
@@ -195,10 +237,16 @@
com.price648.xyxz spyxxjios 648 108 0
com.price1.xj spyxxjios 1 110 0
com.price6.xylb spyxxjios 6 0 2
+com.price18.xylb spyxxjios 18 0 3
com.price30.xylb spyxxjios 30 0 4
com.price68.xylb spyxxjios 68 0 5
+com.price98.xylb spyxxjios 98 0 6
com.price128.xylb spyxxjios 128 0 7
com.price168.xylb spyxxjios 168 0 8
+com.price198.xylb spyxxjios 198 0 9
+com.price18.ynjplb spyxxjios 18 111 0
+com.price30.ynjplb spyxxjios 30 112 0
+com.price98.ynjplb spyxxjios 98 113 0
jisu.18 jisugame 18 101 0
jisu.10 jisugame 10 102 0
jisu.30 jisugame 30 103 0
@@ -210,10 +258,13 @@
jisu.3000 jisugame 3000 109 0
jisu.1 jisugame 1 110 0
jisu.android.6 jisugame 6 0 2
+jisu.android.18 jisugame 18 0 3
jisu.android.30 jisugame 30 0 4
jisu.android.68 jisugame 68 0 5
+jisu.android.98 jisugame 98 0 6
jisu.android.128 jisugame 128 0 7
jisu.android.168 jisugame 168 0 8
+jisu.android.198 jisugame 198 0 9
jisu.android.jbch jisugame 18 111 0
jisu.android.ntlc jisugame 30 112 0
jisu.android.jszq jisugame 98 113 0
@@ -227,10 +278,16 @@
com.snjjxios.08 jisugameios 648 108 0
com.snjjxios.14 jisugameios 1 110 0
com.snjjxios.09 jisugameios 6 0 2
+com.snjjxios.15 jisugameios 18 0 3
com.snjjxios.10 jisugameios 30 0 4
com.snjjxios.11 jisugameios 68 0 5
+com.snjjxios.16 jisugameios 98 0 6
com.snjjxios.12 jisugameios 128 0 7
com.snjjxios.13 jisugameios 168 0 8
+com.snjjxios.17 jisugameios 198 0 9
+com.snjjxios.18 jisugameios 18 111 0
+com.snjjxios.19 jisugameios 30 112 0
+com.snjjxios.20 jisugameios 98 113 0
wx.snqxz.18 424064855 18 201 0
wx.snqxz.6 424064855 6 202 0
wx.snqxz.30 424064855 30 203 0
@@ -249,20 +306,6 @@
wx.sgsbl.328 815035927 328 207 0
wx.sgsbl.648 815035927 648 208 0
wx.sgsbl.01 815035927 0.1 211 0
-com.price18.snxzlb spyxxzios 18 101 0
-com.price6.snxz spyxxzios 6 2 0
-com.price30.snxz spyxxzios 30 103 0
-com.price98.snxz spyxxzios 98 104 0
-com.price128.snxz spyxxzios 128 105 0
-com.price198.snxz spyxxzios 198 106 0
-com.price328.snxz spyxxzios 328 107 0
-com.price648.snxz spyxxzios 648 108 0
-com.price1.snxz spyxxzios 1 110 0
-com.price6.snxzlb spyxxzios 6 0 2
-com.price30.snxzlb spyxxzios 30 0 4
-com.price68.snxzlb spyxxzios 68 0 5
-com.price128.snxzlb spyxxzios 128 0 7
-com.price168.snxzlb spyxxzios 168 0 8
com.snyjjpg.01 jisusnyjjios 18 101 0
com.snyjjpg.02 jisusnyjjios 6 2 0
com.snyjjpg.03 jisusnyjjios 30 103 0
@@ -273,10 +316,16 @@
com.snyjjpg.08 jisusnyjjios 648 108 0
com.snyjjpg.test1 jisusnyjjios 1 110 0
com.snyjjpg.09 jisusnyjjios 6 0 2
+com.snyjjpg.14 jisusnyjjios 18 0 3
com.snyjjpg.10 jisusnyjjios 30 0 4
com.snyjjpg.11 jisusnyjjios 68 0 5
+com.snyjjpg.15 jisusnyjjios 98 0 6
com.snyjjpg.12 jisusnyjjios 128 0 7
com.snyjjpg.13 jisusnyjjios 168 0 8
+com.snyjjpg.16 jisusnyjjios 198 0 9
+com.snyjjpg.17 jisusnyjjios 18 111 0
+com.snyjjpg.18 jisusnyjjios 30 112 0
+com.snyjjpg.19 jisusnyjjios 98 113 0
mbxml.18 1030013326 18 101 0
mbxml.6 1030013326 6 2 0
mbxml.30 1030013326 30 103 0
@@ -287,7 +336,13 @@
mbxml.648 1030013326 648 108 0
mbxml.ios.test1 1030013326 1 110 0
mbxml.ios.6 1030013326 6 0 2
+mbxml.ios.18 1030013326 18 0 3
mbxml.ios.30 1030013326 30 0 4
mbxml.ios.68 1030013326 68 0 5
+mbxml.ios.98 1030013326 98 0 6
mbxml.ios.128 1030013326 128 0 7
mbxml.ios.168 1030013326 168 0 8
+mbxml.ios.198 1030013326 198 0 9
+mbxml.ios.ch18 1030013326 18 111 0
+mbxml.ios.ch30 1030013326 30 112 0
+mbxml.ios.ch98 1030013326 98 113 0
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index 848f618..fba95d4 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -5,9 +5,9 @@
4 3 0 15 0 {"exp":"18000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"16000"}]} 0 {"exp":"14400*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"8800"}]}
5 5 0 15 30 {"exp":"1800*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)*2+max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*2"}]} 0 {"exp":"1440*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)+max(min(2,extraData)-1,0)+max(min(3,extraData)-2,0)+max(min(4,extraData)-3,0)+max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)"}]}
6 6 1 15 50 {"exp":"21600*reExp*expRate", "item":[{"ItemID":24,"ItemCount":"30"}]} 0 {"exp":"17280*reExp", "item":[{"ItemID":24,"ItemCount":"30"}]}
-7 10 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"2"},{"ItemID":102,"ItemCount":"4"}]} 0 {"exp":"9600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":104,"ItemCount":"6"},{"ItemID":102,"ItemCount":"2"}]}
-8 14 0 8 0 {"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"2"}]} 0 {"exp":"3200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"1"}]}
-9 8 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":102,"ItemCount":"2"}]} 0 {"exp":"9600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":102,"ItemCount":"4"}]}
+7 10 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":101,"ItemCount":"20"}]} 0 {"exp":"9600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":101,"ItemCount":"10"}]}
+8 14 0 8 0 {"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"5"}]} 0 {"exp":"3200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"2"}]}
+9 8 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":2407,"ItemCount":"1"}]} 0 {"exp":"9600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":2410,"ItemCount":"1"}]}
10 7 0 50 0 {"exp":"120000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"33000"}]} 0 {"exp":"96000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"18150"}]}
11 11 0 25 50 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*634828+max(min(2,max((extraData-2),1))-1,0)*665472+max(min(3,max((extraData-2),1))-2,0)*814080+max(min(4,max((extraData-2),1))-3,0)*935424+max(min(5,max((extraData-2),1))-4,0)*1123776+max(min(6,max((extraData-2),1))-5,0)*1332864+max(min(7,max((extraData-2),1))-6,0)*1562688+max(min(8,max((extraData-2),1))-7,0)*1812672"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*24+max(min(2,max((extraData-2),1))-1,0)*20+max(min(3,max((extraData-2),1))-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*3+max(min(3,max((extraData-2),1))-2,0)*9+max(min(4,max((extraData-2),1))-3,0)*12+max(min(5,max((extraData-2),1))-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*2+max(min(4,max((extraData-2),1))-3,0)*4+max(min(5,max((extraData-2),1))-4,0)*8+max(min(6,max((extraData-2),1))-5,0)*9"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*3+max(min(6,max((extraData-2),1))-5,0)*4+max(min(7,max((extraData-2),1))-6,0)*8"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*8"}]} 0 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*436444+max(min(2,max((extraData-2),1))-1,0)*457512+max(min(3,max((extraData-2),1))-2,0)*559680+max(min(4,max((extraData-2),1))-3,0)*643104+max(min(5,max((extraData-2),1))-4,0)*772596+max(min(6,max((extraData-2),1))-5,0)*916344+max(min(7,max((extraData-2),1))-6,0)*1074348+max(min(8,max((extraData-2),1))-7,0)*1246212"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*17+max(min(2,max((extraData-2),1))-1,0)*13+max(min(3,max((extraData-2),1))-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*2+max(min(3,max((extraData-2),1))-2,0)*6+max(min(4,max((extraData-2),1))-3,0)*8+max(min(5,max((extraData-2),1))-4,0)*3"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*1+max(min(4,max((extraData-2),1))-3,0)*2+max(min(5,max((extraData-2),1))-4,0)*5+max(min(6,max((extraData-2),1))-5,0)*6"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*2+max(min(6,max((extraData-2),1))-5,0)*3+max(min(7,max((extraData-2),1))-6,0)*5"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*5"}]}
12 9 0 25 0 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]} 0 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index a6863d4..bedf793 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -46,6 +46,9 @@
114 3 0 4219 1 1 [] 0 0 0 122 1 0 1 258 0 0
115 3 0 261 1 1 [] 0 0 0 132 1 0 1 258 0 0
116 3 0 5412 1 0 [] 0 0 0 180 0 0 1 5 0 0
+117 3 0 101 1 0 [] 0 0 0 0 0 0 1 10 0 0
+118 3 0 104 1 0 [] 0 0 0 0 0 0 1 15 0 0
+119 3 0 110 1 0 [] 0 0 0 0 0 0 1 25 0 0
151 4 0 181 1 1 [] 0 0 0 0 0 0 2 10 0 0
152 4 0 952 1 1 [] 0 0 0 0 0 0 2 25 0 0
153 4 0 4101 1 1 [] 0 0 0 0 0 0 2 688 0 0
--
Gitblit v1.8.0