From 4f40415b78891c240fc579708a50b1f10e0599b7 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期四, 30 八月 2018 11:08:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/Script/PyGameData.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc | 0
db/PyMongoDataServer/SysDB/tagChinItem.txt | 1 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc | 0
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4 ++--
db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt | 4 ++--
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc | 0
12 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 1d61cd7..c6d87c7 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -810,7 +810,7 @@
30601014 魂灵 260
30601015 魔剑 265
30603006 玄界冰魔 320
-50103001 灵狐仙 125
+50103001 道士鼠 125
50103002 觉灵鹿 145
50103003 球球 160
50103004 地狱冥虎 180
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
index 206f140..156368d 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/PyGameData.pyc b/CoreServerGroup/GameServer/Script/PyGameData.pyc
index cf5bfb4..bd159df 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 48fb7a4..e861707 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/FBProcess/GameLogic_FamilyParty.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
index 72d3340..907d230 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
index 84a1470..f041804 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc
index 11208a5..ab6c6ae 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.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 62cd181..0a15d58 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/tagCostRebateTemplate.txt b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
index e59cc46..f084751 100644
--- a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
@@ -1,6 +1,6 @@
TemplateID NeedCostGold AwardIndex AwardItemList NotifyKey
-1 128 0 [(912,1,1)] ConsumptionRebate3
-1 588 1 [(4184,1,1),(14,2,1),(3807,1,1)] ConsumptionRebate3
+1 128 0 [(141,130,1)] ConsumptionRebate3
+1 588 1 [(4215,1,1),(14,2,1),(3807,1,1)] ConsumptionRebate3
1 1588 2 [(51,1,1),(143,50,1),(4151,30,1)] ConsumptionRebate3
1 5000 3 [(3515,1,1),(3505,1,1),(106,8,1),(103,8,1)] ConsumptionRebate2
2 500 0 [(4651,10,1),(4652,10,1)]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index d422af9..fc0895e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -263,9 +263,9 @@
OfflinePostItem 181|4151|4002|4003|4008|4009|4005|4006|951|956|4501|4502
TreasureSet {0:10,1:10} {2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]}
TreasureSet11 [1, 10] [248, 1984] [[982,1], [982, 8]] [0, 0] [10, 100]
-TreasureSet21 max(baseRate,int(min(curLuck,30)*10+min(max(curLuck-30,0),10)*20+min(max(curLuck-40,0),20)*50)) [1, 10] 1000
+TreasureSet21 max(baseRate,int(min(curLuck,30)*1+min(max(curLuck-30,0),10)*2+min(max(curLuck-40,0),20)*5)) [1, 10] 1000
TreasureSet12 [1, 10] [98, 784] [[983,1], [983, 8]] [1440, 0] [5, 50]
-TreasureSet22 min(500,int(baseRate+curLuck/300.0*(100-baseRate)*max(1,curLuck/100.0))) [1, 10] 1000
+TreasureSet22 min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0))) [1, 10] 1000
OpenServerRedPacketType 5
OSRAllMoneySys [100,300,500,800,1000,1200,1500,1800]
OpenServerRedPacketCfg 3 10 3600 50
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 4759951..73f0035 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -212,6 +212,7 @@
1020 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 1500 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
1021 1 0 试炼找回经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 8 0 50 0 1 0 0 215 3000 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1022 1 0 魔坛秘影经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 50 0 1 0 0 213 2994480 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
+1023 1 0 骑宠争夺经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 18 0 50 0 1 0 0 215 3000 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
1100 1 0 兵刃 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1101 1 0 花粉 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1102 1 0 魂印 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 50 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 959262c..d11ea46 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -810,7 +810,7 @@
30601014 2 0 魂灵 260 0 4811 4811 0 8 0 0 0 1400 0 0 0 0 0 0 0 0 2000 370110 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 8032498 0 0 0 0 1 0 0 1 1 1
30601015 2 0 魔剑 265 0 4970 4970 0 8 0 0 0 1400 0 0 0 0 0 0 0 0 2000 376753 35 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 8607219 0 0 0 0 1 0 0 1 1 1
30603006 2 0 玄界冰魔 320 0 10459 10459 7847 8 0 0 10000 3290 0 0 0 0 0 0 0 0 2000 455520 41 0 300 2 6 0 0 0 0 0 0 0 0 0 15 2 90414255 1 0 0 0 5 0 0 186 1 1
-50103001 2 0 灵狐仙 125 0 1184 1184 0 8 0 0 10000 1430 0 7 0 0 0 0 0 3 3000 453622 18 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 1742024 0 0 0 0 5 0 0 186 1 1
+50103001 2 0 道士鼠 125 0 1184 1184 0 8 0 0 10000 1430 0 7 0 0 0 0 0 3 3000 453622 18 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 1742024 0 0 0 0 5 0 0 186 1 1
50103002 2 0 觉灵鹿 145 0 2863 2863 0 8 0 0 10000 4148 0 7 0 0 0 0 0 3 3000 556113 20 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 5087089 0 0 0 0 5 0 0 186 1 1
50103003 2 0 球球 160 0 3046 3046 0 8 0 0 10000 4235 0 7 0 0 0 0 0 3 3000 634880 22 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 7079698 0 0 0 0 5 0 0 186 1 1
50103004 2 0 地狱冥虎 180 0 3599 3599 0 8 0 0 10000 4474 0 7 0 0 0 0 0 3 3000 738321 25 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 9937882 0 0 0 0 5 0 0 186 1 1
--
Gitblit v1.8.0