From ea4f0268501847eb74cee670288e6ec6c47a75e7 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期一, 14 一月 2019 16:58:46 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ResetBossKillCnt.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0 CoreServerGroup/GameServer/Script/ChConfig.pyc | 0 db/PyMongoDataServer/PySysDB/tagCollectNPC.txt | 5 +++++ ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0 CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc | 0 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc | 0 CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc | 0 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc | 0 CoreServerGroup/GameServer/Script/PyGameData.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossKillBoss.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/BossHurtMng.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc | 0 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossSetPlayerAttrValue.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddKillBossCnt.pyc | 0 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc | 0 19 files changed, 5 insertions(+), 0 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/ChConfig.pyc b/CoreServerGroup/GameServer/Script/ChConfig.pyc index 82266a1..7d4ab8c 100644 --- a/CoreServerGroup/GameServer/Script/ChConfig.pyc +++ b/CoreServerGroup/GameServer/Script/ChConfig.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc index c3ac379..7966cdc 100644 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossBoss.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc index 2cb41f4..2599bbf 100644 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc index 5beab22..23ddf26 100644 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc index f506113..72416cc 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/CrossRealmPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc index d9fe49a..af73834 100644 --- a/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc +++ b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc index 487eef2..67ad2a0 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 69cf901..8d00335 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 134ab8f..0e653e4 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/GameWorldLogic/BossHurtMng.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/BossHurtMng.pyc index 7146306..3079a85 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/BossHurtMng.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/BossHurtMng.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 c8ccd74..b705932 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/Item/UseItem/Item_AddKillBossCnt.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddKillBossCnt.pyc index 7889a88..94f49a1 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddKillBossCnt.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_AddKillBossCnt.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ResetBossKillCnt.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ResetBossKillCnt.pyc index 96ed1b9..b92e8f3 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ResetBossKillCnt.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ResetBossKillCnt.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 3544d04..98a9346 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/Player/CrossRealmPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc index 6a74db9..f120b3f 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossKillBoss.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossKillBoss.pyc new file mode 100644 index 0000000..468d511 --- /dev/null +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossKillBoss.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossSetPlayerAttrValue.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossSetPlayerAttrValue.pyc new file mode 100644 index 0000000..fb57087 --- /dev/null +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossSetPlayerAttrValue.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 f80e3ae..61a3e2a 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/tagCollectNPC.txt b/db/PyMongoDataServer/PySysDB/tagCollectNPC.txt new file mode 100644 index 0000000..a1dc5b6 --- /dev/null +++ b/db/PyMongoDataServer/PySysDB/tagCollectNPC.txt @@ -0,0 +1,5 @@ +NPCID PrepareTime LostHPPer CollectCount CollectCountLimitNotify CollectAward +20302001 10 2_2 0 DogzSmallTreasureLimit [2388,1,1] +20302002 30 2_4 2 DogzBigTreasureLimit [2387,1,1] +40108001 10 2_2 0 DogzSmallTreasureLimit [2388,1,1] +40108002 30 2_4 2 DogzBigTreasureLimit [2387,1,1] -- Gitblit v1.8.0