From 1362683e8c99d2237d8f9d0f39025c024432993e Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期五, 31 八月 2018 18:49:15 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc | 0 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt | 4 ++-- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0 6 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip index fc17850..e036868 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc index 0b2fc4b..760056a 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/ChNPC.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc index 97f4cc0..110f299 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.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 7a36b92..a31c0b0 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/PlayerFamily.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc index 400e6a7..c5a8598 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt index d8708cd..64099d5 100644 --- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt +++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt @@ -1,6 +1,6 @@ GiftbagID GiftbagType OriginalRMB BuyCountLimit GiftItemList MainItemID NotifyKey 2 1 88 1 [(196,1,0)] 196 LimitGift3 4 2 130 1 [(913,1,0),(181,80,0)] 913 LimitGift3 -5 3 200 1 [(4608,2,0),(4151,100,0)] 4608 LimitGift3 -7 4 320 1 [(4214,1,0),(181,180,0)] 4214 LimitGift3 +5 3 200 1 [(7002,1,0),(4608,2,0)] 7002 LimitGift3 +7 4 320 1 [(4214,1,0),(4151,200,0)] 4214 LimitGift3 8 5 600 1 [(4606,2,0),(4607,2,0)] 4606 LimitGift3 -- Gitblit v1.8.0