From f164b2dd81fc1a5c1375f41022fec8424483e65e Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期五, 31 八月 2018 11:26:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagResourcesBack.txt | 4 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4 ++--
3 files changed, 4 insertions(+), 4 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 7c8783c..6ca15ff 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/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 0b6c820..032f213 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -284,9 +284,9 @@
CeremonyFireParty {"0":801,"1":802,"2":803}
CeremonyRankLimit 3280
TJDropTaskItem {20007:[120,1104,100,'int(killCnt/25000)+min(max(killCnt-int(killCnt/25000)*25000-random.randint(1,25000),0),1)']}
-SuperGiftTimeList [[651,7],[652,7],[653,7]] [(181,1,1)]
+SuperGiftTimeList [[651,2],[652,2],[653,2]] [(181,1,1)]
FlashGiftbagMailItem [(181,1,1)]
SpringSaleMailItem [(181,1,1)]
OSSaleMailItem [(181,1,1)]
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]]
-FairyGrabBoss {50103001:{1:[[2352,1,1]],2:[[2353,1,1]],3:[[2354,1,1]]},50103002:{1:[[2356,1,1]],2:[[2357,1,1]],3:[[2358,1,1]]},50103003:{1:[[2360,1,1]],2:[[2361,1,1]],3:[[2362,1,1]]},50103004:{1:[[2364,1,1]],2:[[2365,1,1]],3:[[2366,1,1]]},50103005:{1:[[2368,1,1]],2:[[2369,1,1]],3:[[2370,1,1]]},50103006:{1:[[2372,1,1]],2:[[2373,1,1]],3:[[2374,1,1]]},50103007:{1:[[2376,1,1]],2:[[2377,1,1]],3:[[2378,1,1]]}} 10 {50103001:[[2351,1,1]],50103002:[[2355,1,1]],50103003:[[2359,1,1]],50103004:[[2363,1,1]],50103005:[[2367,1,1]],50103006:[[2371,1,1]],50103007:[[2375,1,1]]} [[50, "FairyGrabBossWillKill"], [30, "FairyGrabBossWillKill"], [10, "FairyGrabBossWillKill"]]
+FairyGrabBoss {50103001:{1:[[2352,1,1]],2:[[2353,1,1]],3:[[2354,1,1]]},50103002:{1:[[2356,1,1]],2:[[2357,1,1]],3:[[2358,1,1]]},50103003:{1:[[2360,1,1]],2:[[2361,1,1]],3:[[2362,1,1]]},50103004:{1:[[2364,1,1]],2:[[2365,1,1]],3:[[2366,1,1]]},50103005:{1:[[2368,1,1]],2:[[2369,1,1]],3:[[2370,1,1]]},50103006:{1:[[2372,1,1]],2:[[2373,1,1]],3:[[2374,1,1]]},50103007:{1:[[2376,1,1]],2:[[2377,1,1]],3:[[2378,1,1]]}} 10 {50103001:[[2351,1,1]],50103002:[[2355,1,1]],50103003:[[2359,1,1]],50103004:[[2363,1,1]],50103005:[[2367,1,1]],50103006:[[2371,1,1]],50103007:[[2375,1,1]]} [[10, "FairyGrabBossWillKill"]]
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index ea3a728..ba0d51a 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -2,13 +2,13 @@
1 0 0 5 0 {"exp":"tjgExp"} 100000 {"exp":"tjgExp*55/100"}
2 1 0 2 0 {"exp":"1125*reExp", "item":[{"ItemID":24,"ItemCount":"2"}], "money":"100000"} 6700 {"exp":"618*reExp","item":[{"ItemID":24,"ItemCount":"2"}],"money":"55000"}
3 2 0 20 40 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":5303,"ItemCount":"40"}]} 67000 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":5303,"ItemCount":"22"}]}
-4 3 0 15 0 {"exp":"18000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"2000"}]} 50000 {"exp":"9900*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"1000"}]}
+4 3 0 15 0 {"exp":"18000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"16000"}]} 50000 {"exp":"9900*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"8800"}]}
5 5 0 15 30 {"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"}]} 60000 {"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"}]} 83000 {"exp":"12474*reExp", "item":[{"ItemID":24,"ItemCount":"30"}]}
7 10 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":105,"ItemCount":"1"},{"ItemID":104,"ItemCount":"4"}]} 150000 {"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":102,"ItemCount":"2"},{"ItemID":104,"ItemCount":"5"}]}
8 14 0 8 0 {"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"1"}]} 50000 {"exp":"2200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":104,"ItemCount":"3"}]}
9 8 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":181,"ItemCount":"8"},{"ItemID":102,"ItemCount":"2"}]} 150000 {"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"4"},{"ItemID":102,"ItemCount":"4"}]}
-10 7 0 50 0 {"exp":"72000*reExp", "item":[{"ItemID":24,"ItemCount":"100"}]} 167000 {"exp":"39600*reExp", "item":[{"ItemID":24,"ItemCount":"100"}]}
+10 7 0 50 0 {"exp":"72000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"33000"}]} 167000 {"exp":"39600*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"18150"}]}
11 11 0 15 0 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*424500+max(min(2,extraData)-1,0)*536000+max(min(3,extraData)-2,0)*665000+max(min(4,extraData)-3,0)*812000+max(min(5,extraData)-4,0)*975500+max(min(6,extraData)-5,0)*1157000+max(min(7,extraData)-6,0)*1356500+max(min(8,extraData)-7,0)*1573500"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*5+max(min(2,extraData)-1,0)*10+max(min(3,extraData)-2,0)*15"},{"ItemID":142,"ItemCount":"max(min(4,extraData)-3,0)*10+max(min(5,extraData)-4,0)*15"},{"ItemID":143,"ItemCount":"max(min(6,extraData)-5,0)*10+max(min(extraData,7)-6,0)*15"},{"ItemID":144,"ItemCount":"max(min(8,extraData)-7,0)*15"}]} 33000 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*254700+max(min(2,extraData)-1,0)*321600+max(min(3,extraData)-2,0)*399000+max(min(4,extraData)-3,0)*487200+max(min(5,extraData)-4,0)*585300+max(min(6,extraData)-5,0)*694200+max(min(7,extraData)-6,0)*813900+max(min(8,extraData)-7,0)*944100"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*3+max(min(2,extraData)-1,0)*6+max(min(3,extraData)-2,0)*9"},{"ItemID":142,"ItemCount":"max(min(4,extraData)-3,0)*6+max(min(5,extraData)-4,0)*9"},{"ItemID":143,"ItemCount":"max(min(6,extraData)-5,0)*6+max(min(extraData,7)-6,0)*9"},{"ItemID":144,"ItemCount":"max(min(8,extraData)-7,0)*6"}]}
12 9 0 25 0 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(4*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":"(3*max(min(3,dataEx)-2,0)+2*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":"(3*max(min(3,dataEx)-2,0)+2*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":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,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(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(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]} 200000 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(3*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)+2*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)+2*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(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(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(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}
13 12 0 20 0 {"exp":"3000*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"6"}], "money":"500000"} 200000 {"exp":"1650*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"3"}]}
--
Gitblit v1.8.0