From 5bd59bc9548d17dc6ca7cb312e87a40db66c948a Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期六, 29 九月 2018 03:54:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
Robot/ConfigurationReader/ConfigIniReader.pyc | 0
db/PyMongoDataServer/PySysDB/tagChests.txt | 2 ++
CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc | 0
Robot/Configuration/Config.ini | 4 +++-
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 10 +++++-----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc | 0
Robot/Robot/RobotBase.pyc | 0
db/PyMongoDataServer/SysDB/tagChinItem.txt | 3 +++
Robot/AI/AIFile/AILoginout.pyc | 0
Robot/Robot/RobotMgr.pyc | 0
Robot/framework/frame.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc | 0
12 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index 0ac9781..799f97d 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -1,5 +1,5 @@
-CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime NotifyInfoStart NotifyInfoEnd LimitLV AddExpRate
-1 OpenServer [] 6 6 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
-2 NationalDay [(7001,7003),(8002,8004)] 2018-10-3 2018-10-3 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
-3 NationalDay [(7001,7003),(8002,8004)] 2018-10-7 2018-10-7 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
-4 NationalDay [(7001,7003),(8002,8004)] 2018-9-29 2018-9-29 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
+CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime NotifyInfoStart NotifyInfoEnd NotifyInfoLoop LimitLV AddExpRate
+1 OpenServer [] 6 6 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "loopNotifyParamList", [2]] 110 10000
+2 NationalDay [(7001,7003),(8002,8004)] 2018-10-3 2018-10-3 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "loopNotifyParamList", [2]] 110 10000
+3 NationalDay [(7001,7003),(8002,8004)] 2018-10-7 2018-10-7 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "loopNotifyParamList", [2]] 110 10000
+4 NationalDay [(7001,7003),(8002,8004)] 2018-9-29 2018-9-29 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} [30, "loopNotifyParamList", [2]] 110 10000
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
index 9947b0d..af32078 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
index c5aef78..5f02adf 100644
--- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
+++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/Robot/AI/AIFile/AILoginout.pyc b/Robot/AI/AIFile/AILoginout.pyc
index d4ecd56..6f12828 100644
--- a/Robot/AI/AIFile/AILoginout.pyc
+++ b/Robot/AI/AIFile/AILoginout.pyc
Binary files differ
diff --git a/Robot/Configuration/Config.ini b/Robot/Configuration/Config.ini
index 397a767..c7469ba 100644
--- a/Robot/Configuration/Config.ini
+++ b/Robot/Configuration/Config.ini
@@ -25,4 +25,6 @@
PlayerOffTime=180
ProcessFindTJGTime=30
ServerDBConfigPath=D:\ProjectServer\db\PyMongoDataServer
-StartRunTime=180
\ No newline at end of file
+StartRunTime=180
+
+TJGLimitCnt=200
\ No newline at end of file
diff --git a/Robot/ConfigurationReader/ConfigIniReader.pyc b/Robot/ConfigurationReader/ConfigIniReader.pyc
index 91b0a58..da16764 100644
--- a/Robot/ConfigurationReader/ConfigIniReader.pyc
+++ b/Robot/ConfigurationReader/ConfigIniReader.pyc
Binary files differ
diff --git a/Robot/Robot/RobotBase.pyc b/Robot/Robot/RobotBase.pyc
index 542bc3a..d017401 100644
--- a/Robot/Robot/RobotBase.pyc
+++ b/Robot/Robot/RobotBase.pyc
Binary files differ
diff --git a/Robot/Robot/RobotMgr.pyc b/Robot/Robot/RobotMgr.pyc
index 5cc2340..1a741b6 100644
--- a/Robot/Robot/RobotMgr.pyc
+++ b/Robot/Robot/RobotMgr.pyc
Binary files differ
diff --git a/Robot/framework/frame.pyc b/Robot/framework/frame.pyc
index 2c840e8..89d686e 100644
--- a/Robot/framework/frame.pyc
+++ b/Robot/framework/frame.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
index dce49fc..ba60a9a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/ItemCommon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index effb3d2..98b38c2 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -178,3 +178,5 @@
2388 0 0 0 1 0
2389 0 0 0 1 0
2390 0 0 0 0 0
+2391 0 0 0 0 0
+2392 0 0 280 1 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 69e92ea..cb3d3d2 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -272,6 +272,7 @@
1142 1 0 麒麟之府经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 1800 400 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
1143 1 0 麒麟之府经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 600 400 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
1144 1 0 异兽之地经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 4 0 50 0 1 0 0 215 3600 400 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
+1145 1 0 庆典经验丹 14 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1060 0 50 0 1 0 0 214 1 300 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1500 1 0 麒麟魂魄 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 1 0 0 233 31190 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
1501 1 0 宗门令牌 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 25 0 10 0 1 0 0 233 60010 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
1502 1 0 封魔令牌 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 52010 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
@@ -500,6 +501,8 @@
2388 1 0 神兽小宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 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 20 0 0 0 0 0 0 0 0
2389 1 0 神兽祝福宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2390 1 0 神兽紫装宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2391 1 0 烟花 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 60 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2392 1 0 庆典礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 280 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3501 1 0 1级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 1 1 3502 6 190 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
3502 1 0 2级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 1 2 3503 6 465 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
3503 1 0 3级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 1 3 3504 6 1160 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
--
Gitblit v1.8.0