From 1a58c2998f4eb418a265eb2a244e36f360b73e06 Mon Sep 17 00:00:00 2001
From: cehua_ZWJ <123456>
Date: 星期六, 16 二月 2019 10:37:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc | 0
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 21 +++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 1
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc | 0
db/PyMongoDataServer/PySysDB/tagLuckyTreasureTemplate.txt | 155 ++++++++++++++++++++++----------------
CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc | 0
/dev/null | 0
CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc | 0
db/PyMongoDataServer/PySysDB/tagLoginAward.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc | 0
db/PyMongoDataServer/PySysDB/tagActLuckyTreasure.txt | 2
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActLuckyTreasure.txt | 2
21 files changed, 115 insertions(+), 68 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActLuckyTreasure.txt b/CoreServerGroup/GameServer/PySysDB/tagActLuckyTreasure.txt
index 94ba213..2d47adc 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActLuckyTreasure.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActLuckyTreasure.txt
@@ -4,4 +4,4 @@
3 ceshi1 [] [] 2018-11-16 2018-11-18 0 {0:["XYCOpen", []]} {} [] 110
4 yunying1 [] [] 2018-11-23 2018-11-24 0 {0:["XYCOpen", []]} {} [] 110
5 yunying2 [] [] 2018-11-26 2018-11-26 0 {0:["XYCOpen", []]} {} [] 110
-6 xiaoxuexy18 [] [] 2018-12-3 2018-12-3 0 {0:["XYCOpen", []]} {} [] 110
+6 xiaoxuexy18 [] [] 2019-2-20 2019-2-20 0 {0:["XYCOpen", []]} {} [] 110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index e703702..b34c731 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -82,3 +82,4 @@
CrossRealmPKCfg [100, 5] 180 50
CrossRealmPKScore 0 [100, 80] min(cWinCount*20,100)
MixServer 5
+MixServerMail [[181,100,1],[4151,100,1],[953,1,1],[4680,1,1]] [[1000,20,1],[1001,20,1],[1002,20,1],[1003,20,1],[1026,20,1],[1027,20,1],[1028,20,1],[1029,20,1],[1030,20,1]] [500, 2000000] [[947,1,1]]
diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc
index 8bc937d..ede0a55 100644
--- a/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc
+++ b/CoreServerGroup/GameServer/Script/GM/Commands/SetMixServer.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
index e61d950..36ba081 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
index dfed7ac..85ce23b 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc
index 8e2a400..b948352 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerDBGSEvent.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
index 0415261..f4c022c 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index f5e2156..f8d0220 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 4d606ed..6e1c7ff 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc
index 2da2132..23f6654 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/FunctionNPCCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc
deleted file mode 100644
index 13c8911..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearMixServerAward.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.pyc
index 20dde73..938c45c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/GMShell.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index d04edf5..610d36d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc
index 7b860d8..ba8e040 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBillboard.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 9b76625..4c44936 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/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index 9721ac2..9bdc929 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc
index 1a64c89..e7b74ee 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActLuckyTreasure.txt b/db/PyMongoDataServer/PySysDB/tagActLuckyTreasure.txt
index d214844..49dfe2f 100644
--- a/db/PyMongoDataServer/PySysDB/tagActLuckyTreasure.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActLuckyTreasure.txt
@@ -4,4 +4,4 @@
3 2018-11-16 2018-11-18 0 110 1 600
4 2018-11-23 2018-11-24 0 110 1 600
5 2018-11-26 2018-11-26 0 110 1 600
-6 2018-12-3 2018-12-3 0 110 1 600
+6 2019-2-20 2019-2-20 0 110 1 600
diff --git a/db/PyMongoDataServer/PySysDB/tagLoginAward.txt b/db/PyMongoDataServer/PySysDB/tagLoginAward.txt
index 472d7c1..f21872f 100644
--- a/db/PyMongoDataServer/PySysDB/tagLoginAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagLoginAward.txt
@@ -1,6 +1,6 @@
TemplateID ActionType TotalTimes SingleTimes Reward
100 1 1 1 {"1000":[[30,30,1]]}
-200 2 2 2 {"250":[[5410,1,1]],"300":[[2389,1,1]],"1000":[[5410,1,1]]}
+200 2 3 3 {"250":[[5410,1,1]],"300":[[2389,1,1]],"1000":[[5410,1,1]]}
300 3 3 3 {"250":[[5410,1,1]],"300":[[2389,1,1]],"1000":[[5411,1,1]]}
400 4 2 2 {"1000":[[30,30,1]]}
500 5 20 20 {"1000":[[30,30,1]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagLuckyTreasureTemplate.txt b/db/PyMongoDataServer/PySysDB/tagLuckyTreasureTemplate.txt
index 68caae6..7ebfe23 100644
--- a/db/PyMongoDataServer/PySysDB/tagLuckyTreasureTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagLuckyTreasureTemplate.txt
@@ -1,66 +1,91 @@
ID WorldLVLimit ItemID ItemCnt IsBind ItemListEx
-1 [0,500] 11 1 1 2997
-1 [0,501] 16 1 1 864
-1 [0,502] 13 1 1 691
-1 [0,503] 14 1 1 35
-1 [0,504] 19 1 1 28
-1 [0,505] 2 1 1 2997
-1 [0,506] 3 1 1 2398
-1 [0,507] 802 1 1 1918
-1 [0,508] 4 1 1 1499
-1 [0,509] 8 1 1 432
-1 [0,510] 4304 2 1 2997
-1 [0,511] 4304 4 1 2398
-1 [0,512] 4304 6 1 1918
-1 [0,513] 4304 8 1 1499
-1 [0,514] 4304 20 1 432
-1 [0,515] 3501 1 1 2997
-1 [0,516] 3502 1 1 2398
-1 [0,517] 3503 1 1 691
-1 [0,518] 3504 1 1 70
-1 [0,519] 3505 1 1 56
-1 [0,520] 3511 1 1 2997
-1 [0,521] 3512 1 1 2398
-1 [0,522] 3513 1 1 691
-1 [0,523] 3514 1 1 70
-1 [0,524] 3515 1 1 56
-1 [0,525] 4151 2 1 2997
-1 [0,526] 4151 4 1 2398
-1 [0,527] 4151 6 1 1918
-1 [0,528] 4151 15 1 540
-1 [0,529] 4151 40 1 432
-1 [0,530] 181 2 1 2997
-1 [0,531] 181 4 1 2398
-1 [0,532] 181 6 1 1918
-1 [0,533] 181 15 1 540
-1 [0,534] 181 40 1 432
-1 [0,535] 4181 1 1 2997
-1 [0,536] 197 1 1 2398
-1 [0,537] 4182 1 1 1918
-1 [0,538] 198 1 1 540
-1 [0,539] 199 1 1 56
-1 [0,540] 2211 10 1 2997
-1 [0,541] 2211 15 1 2398
-1 [0,542] 2211 20 1 1918
-1 [0,543] 2319 1 1 540
-1 [0,544] 2326 1 1 56
-1 [0,545] 149 1 1 2997
-1 [0,546] 151 1 1 2398
-1 [0,547] 154 1 1 1918
-1 [0,548] 147 1 1 1499
-1 [0,549] 155 1 1 432
-1 [0,550] 141 10 1 2997
-1 [0,551] 141 20 1 2398
-1 [0,552] 142 20 1 1918
-1 [0,553] 142 60 1 540
-1 [0,554] 143 60 1 432
-1 [0,555] 5303 10 1 2997
-1 [0,556] 5303 20 1 2398
-1 [0,557] 5303 40 1 691
-1 [0,558] 5303 80 1 540
-1 [0,559] 5303 120 1 56
-1 [0,560] 911 1 1 2997
-1 [0,561] 911 2 1 2398
-1 [0,562] 911 3 1 1918
-1 [0,563] 912 1 1 540
-1 [0,564] 1001 1 1 14
+1 [0,250] 4151 10 1 1400
+1 [0,250] 4305 5 1 1072
+1 [0,250] 2213 10 1 1072
+1 [0,250] 5303 30 1 1072
+1 [0,250] 5412 5 1 1072
+1 [0,250] 3502 1 1 1072
+1 [0,250] 3512 1 1 1072
+1 [0,250] 142 20 1 1072
+1 [0,250] 143 15 1 1072
+1 [0,250] 258 1 1 20
+1 [251,300] 4151 10 1 1400
+1 [251,300] 8353 5 1 1072
+1 [251,300] 2213 10 1 1072
+1 [251,300] 5303 30 1 1072
+1 [251,300] 5412 5 1 1072
+1 [251,300] 3503 1 1 1072
+1 [251,300] 3513 1 1 1072
+1 [251,300] 143 30 1 1072
+1 [251,300] 144 20 1 1072
+1 [251,300] 259 1 1 20
+1 [301,1000] 4151 10 1 1400
+1 [301,1000] 700 5000 1 1072
+1 [301,1000] 2213 10 1 1072
+1 [301,1000] 5303 30 1 1072
+1 [301,1000] 5412 5 1 1072
+1 [301,1000] 3504 1 1 1072
+1 [301,1000] 3514 1 1 1072
+1 [301,1000] 144 20 1 1072
+1 [301,1000] 153 10 1 1072
+1 [301,1000] 260 1 1 20
+2 [0,250] 4151 10 1 1400
+2 [0,250] 4304 5 1 1072
+2 [0,250] 2213 10 1 1072
+2 [0,250] 5303 30 1 1072
+2 [0,250] 5412 5 1 1072
+2 [0,250] 3502 1 1 1072
+2 [0,250] 3512 1 1 1072
+2 [0,250] 142 20 1 1072
+2 [0,250] 143 15 1 1072
+2 [0,250] 261 1 1 125
+2 [251,300] 4151 10 1 1400
+2 [251,300] 8353 5 1 1072
+2 [251,300] 2213 10 1 1072
+2 [251,300] 5303 30 1 1072
+2 [251,300] 5412 5 1 1072
+2 [251,300] 3503 1 1 1072
+2 [251,300] 3513 1 1 1072
+2 [251,300] 143 30 1 1072
+2 [251,300] 144 20 1 1072
+2 [251,300] 262 1 1 125
+2 [301,1000] 4151 10 1 1400
+2 [301,1000] 700 5000 1 1072
+2 [301,1000] 2213 10 1 1072
+2 [301,1000] 5303 30 1 1072
+2 [301,1000] 5412 5 1 1072
+2 [301,1000] 3504 1 1 1072
+2 [301,1000] 3514 1 1 1072
+2 [301,1000] 144 20 1 1072
+2 [301,1000] 153 10 1 1072
+2 [301,1000] 263 1 1 125
+3 [0,250] 4151 10 1 1400
+3 [0,250] 4304 5 1 1072
+3 [0,250] 2213 10 1 1072
+3 [0,250] 5303 30 1 1072
+3 [0,250] 5412 5 1 1072
+3 [0,250] 3502 1 1 1072
+3 [0,250] 3512 1 1 1072
+3 [0,250] 142 20 1 1072
+3 [0,250] 143 15 1 1072
+3 [0,250] 250 1 1 333
+3 [251,300] 4151 10 1 1400
+3 [251,300] 8353 5 1 1072
+3 [251,300] 2213 10 1 1072
+3 [251,300] 5303 30 1 1072
+3 [251,300] 5412 5 1 1072
+3 [251,300] 3503 1 1 1072
+3 [251,300] 3513 1 1 1072
+3 [251,300] 143 30 1 1072
+3 [251,300] 144 20 1 1072
+3 [251,300] 251 1 1 333
+3 [301,1000] 4151 10 1 1400
+3 [301,1000] 700 5000 1 1072
+3 [301,1000] 2213 10 1 1072
+3 [301,1000] 5303 30 1 1072
+3 [301,1000] 5412 5 1 1072
+3 [301,1000] 3504 1 1 1072
+3 [301,1000] 3514 1 1 1072
+3 [301,1000] 144 20 1 1072
+3 [301,1000] 153 10 1 1072
+3 [301,1000] 252 1 1 333
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index deed504..56642c3 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -511,3 +511,24 @@
lbj.chlb.18 104021343 18 111 0
lbj.lclb.30 104021343 30 112 0
lbj.zqlb.98 104021343 98 113 0
+yyb2.18 yybgame2 18 101 0
+yyb2.1 yybgame2 10 102 0
+yyb2.3 yybgame2 30 103 0
+yyb2.98 yybgame2 98 104 0
+yyb2.128 yybgame2 128 105 0
+yyb2.198 yybgame2 198 106 0
+yyb2.328 yybgame2 328 107 0
+yyb2.648 yybgame2 648 108 0
+yyb2.3000 yybgame2 3000 109 0
+yyb2.test1 yybgame2 1 110 0
+yyb2.android.6 yybgame2 6 0 2
+yyb2.android.30 yybgame2 30 0 4
+yyb2.android.68 yybgame2 68 0 5
+yyb2.android.128 yybgame2 128 0 7
+yyb2.android.168 yybgame2 168 0 8
+yyb2.android.18 yybgame2 18 0 3
+yyb2.android.98 yybgame2 98 0 6
+yyb2.android.198 yybgame2 198 0 9
+yyb2.android.jbch yybgame2 18 111 0
+yyb2.android.ntlc yybgame2 30 112 0
+yyb2.android.jszq yybgame2 98 113 0
--
Gitblit v1.8.0