From afe5b72a0f601f1f90188e52406d3a8b89cc9f6e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 14 一月 2019 22:05:48 +0800
Subject: [PATCH] 5722 【后端】【1.5】跨服BOSS开发（跨服采集支持，采集支持配置共享采集次数）
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossServerReceiveMsg.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/GeneralProgramme.txt | 12 ------------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
db/PyMongoDataServer/PySysDB/tagCollectNPC.txt | 8 ++++----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 12 ++++++++----
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/BreakPlayerCollectNPCIDList.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc | 0
/dev/null | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/ClearCollectNPCCnt.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ClientServerReceiveMsg.pyc | 0
14 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/GeneralProgramme.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/GeneralProgramme.txt
index 220b557..9d2b840 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/GeneralProgramme.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/GeneralProgramme.txt
@@ -812,15 +812,6 @@
HPPerLogic_275 \NPCLogic\NPCLogic_HPPerLogic\HPPerLogic_275 f6bbad4f20249961ef87914c75eab83d NPC275血量百分比逻辑配置
HPPerLogic_276 \NPCLogic\NPCLogic_HPPerLogic\HPPerLogic_276 2ce4f9e29aeb12685973fa7c5f9b94ed NPC276血量百分比逻辑配置
HPPerLogic_1200 \NPCLogic\NPCLogic_HPPerLogic\HPPerLogic_1200 a1ae0c0657d2a58e75fa37004b9750a4 NPC276血量百分比逻辑配置
-CollectNPCCfg \NPCLogic\NPCLogic_Collect\CollectNPCCfg 0c284a7c5b586bda5e71e48cba04dfed 采集NPC配置
-CollectNPCFuncTimeLimit \NPCLogic\NPCLogic_Collect\CollectNPCFuncTimeLimit 1bd32d796ae8425bebb215c6a6e4989d 采集NPC次数配置
-CollectNPCIDTimeLimit \NPCLogic\NPCLogic_Collect\CollectNPCIDTimeLimit 1bd32d796ae8425bebb215c6a6e4989d 采集NPCID对应次数限制配置
-CollectNPCFuncTimeBuyCost \NPCLogic\NPCLogic_Collect\CollectNPCFuncTimeBuyCost 945df5a93caa521a952cf7cdaa4ed9c6 购买采集NPC次数消耗配置
-CollectNPCLostHP \NPCLogic\NPCLogic_Collect\CollectNPCLostHP 945df5a93caa521a952cf7cdaa4ed9c6 采集掉血配置
-CollectItemInfo_20302001 \NPCLogic\NPCLogic_Collect\CollectItemInfo_20302001 bc900f3f565ff8957aba7229b0c09912 采集获得物品模板20302001配置
-CollectItemInfo_20302002 \NPCLogic\NPCLogic_Collect\CollectItemInfo_20302002 bc900f3f565ff8957aba7229b0c09912 采集获得物品模板20302002配置
-CollectItemInfo_40108001 \NPCLogic\NPCLogic_Collect\CollectItemInfo_20302001 bc900f3f565ff8957aba7229b0c09912 采集获得物品模板40108001配置
-CollectItemInfo_40108002 \NPCLogic\NPCLogic_Collect\CollectItemInfo_20302002 bc900f3f565ff8957aba7229b0c09912 采集获得物品模板40108002配置
NPCKilledAddPrestige \NPCLogic\NPCKilledAddPrestige 9a211d1829dbb5f2774559078353cea6 NPC被击杀周围玩家加威望
FreshmanGuiderFreeSpeakCnt \PlayerFreshmanGuider\FreshmanGuiderFreeSpeakCnt 70e3617f8c379998376dcec49b510b26 新手指导员每日免费传音次数
FirstLogin_GiveItem \FirstLogin\FirstLogin_GiveItem fe20ebeddddb5ade5bc94c046288ec0b 首登给物品配置
@@ -891,7 +882,6 @@
TeHuiAction_RechargeNotify \TeHuiAction\TeHuiAction_RechargeNotify 934bc1c8f493fc65dc884f55fa27ccaf 充值特惠系统提示配置
TeHuiAction_DiscountShopID \TeHuiAction\TeHuiAction_DiscountShopID 999f0b129cf88aa3deb0e003480a9f60 特惠折扣店ID配置
EquipQualityAddAttr \EquipIntensify\EquipQualityAddAttr 6ffa03da5f7cb4113e317e2ba5ba0bff 全身装备品质对应buff加成配置
-CollectGreateEquip \NPCLogic\NPCLogic_Collect\CollectGreateEquip 15b78467316859126c83f3f082ab6560 挖掘卓越物品
FB_RedFort_Cfg \GameFB\RedFort\FB_RedFort_Cfg b25560c0ec43420840a53ed3717412fb 要塞大乱斗副本配置
FB_RedFort_Line_LV \GameFB\RedFort\FB_RedFort_Line_LV 8aed0e64b6219414091c3762fbe42623 要塞大乱斗副本入场等级配置
FB_RedFort_BuffNPC \GameFB\RedFort\FB_RedFort_BuffNPC 526d9d8461f50e24b873beda2673ced2 要塞大乱斗副本buffNPC配置
@@ -921,8 +911,6 @@
PropEnhanceActive \PropEnhance\PropEnhanceActive a8ec5dea8ef8d7410bb7109f7793a289 新符文系统基本配置
AutoFightSetting \AutoFight\AutoFightSetting e834cf427671dae4668c930ed1e8c492 自动战斗配置存储
MoneyToCoinRate \PlayerCoinToGold\MoneyToCoinRate 92a539dfb58cb31c0a1178713864b49f 只用于记录将充值点转换为RMB单位元的比例
-CollectNormalEquip \NPCLogic\NPCLogic_Collect\CollectNormalEquip b0981b6ee657c57b4f1ca9079c552aa1 挖宝箱普通装备
-CollectEquipRandQuality \NPCLogic\NPCLogic_Collect\CollectEquipRandQuality 5ecfd48d96fdf71a2e35aeddc8bb1918 挖宝箱随机装备品质
BreakPlayerCollectNPCIDList \NPCLogic\NPCLogic_Collect\BreakPlayerCollectNPCIDList 5ecfd48d96fdf71a2e35aeddc8bb1918 可被攻击打断采集的NPCID列表
BillboardDienstgrad \PlayerDienstgrad\BillboardDienstgrad 2c63f4ad936ee1ee056c460da826dcb3 排行榜对应称号
DienstgradFamilyWarWinner \PlayerDienstgrad\DienstgradFamilyWarWinner f99e0a9c15b32e79bb49bd95c043020c 战盟战获胜战盟成员称号
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/BreakPlayerCollectNPCIDList.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/BreakPlayerCollectNPCIDList.txt
index ef9a483..b90e222 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/BreakPlayerCollectNPCIDList.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/BreakPlayerCollectNPCIDList.txt
@@ -1,4 +1,4 @@
#可被攻击打断采集的NPCID列表
(
-[250,251,252,300,310,311,312,256,319]
+[]
)
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectEquipRandQuality.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectEquipRandQuality.txt
deleted file mode 100644
index ffcda7e..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectEquipRandQuality.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-#类型对应的装备品质概率，没有配置的类型默认用-1
-# 物品类型: [[概率, 品质1], [概率, 品质2]]
-(
-{
--1:[[10000,1]],
-97:[[332,4],[1612,3],[10000,2]],
-}
-)
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectGreateEquip.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectGreateEquip.txt
deleted file mode 100644
index 6c94da1..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectGreateEquip.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-(
-(
-# 等级概率随机步长,基数为30，如2*30=60，60即为等级差距，用于公式计算
-[[2000, -1], [9000,0], [10000,1]],
-
-# 随机到的物品等级阶起点, 按本阶的范围抽取
-"0",
-
-# 物品等级阶等级范围
-0,
-
-# 3.本职业概率，目前配0或者10000以上
-0,
-
-# 幸运一击概率
-0,
-
-# 随机卓越条数
-[[8334, 2],[10000, 4]],
-
-# 广播条件[是否需要会心，卓越条数]
-(0, 2),
-
-# 强化随机范围
-(0, 0),
-
-# 追加等级
-(0, 0),
-)
-)
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectItemInfo_20302001.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectItemInfo_20302001.txt
deleted file mode 100644
index ed3b7fb..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectItemInfo_20302001.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-# 采集物给物品模板
-# {(职业):[对应奖励], (职业):[对应奖励], ...}
-# 没有配置的职业默认取()职业的奖励
-# 有指定的职业可配置()里，支持多职业如(0,1,2)，如果只配一个职业，则必须加一个逗号，如(0,)
-# 职业:0:剑士,1:魔法师,2:弓箭手,3:魔剑士,4:骑士,5:魔导师,6:圣射手
-# 采集给物品概率列表[(概率, 物品id, 个数, 是否绑定), ...]
-# 物品类型说明：0-表示普通物品，物品id即普通物品id；1-表示定制表物品，物品id表示定制表ItemIndex
-
-(
-
-# 按职业给物品，没有配置的职业则默认取()的物品
-{
- # ()如果有配置，则未配置职业的取该物品
- ():[# 饼图概率
- [
- (10000,(2388,1,1)),
- ],
- # 随机概率[最多个数, [物品概率列表]]
- [0,
- [
- ]
- ]
- ],
-
-
-
-
-}
-)
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectItemInfo_20302002.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectItemInfo_20302002.txt
deleted file mode 100644
index d72f775..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectItemInfo_20302002.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-# 采集物给物品模板
-# {(职业):[对应奖励], (职业):[对应奖励], ...}
-# 没有配置的职业默认取()职业的奖励
-# 有指定的职业可配置()里，支持多职业如(0,1,2)，如果只配一个职业，则必须加一个逗号，如(0,)
-# 职业:0:剑士,1:魔法师,2:弓箭手,3:魔剑士,4:骑士,5:魔导师,6:圣射手
-# 采集给物品概率列表[(概率, 物品id, 个数, 是否绑定), ...]
-# 物品类型说明：0-表示普通物品，物品id即普通物品id；1-表示定制表物品，物品id表示定制表ItemIndex
-
-(
-
-# 按职业给物品，没有配置的职业则默认取()的物品
-{
- # ()如果有配置，则未配置职业的取该物品
- ():[# 饼图概率
- [
- (10000,(2387,1,1)),
- ],
- # 随机概率[最多个数, [物品概率列表]]
- [0,
- [
- ]
- ]
- ],
-
-
-
-
-}
-)
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectItemInfo_40108001.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectItemInfo_40108001.txt
deleted file mode 100644
index ed3b7fb..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectItemInfo_40108001.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-# 采集物给物品模板
-# {(职业):[对应奖励], (职业):[对应奖励], ...}
-# 没有配置的职业默认取()职业的奖励
-# 有指定的职业可配置()里，支持多职业如(0,1,2)，如果只配一个职业，则必须加一个逗号，如(0,)
-# 职业:0:剑士,1:魔法师,2:弓箭手,3:魔剑士,4:骑士,5:魔导师,6:圣射手
-# 采集给物品概率列表[(概率, 物品id, 个数, 是否绑定), ...]
-# 物品类型说明：0-表示普通物品，物品id即普通物品id；1-表示定制表物品，物品id表示定制表ItemIndex
-
-(
-
-# 按职业给物品，没有配置的职业则默认取()的物品
-{
- # ()如果有配置，则未配置职业的取该物品
- ():[# 饼图概率
- [
- (10000,(2388,1,1)),
- ],
- # 随机概率[最多个数, [物品概率列表]]
- [0,
- [
- ]
- ]
- ],
-
-
-
-
-}
-)
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectItemInfo_40108002.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectItemInfo_40108002.txt
deleted file mode 100644
index d72f775..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectItemInfo_40108002.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-# 采集物给物品模板
-# {(职业):[对应奖励], (职业):[对应奖励], ...}
-# 没有配置的职业默认取()职业的奖励
-# 有指定的职业可配置()里，支持多职业如(0,1,2)，如果只配一个职业，则必须加一个逗号，如(0,)
-# 职业:0:剑士,1:魔法师,2:弓箭手,3:魔剑士,4:骑士,5:魔导师,6:圣射手
-# 采集给物品概率列表[(概率, 物品id, 个数, 是否绑定), ...]
-# 物品类型说明：0-表示普通物品，物品id即普通物品id；1-表示定制表物品，物品id表示定制表ItemIndex
-
-(
-
-# 按职业给物品，没有配置的职业则默认取()的物品
-{
- # ()如果有配置，则未配置职业的取该物品
- ():[# 饼图概率
- [
- (10000,(2387,1,1)),
- ],
- # 随机概率[最多个数, [物品概率列表]]
- [0,
- [
- ]
- ]
- ],
-
-
-
-
-}
-)
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCCfg.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCCfg.txt
deleted file mode 100644
index c516d75..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCCfg.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# 任务采集NPC信息配置
-# {
-# npcID:[是否可同时采, 不可同时采集提示, (采集消耗物品id, 个数), 采集耗时毫秒, 经验公式, 金币公式, 魔魂值, 等级对应产出物品概率模板编号字典,道具不足提示,采集上限提示],
-# ...
-# }
-# 等级对应产出物品概率模板编号字典 {(等级A, 等级B):模板编号, ...}，不产出请配置{}
-# 产出物品概率模板: CollectItemInfo_模板编号.txt，配置0表示不产出其他物品，注意新加模板文件需在GeneralProgramme.txt配置对应路径
-# reExp 参考经验
-# reMoney 参考金钱
-# reLV 参考等级
-# 神殿探秘
-(
-{
-#神兽副本
-20302001:[1, 'GeRen_liubo_436832', (0, 0), 10000, '0', '0', 0, {(0,9999):'20302001'}, 'GeRen_liubo_612029', 'DogzSmallTreasureLimit'],
-20302002:[1, 'GeRen_liubo_436832', (0, 0), 30000, '0', '0', 0, {(0,9999):'20302002'}, 'GeRen_liubo_612029', 'DogzBigTreasureLimit'],
-
-#蓬莱仙境
-40108001:[1, 'GeRen_liubo_436832', (0, 0), 10000, '0', '0', 0, {(0,9999):'40108001'}, 'GeRen_liubo_612029', 'DogzSmallTreasureLimit'],
-40108002:[1, 'GeRen_liubo_436832', (0, 0), 30000, '0', '0', 0, {(0,9999):'40108002'}, 'GeRen_liubo_612029', 'DogzBigTreasureLimit'],
-}
-)
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCFuncTimeBuyCost.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCFuncTimeBuyCost.txt
deleted file mode 100644
index 47fe082..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCFuncTimeBuyCost.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# 采集NPC功能号购买次数消耗钻石公式配置
-# {
-# npc功能号:购买消耗钻石数公式,
-# ...
-# }
-# 公式参数：
-# alreadyBuyCnt 已购买次数
-
-
-(
-
-{
-
-301:'10', # 混乱宝箱购买次数公式
-
-}
-
-)
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCFuncTimeLimit.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCFuncTimeLimit.txt
deleted file mode 100644
index 48b1eed..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCFuncTimeLimit.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# 任务采集NPC功能号每日对应采集次数限制
-# {
-# npc功能号:每日可采集次数公式,
-# ...
-# }
-# 次数公式参数：
-# vipLV vip等级
-
-
-(
-{
-
-#200:'20', # 夺宝奇兵
-#301:'15', # 混乱宝箱
-
-}
-)
\ No newline at end of file
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
deleted file mode 100644
index 9faaffc..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCIDTimeLimit.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# 采集NPCID每日对应采集次数限制
-# {
-# npcID:[每日可采集次数, 过天是否重置次数],
-# ...
-# }
-# 注: 过天不重置次数的请在各自功能中处理次数重置
-
-
-(
-
-{
-(20302001, 40108001):[9999, 1],
-(20302002, 40108002):[2, 1],
-}
-
-)
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCLostHP.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCLostHP.txt
deleted file mode 100644
index 54bec1b..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCLostHP.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# 采集掉血设置 {npcID:[每X秒掉一次血, 掉血百分比], ...}
-
-(
-
-{
-
-# 神兽副本
-20302001:[2, 2],
-20302001:[2, 4],
-
-# 蓬莱仙境
-40108001:[2, 2],
-40108002:[2, 4],
-
-
-}
-
-)
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNormalEquip.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNormalEquip.txt
deleted file mode 100644
index c2a4db4..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNormalEquip.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-(
-(
-# 等级概率随机步长,基数为30，如2*30=60，60即为等级差距，用于公式计算
-[[2000, -1], [9000,0], [10000,1]],
-
-# 随机到的物品等级阶起点, 按本阶的范围抽取
-"0",
-
-# 物品等级阶等级范围
-0,
-
-# 3.本职业概率，目前配0或者10000以上
-0,
-
-# 幸运一击概率
-0,
-
-# 强化随机范围
-(0, 0),
-
-# 追加等级
-(0, 0),
-
-# 带有技能概率（与武器的效果ID配合使用）
-0,
-)
-)
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 4b080be..14ea09a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -214,7 +214,7 @@
Writer = alee
Releaser = alee
RegType = 0
-RegisterPackCount = 9
+RegisterPackCount = 10
PacketCMD_1=0xA2
PacketSubCMD_1=0x03
@@ -251,6 +251,10 @@
PacketCMD_9=0xA2
PacketSubCMD_9=0x25
PacketCallFunc_9=ClientTaskCount
+
+PacketCMD_10=0xC1
+PacketSubCMD_10=0x06
+PacketCallFunc_10=OnCrossNPCTalk
;VIP功能
[PlayerVip]
@@ -868,9 +872,9 @@
PacketSubCMD_1=0x52
PacketCallFunc_1=OnBuyCollectionCnt
-PacketCMD_2=0xA2
-PacketSubCMD_2=0x20
-PacketCallFunc_2=OnOpenCollNPCBox
+PacketCMD_2=
+PacketSubCMD_2=
+PacketCallFunc_2=
PacketCMD_3=0xA5
PacketSubCMD_3=0x0A
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index f6cd65c..90a2110 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 58b16a5..9703517 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 9aab08a..cb94bc4 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/FBProcess/GameLogic_CrossPenglai.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossPenglai.pyc
deleted file mode 100644
index bf2a74d..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossPenglai.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc
index 7f5d0f4..4bbe654 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_Dogz.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 98a9346..aba9dde 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/PlayerMissionCollect.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMissionCollect.pyc
index 302cbe7..f0226ad 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 e1cf11b..de98d85 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_ClientServerReceiveMsg.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ClientServerReceiveMsg.pyc
index a00ee98..0e4a388 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ClientServerReceiveMsg.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_ClientServerReceiveMsg.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossServerReceiveMsg.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossServerReceiveMsg.pyc
index 8edb4e4..5af567c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossServerReceiveMsg.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossServerReceiveMsg.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagCollectNPC.txt b/db/PyMongoDataServer/PySysDB/tagCollectNPC.txt
index a1dc5b6..33be8a6 100644
--- a/db/PyMongoDataServer/PySysDB/tagCollectNPC.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCollectNPC.txt
@@ -1,5 +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]
+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