From a5ab56fa041e55a68b2f1007845b20bd47695978 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期六, 24 十一月 2018 17:03:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagCTG.txt | 58 +++++++-------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt | 35 ++++++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc | 0
db/PyMongoDataServer/PySysDB/tagFBFunc.txt | 46 +++++-----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc | 0
db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt | 4
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt | 45 +++++-----
13 files changed, 114 insertions(+), 75 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
index 8342571..577a4b0 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
@@ -1,22 +1,23 @@
-DataMapID OpenServerDay OpenTime CanEnterTime NotifyInfo
-31020 0 {} 0 {}
-31040 0 {} 0 {}
-31090 0 {} 0 {}
-41110 0 {} 0 {}
-31080 0 {} 0 {}
-31110 0 {} 0 {}
-31130 0 {} 0 {}
-31140 0 {} 0 {}
-31150 0 {} 0 {}
-31170 3 {"2":[[21,00]],"4":[[21,00]],"6":[[21,00]]} 30 {}
-31180 0 {"1":[[20,30]],"3":[[20,30]],"5":[[20,30]]} 30 {}
-31190 0 {} 0 {}
-31210 0 {} 0 {}
-31230 0 {"2":[[20,30]],"4":[[20,30]],"6":[[20,30]]} 15 {}
-31240 0 {} 0 {}
-40000 0 {"1":[[20,0]],"3":[[20,0]],"5":[[20,0]]} 30 {-5:["FB_liubo_54470", [5]], -3:["FB_liubo_54470", [3]], -1:["FB_liubo_54470", [1]]}
-51010 0 {} 0 {}
-60010 0 {} 0 {}
-31160 0 {"1":[[20,0]],"3":[[20,0]],"5":[[20,0]]} 30 {}
-31250 0 {} 0 {}
-52010 0 {} 0 {}
+DataMapID HelpPoint
+31020 0
+31040 0
+31090 0
+41110 0
+31080 0
+31110 50
+31130 0
+31140 0
+31150 0
+31170 0
+31180 120
+31190 0
+31210 0
+31220 0
+31230 0
+31240 0
+51010 30
+60010 25
+31160 0
+31250 0
+52010 0
+31010 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt b/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
new file mode 100644
index 0000000..1a518c4
--- /dev/null
+++ b/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
@@ -0,0 +1,35 @@
+VIPPrivilege VIP0 VIP1 VIP2 VIP3 VIP4 VIP5 VIP6 VIP7 VIP8 VIP9 VIP10 VIP11 VIP12 VIP13 VIP14 VIP15
+1 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+2 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
+3 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1
+4 2000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
+5 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+6 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+7 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+8 0 0 0 0 0 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000
+9 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1
+10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+11 0 0 0 0 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000
+12 0 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000
+13 3 4 5 6 10 11 12 15 16 17 20 20 22 24 26 28
+14 2 3 4 5 8 9 10 13 14 15 20 16 18 20 22 24
+15 0 0 0 2 3 4 4 5 6 7 8 9 10 11 12 12
+16 0 0 1 1 1 2 2 2 3 3 4 5 6 6 6 6
+17 1 1 2 2 3 3 4 4 4 4 4 4 4 4 4 4
+18 0 0 0 0 1 1 2 2 2 2 2 2 2 2 2 2
+19 0 0 1 1 3 3 5 5 7 7 9 11 11 13 13 15
+20 0 0 0 0 1 1 1 2 2 2 2 3 3 3 3 3
+21 1 1 1 1 2 2 3 3 3 3 3 3 3 3 3 3
+22 0 0 0 0 0 1 1 1 1 1 2 2 2 2 2 2
+23 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 1
+24 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+25 2 3 4 5 6 7 8 10 12 14 16 18 20 22 24 25
+26 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1
+27 0 0 1 2 2 3 3 4 4 4 4 5 5 5 5 5
+28 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1
+29 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+30 0 1 1 2 2 3 5 7 10 12 15 15 15 15 15 15
+31 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+32 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+33 0 0 0 500 500 500 500 1000 1000 1000 1000 1000 1000 1000 1000 1000
+34 0 0 0 5000 5000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
diff --git a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
index 3cfc31a..015cd6b 100644
--- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
+++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
index f85c917..22c6d2a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc
index 9ecc3b3..ff651dd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index 531eb4a..a0f9fa4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
index 84b026c..6c2fc9d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
index b0f0137..105bf46 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
index a9b78fa..e99c9e5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagCTG.txt b/db/PyMongoDataServer/PySysDB/tagCTG.txt
index 7316e69..1abdd16 100644
--- a/db/PyMongoDataServer/PySysDB/tagCTG.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCTG.txt
@@ -1,29 +1,29 @@
-RecordID DailyBuyCount GainGold GainGoldPaper FirstGoldPaperPrize GainItemList
-101 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
-102 0 100 10 100 []
-103 0 300 30 300 []
-104 0 980 100 980 []
-105 0 1280 138 1280 []
-106 0 1980 248 1980 []
-107 0 3280 468 3280 []
-108 0 6480 1088 6480 []
-109 0 30000 5888 0 []
-110 0 10 1 0 []
-111 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]]
-112 1 0 0 0 [[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]]
-113 1 0 0 0 [[255,1,1],[196,1,1],[181,80,1],[913,1,1]]
-2 0 60 6 60 []
-201 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
-202 0 60 6 60 []
-203 0 300 30 300 []
-204 0 980 100 980 []
-205 0 1280 138 1280 []
-206 0 1980 248 1980 []
-207 0 3280 468 3280 []
-208 0 6480 1088 6480 []
-209 0 30000 5888 0 []
-210 0 1 0 0 []
-211 0 1 0 0 []
-212 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]]
-213 1 0 0 0 [[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]]
-214 1 0 0 0 [[255,1,1],[196,1,1],[181,80,1],[913,1,1]]
+RecordID DailyBuyCount GainGold GainGoldPaper FirstGoldPaperPrize GainItemList NotifyMark
+101 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
+102 0 100 10 100 []
+103 0 300 30 300 []
+104 0 980 100 980 []
+105 0 1280 138 1280 []
+106 0 1980 248 1980 []
+107 0 3280 468 3280 []
+108 0 6480 1088 6480 []
+109 0 30000 5888 0 []
+110 0 10 1 0 []
+111 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]] Bargaingift1
+112 1 0 0 0 [[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]] Bargaingift2
+113 1 0 0 0 [[255,1,1],[196,1,1],[181,80,1],[913,1,1]] Bargaingift3
+2 0 60 6 60 []
+201 1 0 0 0 [[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
+202 0 60 6 60 []
+203 0 300 30 300 []
+204 0 980 100 980 []
+205 0 1280 138 1280 []
+206 0 1980 248 1980 []
+207 0 3280 468 3280 []
+208 0 6480 1088 6480 []
+209 0 30000 5888 0 []
+210 0 1 0 0 []
+211 0 1 0 0 []
+212 1 0 0 0 [[58,1,1],[194,1,1],[5,1,1],[912,1,1]] Bargaingift1
+213 1 0 0 0 [[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]] Bargaingift2
+214 1 0 0 0 [[255,1,1],[196,1,1],[181,80,1],[913,1,1]] Bargaingift3
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 373ef7f..3654a30 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -198,3 +198,4 @@
2411 0 181_300
4008 4011_5
4009 4011_5
+2412 [[5000,[3503,1]],[10000,[3513,1]]] 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
index 2b05443..e400734 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
@@ -1,23 +1,23 @@
-DataMapID DayTimes DayReKind WeekTimes WeekReKind RewardRate BuyTimesID ExtraTimesID MWPrivilegeID GuardPick OfflineTime HelpPoint
-31020 0 0 0 0 0 0 0 0 1 180 0
-31040 0 0 0 0 0 0 0 0 0 0 0
-31090 0 0 0 0 0 0 0 0 0 0 0
-41110 0 0 0 0 0 0 0 0 0 0 0
-31080 2 2 0 0 75|60|45|30|21 21 0 0 1 0 0
-31110 0 0 0 0 75|60|45|30|17 0 0 0 1 0 0
-31130 0 0 0 0 75|60|45|30|16 0 0 0 1 0 0
-31140 10 2 0 0 0 0 0 0 1 0 0
-31150 1 2 0 0 0 0 19 0 1 180 0
-31170 1 2 0 0 75|60|45|30|20 0 0 0 1 0 0
-31180 1 2 0 0 100|90|80|70|60 0 0 0 1 0 120
-31190 2 2 0 0 75|60|45|30|18 17 0 0 1 0 0
-31210 0 0 0 0 0 0 0 0 0 0 0
-31220 2 2 0 0 0 0 0 0 0 0 0
-31230 1 2 0 0 0 0 0 0 0 0 0
-31240 0 2 0 0 0 0 15 0 1 0 0
-51010 2 2 0 0 100|80|70|60|40 29 0 0 1 0 0
-60010 3 2 0 0 75|60|45|30|21 0 0 0 1 0 0
-31160 1 2 0 0 0 0 0 0 1 0 0
-31250 0 0 0 0 0 0 0 0 0 0 0
-52010 5 2 0 0 0 25 0 0 1 180 0
-31010 3 2 0 0 0 0 0 0 0 180 0
+DataMapID DayTimes DayReKind WeekTimes WeekReKind RewardRate BuyTimesID ExtraTimesID MWPrivilegeID GuardPick OfflineTime FBPoint HelpPoint DayHelpCountMax
+31020 0 0 0 0 0 0 0 0 1 180 0 0 0
+31040 0 0 0 0 0 0 0 0 0 0 0 0 0
+31090 0 0 0 0 0 0 0 0 0 0 0 0 0
+41110 0 0 0 0 0 0 0 0 0 0 0 0 0
+31080 2 2 0 0 75|60|45|30|21 21 0 0 1 0 0 0 0
+31110 0 0 0 0 75|60|45|30|17 0 0 0 1 0 100 50 0
+31130 0 0 0 0 75|60|45|30|16 0 0 0 1 0 0 0 0
+31140 10 2 0 0 0 0 0 0 1 0 0 0 0
+31150 1 2 0 0 0 0 19 0 1 180 0 0 0
+31170 1 2 0 0 75|60|45|30|20 0 0 0 1 0 0 0 0
+31180 1 2 0 0 100|90|80|70|60 0 0 0 1 0 120 120 1
+31190 2 2 0 0 75|60|45|30|18 17 0 0 1 0 0 0 0
+31210 0 0 0 0 0 0 0 0 0 0 0 0 0
+31220 2 2 0 0 0 0 0 0 0 0 0 0 0
+31230 1 2 0 0 0 0 0 0 0 0 0 0 0
+31240 0 2 0 0 0 0 15 0 1 0 0 0 0
+51010 2 2 0 0 100|80|70|60|40 29 0 0 1 0 60 30 0
+60010 3 2 0 0 75|60|45|30|21 0 0 0 1 0 50 25 0
+31160 1 2 0 0 0 0 0 0 1 0 0 0 0
+31250 0 0 0 0 0 0 0 0 0 0 0 0 0
+52010 5 2 0 0 0 25 0 0 1 180 0 0 0
+31010 3 2 0 0 0 0 0 0 0 180 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
index 5dc470c..1a518c4 100644
--- a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
@@ -13,7 +13,7 @@
12 0 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000 3000
13 3 4 5 6 10 11 12 15 16 17 20 20 22 24 26 28
14 2 3 4 5 8 9 10 13 14 15 20 16 18 20 22 24
-15 0 0 0 1 2 2 3 3 4 4 4 9 10 11 12 12
+15 0 0 0 2 3 4 4 5 6 7 8 9 10 11 12 12
16 0 0 1 1 1 2 2 2 3 3 4 5 6 6 6 6
17 1 1 2 2 3 3 4 4 4 4 4 4 4 4 4 4
18 0 0 0 0 1 1 2 2 2 2 2 2 2 2 2 2
@@ -31,3 +31,5 @@
30 0 1 1 2 2 3 5 7 10 12 15 15 15 15 15 15
31 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
32 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
+33 0 0 0 500 500 500 500 1000 1000 1000 1000 1000 1000 1000 1000 1000
+34 0 0 0 5000 5000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
--
Gitblit v1.8.0