From b3e5547cb34c043dde0d2d279badfa40a12de7f7 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 14 九月 2018 16:08: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
CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc | 0
db/PyMongoDataServer/PySysDB/tagFbEncourage.txt | 7 +++----
db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt | 20 ++++++++++----------
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 15 +++++++++++++++
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc | 0
db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc | 0
10 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index 9a23ecb..3fcef96 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
index aec0b9c..7d0bd41 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index 9ad8fef..631f69c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
index 970c173..e2f634c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.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 f22414b..e82b7e4 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/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc b/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc
index 24e6c5d..24d16fd 100644
--- a/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc
+++ b/db/PyMongoDataServer/LogicProcess/UserCtrlDB.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFbEncourage.txt b/db/PyMongoDataServer/PySysDB/tagFbEncourage.txt
index 9c255cc..b135afc 100644
--- a/db/PyMongoDataServer/PySysDB/tagFbEncourage.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFbEncourage.txt
@@ -1,5 +1,4 @@
DataMapId InspireType InspireCount MoneyCount
-31080 1 5 1000
-31080 2 10 5
-52010 1 5 1000
-52010 2 10 2
+31080 3 5 1000
+31080 5 10 5
+52010 1 10 5*(encourageLV+1)
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 13a1c0f..39bf089 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -208,7 +208,7 @@
DungeonDeliver 31020|31030|31150
DungeonIntegral 10000
BuyFBCntCost {"31080":"35","31140":"20","52010":"20+min(max(hasBuyCnt-1,0),1)*10+min(max(hasBuyCnt-3,0),1)*10+min(max(hasBuyCnt-5,0),1)*10+min(max(hasBuyCnt-7,0),1)*10+min(max(hasBuyCnt-9,0),1)*20","31190":"30","51010":"50"}
-FBEncourageBuff {31080:20051,52010:20081} {31080:10,52010:10} 31080_10|52010_20
+FBEncourageBuff {31080:20051,52010:20081} 31080_10|52010_10 31080_10|52010_10
DropRecordValue 4213|250|4202|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078
DropRecordEquipment {(1,2,3,4,5,6,7):[3,4,2],(8):[3,3,0]}
DropRecordNormal 2320|4606|4607|4608|4609|4610|3801|2339|2340|5302|5206|5207|5202|5006|5007|4182|4253|224|4252|222|4250|223|4251
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index 079914f..1f7803d 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -121,3 +121,18 @@
sgsbl.ios.68 815035927 68 0 5
sgsbl.ios.128 815035927 128 0 7
sgsbl.ios.168 815035927 168 0 8
+test.18 test 18 101 0
+test.10 test 10 102 0
+test.30 test 30 103 0
+test.98 test 98 104 0
+test.128 test 128 105 0
+test.198 test 198 106 0
+test.328 test 328 107 0
+test.648 test 648 108 0
+test.3000 test 3000 109 0
+test.1 test 1 110 0
+test.libao.6 test 6 0 2
+test.libao.30 test 30 0 4
+test.libao.68 test 68 0 5
+test.libao.128 test 128 0 7
+test.libao.168 test 168 0 8
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt b/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt
index 5b2e443..f88e8e5 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt
@@ -1,11 +1,11 @@
PrivilegeID EffectValue singleValue maxValue attr itemAward successList
-1 0 {"6":10000,"7":200} 1061|1021|1041
-2 0 3 180 {"7":50} 1063|1023|1043
-3 0 1062|1022|1042
-4 10000 1064|1024|1044
-5 0 4 0 {"7":100} 1066|1026|1046
-6 0 1 0 {"6":12000} 1065|1025|1045
-7 0 5 450 {"26":200} 1068|1028|1048
-8 0 {"86":5000} 1067|1027|1047
-9 0 {"87":5000} 1069|1029|1049
-10 0 0 0 [[5303,50,1]] 1070|1030|1050
+1 0 {"6":10000,"7":200} 1061|1021
+2 0 3 180 {"7":50} 1063|1023
+3 0 1062|1022
+4 10000 1064|1024
+5 0 4 0 {"7":100} 1066|1026
+6 0 1 0 {"6":12000} 1065|1025
+7 0 5 450 {"26":200} 1068|1028
+8 0 {"86":5000} 1067|1027
+9 0 {"87":5000} 1069|1029
+10 0 0 0 [[5303,50,1]] 1070|1030
--
Gitblit v1.8.0