From b55d12c5f4266f6fcaebf95bb1099f8eba8860ba Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期二, 21 八月 2018 15:43:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCCfg.txt | 4 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/GeneralProgramme.txt | 2 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCIDTimeLimit.txt | 13 ------
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectItemInfo_20302001.txt | 29 ++++++++++++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectItemInfo_20302002.txt | 29 ++++++++++++++
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCFuncTimeLimit.txt | 4 +-
6 files changed, 66 insertions(+), 15 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/GeneralProgramme.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/GeneralProgramme.txt
index bccc8e5..7b94b58 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/GeneralProgramme.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/GeneralProgramme.txt
@@ -816,6 +816,8 @@
CollectNPCFuncTimeLimit \NPCLogic\NPCLogic_Collect\CollectNPCFuncTimeLimit 1bd32d796ae8425bebb215c6a6e4989d 采集NPC次数配置
CollectNPCIDTimeLimit \NPCLogic\NPCLogic_Collect\CollectNPCIDTimeLimit 1bd32d796ae8425bebb215c6a6e4989d 采集NPCID对应次数限制配置
CollectNPCFuncTimeBuyCost \NPCLogic\NPCLogic_Collect\CollectNPCFuncTimeBuyCost 945df5a93caa521a952cf7cdaa4ed9c6 购买采集NPC次数消耗配置
+CollectItemInfo_20302001 \NPCLogic\NPCLogic_Collect\CollectItemInfo_20302001 bc900f3f565ff8957aba7229b0c09912 采集获得物品模板20302001配置
+CollectItemInfo_20302002 \NPCLogic\NPCLogic_Collect\CollectItemInfo_20302002 bc900f3f565ff8957aba7229b0c09912 采集获得物品模板20302002配置
CollectItemInfo_300 \NPCLogic\NPCLogic_Collect\CollectItemInfo_300 bc900f3f565ff8957aba7229b0c09912 采集获得物品模板300配置
CollectItemInfo_250 \NPCLogic\NPCLogic_Collect\CollectItemInfo_250 bc900f3f565ff8957aba7229b0c09912 采集获得物品模板300配置
CollectItemInfo_251 \NPCLogic\NPCLogic_Collect\CollectItemInfo_251 bc900f3f565ff8957aba7229b0c09912 采集获得物品模板300配置
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
new file mode 100644
index 0000000..b881672
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectItemInfo_20302001.txt
@@ -0,0 +1,29 @@
+# 采集物给物品模板
+# {(职业):[对应奖励], (职业):[对应奖励], ...}
+# 没有配置的职业默认取()职业的奖励
+# 有指定的职业可配置()里，支持多职业如(0,1,2)，如果只配一个职业，则必须加一个逗号，如(0,)
+# 职业:0:剑士,1:魔法师,2:弓箭手,3:魔剑士,4:骑士,5:魔导师,6:圣射手
+# 采集给物品概率列表[(概率, 物品类型, 物品id/定制表ItemIndex, 个数, 是否绑定), ...]
+# 物品类型说明：0-表示普通物品，物品id即普通物品id；1-表示定制表物品，物品id表示定制表ItemIndex
+
+(
+
+# 按职业给物品，没有配置的职业则默认取()的物品
+{
+ # ()如果有配置，则未配置职业的取该物品
+ ():[# 饼图概率
+ [
+ (10000,(0,2204,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
new file mode 100644
index 0000000..b881672
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectItemInfo_20302002.txt
@@ -0,0 +1,29 @@
+# 采集物给物品模板
+# {(职业):[对应奖励], (职业):[对应奖励], ...}
+# 没有配置的职业默认取()职业的奖励
+# 有指定的职业可配置()里，支持多职业如(0,1,2)，如果只配一个职业，则必须加一个逗号，如(0,)
+# 职业:0:剑士,1:魔法师,2:弓箭手,3:魔剑士,4:骑士,5:魔导师,6:圣射手
+# 采集给物品概率列表[(概率, 物品类型, 物品id/定制表ItemIndex, 个数, 是否绑定), ...]
+# 物品类型说明：0-表示普通物品，物品id即普通物品id；1-表示定制表物品，物品id表示定制表ItemIndex
+
+(
+
+# 按职业给物品，没有配置的职业则默认取()的物品
+{
+ # ()如果有配置，则未配置职业的取该物品
+ ():[# 饼图概率
+ [
+ (10000,(0,2204,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
index 2a5879e..5c0a045 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCCfg.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCCfg.txt
@@ -13,7 +13,9 @@
{
#打坐采集
10000:[1, 'GeRen_liubo_436832', (0, 0), 30000, '0', '0', 0, {}, 'GeRen_liubo_612029'],
-
+#神兽副本
+20302001:[1, 'GeRen_liubo_436832', (0, 0), 10000, '0', '0', 0, {(0,9999):'20302001'}, 'GeRen_liubo_612029'],
+20302002:[1, 'GeRen_liubo_436832', (0, 0), 10000, '0', '0', 0, {(0,9999):'20302002'}, 'GeRen_liubo_612029'],
21013:[0, 'GeRen_liubo_436832', (0, 0), 20000, '0', 'int( reMoney*0.8+reLV*reLV*0.1)', 0, {}, 'GeRen_liubo_612029'],
21014:[0, 'GeRen_liubo_436832', (0, 0), 20000, 'int(reExp*0.028*10*1800)', '0', 0, {}, 'GeRen_liubo_612029'],
21015:[0, 'GeRen_liubo_436832', (0, 0), 20000, '0', '0', 10000, {}, 'GeRen_liubo_612029'],
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
index 2478994..48b1eed 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCFuncTimeLimit.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCLogic_Collect/CollectNPCFuncTimeLimit.txt
@@ -10,8 +10,8 @@
(
{
-200:'20', # 夺宝奇兵
-301:'15', # 混乱宝箱
+#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
index dabc726..b57063c 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,18 +9,7 @@
(
{
-
-# 个人boss箱子
-21033:[10, 0],
-21034:[10, 0],
-21035:[10, 0],
-21036:[10, 0],
-21037:[10, 0],
-21038:[10, 0],
-21039:[10, 0],
-21046:[10, 0],
-21047:[10, 0],
-
+20302002:[10, 1],
}
)
\ No newline at end of file
--
Gitblit v1.8.0