From 40e1194f69c0559a0ed735b0e2c95d08687be2c7 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 09 八月 2018 21:19:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagResourcesBack.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 4 ++--
db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index 13e5573..111ec8d 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -31,8 +31,8 @@
41110 20 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203012,1,1,1,1,1]]
41110 21 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203013,1,1,1,1,1]]
41110 22 41110 0 0 0 0 0 0 0 0 0 [89,17] [0,5,300,10] [[102,31203014,1,1,1,1,1]]
-31080 0 31080 82 500 0 4001 1 0 0 0 0 [20,18] [10,180,10]
-31140 0 31140 250 500 0 4004 1 0 330 956 1 [16,14] [5,300,50,10] [[101,31401001,42,12],[102,31403001,7,2]]
+31080 0 31080 82 500 0 4001 1 30 0 0 0 [20,18] [10,180,10]
+31140 0 31140 250 500 0 4004 1 20 330 956 1 [16,14] [5,300,50,10] [[101,31401001,42,12],[102,31403001,7,2]]
31150 0 31150 0 0 0 4007 1|2|2|3|3|4 80 0 0 0 [132,45] [30,12]
31170 0 31170 110 0 0 0 0 0 0 0 0 [76,15]
31180 0 31180 110 500 0 0 0 0 0 0 0 [112,24] [10,600,15, [340,260,200,150]]
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index 4117050..db80326 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -10,5 +10,5 @@
9 8 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":102,"ItemCount":"2"}]} 150000 {"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":102,"ItemCount":"4"}]}
10 7 0 50 0 {"exp":"72000*reExp", "item":[{"ItemID":24,"ItemCount":"50"}]} 167000 {"exp":"39600*reExp", "item":[{"ItemID":24,"ItemCount":"50"}]}
11 11 0 15 0 {"item":[{"ItemID":24,"ItemCount":"15"},{"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":"15"},{"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":"15"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"10*max(min(1,extraData),0)-10*max(min(2,extraData)-1,0)"},{"ItemID":1132,"ItemCount":"10*max(min(2,extraData)-1,0)-10*max(min(3,extraData)-2,0)"},{"ItemID":1133,"ItemCount":"10*max(min(3,extraData)-2,0)-10*max(min(4,extraData)-3,0)"},{"ItemID":181,"ItemCount":"6"}]} 200000 {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1134,"ItemCount":"4*max(min(1,extraData),0)-4*max(min(2,extraData)-1,0)"},{"ItemID":1135,"ItemCount":"4*max(min(2,extraData)-1,0)-4*max(min(3,extraData)-2,0)"},{"ItemID":1136,"ItemCount":"4*max(min(3,extraData)-2,0)-4*max(min(4,extraData)-3,0)"},{"ItemID":181,"ItemCount":"3"}]}
+12 9 0 25 0 {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"10*max(min(1,extraData),0)-10*max(min(2,extraData)-1,0)"},{"ItemID":1132,"ItemCount":"10*max(min(2,extraData)-1,0)-10*max(min(3,extraData)-2,0)"},{"ItemID":1133,"ItemCount":"10*max(min(3,extraData)-2,0)-10*max(min(4,extraData)-3,0)"},{"ItemID":1134,"ItemCount":"3*max(min(1,extraData),0)-3*max(min(2,extraData)-1,0)"},{"ItemID":1135,"ItemCount":"3*max(min(2,extraData)-1,0)-3*max(min(3,extraData)-2,0)"},{"ItemID":1136,"ItemCount":"3*max(min(3,extraData)-2,0)-3*max(min(4,extraData)-3,0)"},{"ItemID":181,"ItemCount":"6"}]} 200000 {"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"4*max(min(1,extraData),0)-4*max(min(2,extraData)-1,0)"},{"ItemID":1132,"ItemCount":"4*max(min(2,extraData)-1,0)-4*max(min(3,extraData)-2,0)"},{"ItemID":1133,"ItemCount":"4*max(min(3,extraData)-2,0)-4*max(min(4,extraData)-3,0)"},{"ItemID":1134,"ItemCount":"2*max(min(1,extraData),0)-2*max(min(2,extraData)-1,0)"},{"ItemID":1135,"ItemCount":"2*max(min(2,extraData)-1,0)-2*max(min(3,extraData)-2,0)"},{"ItemID":1136,"ItemCount":"2*max(min(3,extraData)-2,0)-2*max(min(4,extraData)-3,0)"},{"ItemID":181,"ItemCount":"3"}]}
13 12 0 20 0 {"exp":"3000*reExp", "item":[{"ItemID":2211,"ItemCount":"6"}], "money":"500000"} 200000 {"exp":"1650*reExp", "item":[{"ItemID":2211,"ItemCount":"3"}]}
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index c42cd81..3cc32e1 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -156,7 +156,7 @@
948 1 0 天赋重置书 15 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 380 0 10 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
949 1 0 转职卡 15 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 2280 0 10 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
950 1 0 高级转职卡 15 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 3180 0 10 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-951 1 0 乾坤袋 15 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+951 1 0 乾坤袋 60 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
952 1 0 离线挂机符 10 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 25 0 20 0 1 0 0 210 18000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
953 1 0 角色改名卡 11 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
954 1 0 筋斗云 12 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0