From 6f37895525de8103ffdcd5a80627941c406de8dc Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 11 一月 2019 21:28:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCIDTimeLimit.txt | 6 ++----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 1 -
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc | 0
CoreServerGroup/GameServer/Script/PyGameData.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearCollectNPCCnt.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_NPCCntCross.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc | 0
18 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index d90cf08..f0c60e5 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -50,7 +50,6 @@
CreateRoleMap {1:[10010,195,81],2:[10010,195,81],3:[10010,195,81]}
SetWorldPosShunt {10010:10, 10020:10, 10030:10, 10040:10, 10050:10, 10060:10,10070:10,10080:10,10090:10} 350
DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',6,6,6], (161):[20302003,8,'7200',8,8,8], (162):[20302004,8,'7200',8,8,8], (163):[20302005,8,'7200',8,8,8], (164):[20302008,8,'7200',8,8,8], (165):[20302009,8,'7200',8,8,8], (166):[20302006,8,'7200',8,8,8], (167):[20302007,8,'7200',8,8,8]} 20303001 [20302002, 20302003]
-RandomRefreshNPC {32020:{1:[[40108001], [101,102,103,104,105,106,107,108,109,110], 1, 5, 30], 2:[[40108002], [111,112,113], 1, 2, 60]}} [40108002, 40102001]
XMZZBetCfg {}
XMZZAward {"3":[[181,5,1]],"6":[[181,5,1]],"9":[[197,1,1]],"12":[[197,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
XMZZDogFallLimit 1000
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
index 8808fb4..2cb41f4 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
index af6626f..6a82b8d 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/PyGameData.pyc b/CoreServerGroup/GameServer/Script/PyGameData.pyc
index 0fa5d51..69cf901 100644
--- a/CoreServerGroup/GameServer/Script/PyGameData.pyc
+++ b/CoreServerGroup/GameServer/Script/PyGameData.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 1eb9ab5..134ab8f 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCIDTimeLimit.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCIDTimeLimit.txt
index cb39d8e..9faaffc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCIDTimeLimit.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCIDTimeLimit.txt
@@ -9,10 +9,8 @@
(
{
-20302001:[9999, 1],
-20302002:[2, 1],
-40108001:[9999, 1],
-40108002:[2, 1],
+(20302001, 40108001):[9999, 1],
+(20302002, 40108002):[2, 1],
}
)
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 7a357ab..50c66a6 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/EventShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
index db9f1f2..58b16a5 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/GM/Commands/ClearCollectNPCCnt.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearCollectNPCCnt.pyc
index df0127f..9aab08a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearCollectNPCCnt.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearCollectNPCCnt.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc
index 7f7313d..5b80086 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
index ea27026..3544d04 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc
index ef8032a..fe165ce 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.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 30201f8..5c42f4d 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/PlayerMissionCollect.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.pyc
index 0fbdd81..5e36029 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
index 65145b3..e1cf11b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_NPCCntCross.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_NPCCntCross.pyc
new file mode 100644
index 0000000..e9fbd00
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_NPCCntCross.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 16796da..f80e3ae 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/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 971996a..724839f 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -270,7 +270,7 @@
DogzAssist 3|6 5409 2|3|5 1_10|2_20|3_30|4_40|5_50|6_50 8352
DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',6,6,6], (161):[20302003,8,'7200',8,8,8], (162):[20302004,8,'7200',8,8,8], (163):[20302005,8,'7200',8,8,8], (164):[20302008,8,'7200',8,8,8], (165):[20302009,8,'7200',8,8,8], (166):[20302006,8,'7200',8,8,8], (167):[20302007,8,'7200',8,8,8]} 20303001 [20302002, 20302003]
DogzFBCollect {20302001:2,20302002:2} {20302001:2,20302002:4}
-RandomRefreshNPC {32020:{1:[[40108001], [101,102,103,104,105,106,107,108,109,110], 1, 5, 30], 2:[[40108002], [111,112,113], 1, 2, 60]}} [40108002, 40102001]
+RandomRefreshNPC {32020:{1:[[40108001], [101,102,103,104,105,106,107,108,109,110], 1, 5, 30], 2:[[40108002], [111,112,113], 1, 2, 60]}}
XMZZBetCfg {}
XMZZAward {"3":[[181,5,1]],"6":[[181,5,1]],"9":[[197,1,1]],"12":[[197,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
XMZZRobot [30403002,30403003,30403004] 30403001
--
Gitblit v1.8.0