From 27edabdf837714c8be392057d03f58b1a6d678c0 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期五, 21 九月 2018 19:43:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagResourcesBack.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index bc696b7..f886904 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -9,6 +9,6 @@
 8	14	0	8	0	{"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"2"}]}	50000	{"exp":"2200*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":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"},{"ItemID":26,"ItemCount":"33000"}]}	167000	{"exp":"39600*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,extraData),0)*529024+max(min(2,extraData)-1,0)*554560+max(min(3,extraData)-2,0)*678400+max(min(4,extraData)-3,0)*779520+max(min(5,extraData)-4,0)*936480+max(min(6,extraData)-5,0)*1110720+max(min(7,extraData)-6,0)*1302240+max(min(8,extraData)-7,0)*1510560"},{"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)*290963+max(min(2,extraData)-1,0)*305008+max(min(3,extraData)-2,0)*373120+max(min(4,extraData)-3,0)*428736+max(min(5,extraData)-4,0)*515064+max(min(6,extraData)-5,0)*610896+max(min(7,extraData)-6,0)*716232+max(min(8,extraData)-7,0)*830808"},{"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"}]}
+11	11	0	25	50	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*+max(min(2,extraData)-1,0)*1269657+max(min(3,extraData)-2,0)*2600601+max(min(4,extraData)-3,0)*4228761+max(min(5,extraData)-4,0)*6099609+max(min(6,extraData)-5,0)*8347161+max(min(7,extraData)-6,0)*11012889+max(min(8,extraData)-7,0)*14138265"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*24+max(min(2,extraData)-1,0)*28+max(min(3,extraData)-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,extraData),0)*7+max(min(3,extraData)-2,0)*14+max(min(4,extraData)-3,0)*28+max(min(5,extraData)-4,0)*7"},{"ItemID":143,"ItemCount":"max(min(3,extraData),0)*2+max(min(4,extraData)-2,0)*7+max(min(5,extraData)-3,0)*14+max(min(6,extraData)-4,0)*28"},{"ItemID":144,"ItemCount":"max(min(5,extraData),0)*2+max(min(6,extraData)-1,0)*7+max(min(7,extraData)-2,0)*36"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*24"}]}	33000	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*+max(min(2,extraData)-1,0)*1269657+max(min(3,extraData)-2,0)*2600601+max(min(4,extraData)-3,0)*4228761+max(min(5,extraData)-4,0)*6099609+max(min(6,extraData)-5,0)*8347161+max(min(7,extraData)-6,0)*11012889+max(min(8,extraData)-7,0)*14138265"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*16+max(min(2,extraData)-1,0)*19+max(min(3,extraData)-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,extraData),0)*4+max(min(3,extraData)-2,0)*9+max(min(4,extraData)-3,0)*19+max(min(5,extraData)-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,extraData),0)*1+max(min(4,extraData)-2,0)*4+max(min(5,extraData)-3,0)*9+max(min(6,extraData)-4,0)*19"},{"ItemID":144,"ItemCount":"max(min(5,extraData),0)*1+max(min(6,extraData)-1,0)*4+max(min(7,extraData)-2,0)*24"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*16"}]}
 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)+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(4,dataEx)-3,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(4,dataEx)-3,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(4,dataEx)-3,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":"(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(4,dataEx)-3,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(4,dataEx)-3,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(4,dataEx)-3,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