From 4fa04accc2c59bec28e07f5bbbcbb2c22f2fb92d Mon Sep 17 00:00:00 2001
From: cehua_ZWJ <123456>
Date: 星期二, 15 一月 2019 22:21:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagCoat.txt | 6 +++---
db/PyMongoDataServer/SysDB/tagChinItem.txt | 18 +++++++++---------
db/PyMongoDataServer/PySysDB/tagActWeekParty.txt | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt b/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt
index fce46f7..511afc9 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt
@@ -1,2 +1,2 @@
CfgID StartDate EndDate AdvanceMinutes IsDayReset ResetType LimitLV TemplateID PointAward
-1 8 15 300 1 1 110 [[1400,1500,1600,1700,1800,1900,2000,200,300,400,500,700,900,1000,1103],[1400,1500,1600,1700,1800,1900,2000,201,302,400,500,700,900,1000,1103,1300],[1400,1500,1600,1700,1800,1900,2000,201,301,401,500,701,901,1000,1103,1200],[1400,1500,1600,1700,1800,1900,2000,200,301,400,500,700,900,1000,1101],[1400,1500,1600,1700,1800,1900,2000,201,301,401,500,700,900,1000,1103,1200],[1400,1500,1600,1700,1800,1900,2000,201,302,400,500,701,901,1000,1103,1301],[1400,1500,1600,1700,1800,1900,2000,200,301,400,500,700,901,1000,1101]] {0:{290:[(4216,1,1)]},1:{290:[(5801,1,1)],390:[(5800,1,1)]},2:{320:[(5800,1,1)],420:[(5802,1,1)]},3:{260:[(1652,1,1)]},4:{370:[(4221,1,1)]},5:{330:[(5801,1,1)],430:[(5802,1,1)]},6:{290:[(62,1,1)]},}
+1 8 15 300 1 1 110 [[1400,1500,1600,1700,1800,1900,2000,200,300,400,500,700,900,1000,1103],[1400,1500,1600,1700,1800,1900,2000,201,302,400,500,700,900,1000,1103,1300],[1400,1500,1600,1700,1800,1900,2000,201,301,401,500,701,901,1000,1103,1200],[1400,1500,1600,1700,1800,1900,2000,200,301,400,500,700,900,1000,1101],[1400,1500,1600,1700,1800,1900,2000,201,301,401,500,700,900,1000,1103,1200],[1400,1500,1600,1700,1800,1900,2000,201,302,400,500,701,901,1000,1103,1301],[1400,1500,1600,1700,1800,1900,2000,200,301,400,500,700,901,1000,1101]] {0:{290:[(4216,1,1)]},1:{290:[(5801,1,1)],390:[(5800,1,1)]},2:{320:[(5800,1,1)],420:[(5802,1,1)]},3:{260:[(1652,1,1)]},4:{380:[(4221,1,1)]},5:{320:[(5801,1,1)],420:[(5802,1,1)]},6:{290:[(62,1,1)]},}
diff --git a/db/PyMongoDataServer/PySysDB/tagCoat.txt b/db/PyMongoDataServer/PySysDB/tagCoat.txt
index df27f51..665f0f7 100644
--- a/db/PyMongoDataServer/PySysDB/tagCoat.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCoat.txt
@@ -5,6 +5,6 @@
4 6003|6203 5803 3 1|1|1 {"1":{"6":25300,"7":850},"2":{"6":50600,"7":1700},"3":{"6":75900,"7":2550}}
5 6004|6204 5804 3 1|1|1 {"1":{"6":20300,"7":680},"2":{"6":40600,"7":1360},"3":{"6":60900,"7":2040}}
6 6005|6205 5805 3 1|1|1 {"1":{"6":30400,"7":1020},"2":{"6":60800,"7":2040},"3":{"6":91200,"7":3060}}
-7 6006|6206 5806 3 1|1|1 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3006}}
-8 6007|6207 5807 3 1|1|1 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3007}}
-9 6008|6208 5808 3 1|1|1 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3008}}
+7 6006|6206 5806 3 1|1|1 {"1":{"6":5000,"7":170},"2":{"6":10000,"7":340},"3":{"6":15000,"7":510}}
+8 6007|6207 5807 3 1|1|1 {"1":{"6":4000,"7":140},"2":{"6":8000,"7":280},"3":{"6":12000,"7":420}}
+9 6008|6208 5808 3 1|1|1 {"1":{"6":6000,"7":200},"2":{"6":12000,"7":400},"3":{"6":18000,"7":600}}
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index b972e2a..3f1f07c 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -1074,27 +1074,27 @@
5803 1 0 魔幻大师：武器 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 243 4 5000 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5804 1 0 魔幻大师：副手 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 243 5 5000 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5805 1 0 魔幻大师：衣服 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 243 6 5000 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-5806 1 0 夏日狂欢：武器 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 243 7 10 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
-5807 1 0 夏日狂欢：副手 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 243 8 10 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
-5808 1 0 夏日狂欢：衣服 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 243 9 10 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
+5806 1 0 夏日狂欢：武器 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 0 1 0 0 243 7 2300 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
+5807 1 0 夏日狂欢：副手 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 0 1 0 0 243 8 2300 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
+5808 1 0 夏日狂欢：衣服 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 0 1 0 0 243 9 2300 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
6000 1 0 熊猫公仔：武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 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 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6001 1 0 熊猫公仔：副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 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 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6002 1 0 熊猫公仔：衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 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 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6003 1 0 魔幻大师：武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 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 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6004 1 0 魔幻大师：副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 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 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6005 1 0 魔幻大师：衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 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 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-6006 1 0 夏日狂欢：武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 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 101 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-6007 1 0 夏日狂欢：副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 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 101 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-6008 1 0 夏日狂欢：衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 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 101 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6006 1 0 夏日狂欢：武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 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 101 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6007 1 0 夏日狂欢：副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 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 101 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6008 1 0 夏日狂欢：衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 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 101 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6200 1 0 熊猫公仔：武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 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 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6201 1 0 熊猫公仔：副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 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 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6202 1 0 熊猫公仔：衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 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 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6203 1 0 魔幻大师：武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 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 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6204 1 0 魔幻大师：副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 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 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6205 1 0 魔幻大师：衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 50 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 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-6206 1 0 夏日狂欢：武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 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 201 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-6207 1 0 夏日狂欢：副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 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 201 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-6208 1 0 夏日狂欢：衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 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 201 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6206 1 0 夏日狂欢：武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 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 201 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6207 1 0 夏日狂欢：副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 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 201 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6208 1 0 夏日狂欢：衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 230 0 50 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 201 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6501 1 0 虬龙 102 2 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 10 0 1744 0 0 0 0 220 10142 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 4 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6502 5 0 奔雷铁鞋 107 7 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 10 0 11456 0 0 0 0 220 10587 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 5 3 0 0 0 0 0 0 0 0 0 0 0 0 105 0 0 0 0 0
6601 9 1 绝世龙枪 101 1 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 25560 0 1 0 0 0 0 220 9001 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 5 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0