From 72688aec7b4c3bb7f5759acc53924d5a6da63f3d Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期五, 26 十月 2018 14:36:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc | 0
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 6 +++---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc | 0
db/PyMongoDataServer/SysDB/tagChinItem.txt | 4 ++--
db/PyMongoDataServer/PySysDB/tagOrderInfo.txt | 14 ++++++++++++++
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 ++
CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt | 8 ++++----
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
db/PyMongoDataServer/SysDB/tagChinMap.txt | 2 +-
10 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt b/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt
index 1931820..e6711fc 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagUniquenessArrive.txt
@@ -1,10 +1,10 @@
WorldLvNum Rank Award
0 1 {"1":[[2278,1,0]],"2":[[2278,1,0]]}
-0 2 {"1":[[10771,1,0]],"2":[[20771,1,0]]}
-0 3 {"1":[[10772,1,0]],"2":[[20772,1,0]]}
+0 2 {"1":[[10671,1,0]],"2":[[20671,1,0]]}
+0 3 {"1":[[10672,1,0]],"2":[[20672,1,0]]}
1 1 {"1":[[2278,1,0]],"2":[[2278,1,0]]}
-1 2 {"1":[[10871,1,0]],"2":[[20871,1,0]]}
-1 3 {"1":[[10872,1,0]],"2":[[20872,1,0]]}
+1 2 {"1":[[10771,1,0]],"2":[[20771,1,0]]}
+1 3 {"1":[[10772,1,0]],"2":[[20772,1,0]]}
2 1 {"1":[[2278,1,0]],"2":[[2278,1,0]]}
2 2 {"1":[[10871,1,0]],"2":[[20871,1,0]]}
2 3 {"1":[[10872,1,0]],"2":[[20872,1,0]]}
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
index 7d0bd41..033a1b1 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/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index ef8bf66..eb7e773 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/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc
index ce5d80a..6eb261d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.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 56c6568..69dd0ba 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/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index 424e4da..bb8d11b 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -59,9 +59,9 @@
60010 0 60010 105 500 0 0 0 0 0 0 0 [83,13] [10,1800,30,10] [[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]] {1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
60010 1 60010 165 500 0 0 0 0 0 0 0 [208,24] [10,1800,30,10] [[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]] {1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
60010 2 60010 200 500 0 0 0 0 0 0 0 [317,21] [10,1800,30,10] [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]] {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
-31160 0 31160 110 250 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311601,311603] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
-31160 1 31160 251 300 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311604,311605] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
-31160 2 31160 301 500 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311606,311607] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
+31160 0 31160 110 250 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311601,311603] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
+31160 1 31160 251 300 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311604,311605] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
+31160 2 31160 301 500 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311606,311607] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
31250 0 31250 0 0 0 0 0 0 0 0 0 [30,18] [0,300,10] [312501,312502,312503] [0,4235]
52010 0 52020 20 0 0 0 0 0 0 0 0 [17,19,8] 10 [520101,520102,520103,520104]
52010 1 52020 40 0 0 0 0 0 0 0 0 [17,19,8] 10 [520105,520106,520107,520108]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 9904879..bd56fec 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -138,6 +138,7 @@
FamilyStoreItemRule2 8|9|10 4|0|3 0 0 0
PetFoodExchange 1130 1 50 999 0
PartyReward [(26,12800,1)] [200,0] ["PartyKing",1,[(28,25,1)]] 1
+FamilyPartySitAward int(reExp*300)
FamilyPartyAreaAward {"Exp":"int(reExp*300)"} 5 60
FamilyPartyDesk 3200 10 [(3901,150,1)]
FamilyActive 40|80|120|160|220 10|10|15|25|30
@@ -231,6 +232,7 @@
ChaosDemonCfg [[(31801001,10)],[(31801004,10)],[(31803001,1)]] [101,102,103,104,105]
ChaosDemonReward {103:1,102:3,101:5} 5_100|4_90|3_80|2_70|1_60 0*reExp {5:[(181,10,1),(1141,1,1)],4:[(181,8,1),(1140,1,1)],3:[(181,6,1),(1139,1,1)],2:[(181,4,1),(1138,1,1)],1:[(181,2,1),(1137,1,1)]}
ElderBattlefieldCfg {31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200} 300 20 [200,600,1200,2000,3200,4800]
+ElderBattlefieldPoint 500 500
ElderBattlefieldSys ['AncientBattlefield_2','AncientBattlefield_3','AncientBattlefield_4','AncientBattlefield_5','AncientBattlefield_6'] 20 10
ElderBattlefieldExp {1:'1700*reExp',2:'1800*reExp',3:'1900*reExp',4:'2000*reExp',5:'2200*reExp',6:'2400*reExp'}
ElderBattlefieldTopAward [[2214,1,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index 584cea1..f33cc94 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -242,3 +242,17 @@
com.price68.snxzlb spyxxzios 68 0 5
com.price128.snxzlb spyxxzios 128 0 7
com.price168.snxzlb spyxxzios 168 0 8
+com.snyjjpg.01 jisusnyjjios 18 101 0
+com.snyjjpg.02 jisusnyjjios 6 2 0
+com.snyjjpg.03 jisusnyjjios 30 103 0
+com.snyjjpg.04 jisusnyjjios 98 104 0
+com.snyjjpg.05 jisusnyjjios 128 105 0
+com.snyjjpg.06 jisusnyjjios 198 106 0
+com.snyjjpg.07 jisusnyjjios 328 107 0
+com.snyjjpg.08 jisusnyjjios 648 108 0
+com.snyjjpg.test1 jisusnyjjios 1 110 0
+com.snyjjpg.09 jisusnyjjios 6 0 2
+com.snyjjpg.10 jisusnyjjios 30 0 4
+com.snyjjpg.11 jisusnyjjios 68 0 5
+com.snyjjpg.12 jisusnyjjios 128 0 7
+com.snyjjpg.13 jisusnyjjios 168 0 8
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index a6a55a8..13749b5 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -237,7 +237,7 @@
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
1103 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
-1104 1 0 技能钥匙 17 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 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
+1104 1 0 技能钥匙 15 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 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
1105 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
1106 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
1107 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
@@ -515,7 +515,7 @@
2394 1 0 庆典礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 280 0 5 0 1 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2395 1 0 烟花 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 60 0 5 0 1 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2396 1 0 庆典礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 280 0 5 0 1 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-2397 1 0 神兽橙装宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+2397 1 0 神兽橙装宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 150 0 5 0 1 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
3501 1 0 1级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 1 1 3502 6 190 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
3502 1 0 2级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 1 2 3503 6 465 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
3503 1 0 3级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 1 3 3504 6 1160 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
diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt
index 3f49372..9b34d5d 100644
--- a/db/PyMongoDataServer/SysDB/tagChinMap.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt
@@ -32,7 +32,7 @@
41110 法宝副本 1 0 900000 1 1 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 0 1
60010 宗门试炼 1 0 900000 2 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
31180 混乱妖域 1 0 900000 2 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
-31160 上古战场 1 0 1800000 8 0 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 1 2
+31160 上古战场 1 0 1200000 8 0 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 1 2
31250 守护副本 1 0 600000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
52010 封魔坛 1 0 900000 8 0 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
52020 封魔坛 1 0 900000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
--
Gitblit v1.8.0