From ec63879307dced2b388d4cd6c29ca6b1b09afd51 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期二, 22 一月 2019 11:30:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagZhuXianSuitAttr.txt | 12 ++++++------
db/PyMongoDataServer/PySysDB/tagChests.txt | 1 +
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 1 +
db/PyMongoDataServer/SysDB/tagChinItem.txt | 1 +
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 10 +++++-----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc | 0
6 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc
index ecb554d..836dea7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index d6245ea..1bb69ac 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -233,3 +233,4 @@
2441 0 0 0 0 0
2442 0 0 0 1 1
2443 0 0 0 0 1
+2444 0 0 0 0 1
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 1e9229e..add916d 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -230,3 +230,4 @@
2441 5806_1|5807_1|5808_1
2442 [[833,[7204,1]],[1666,[7209,1]],[2499,[7214,1]],[3332,[7219,1]],[4165,[7224,1]],[4998,[7229,1]],[5831,[7234,1]],[6664,[7239,1]],[7497,[7244,1]],[8330,[7249,1]],[9163,[7254,1]],[10000,[7259,1]]] 1
2443 7205_1|7210_1|7215_1|7220_1|7225_1|7230_1|7235_1|7240_1|7245_1|7250_1|7255_1|7260_1
+2444 4320_1|4315_1|4335_1|4395_1|4385_1|4365_1|4355_1|4350_1|4360_1|4390_1|4380_1|4375_1 4320_1|4315_1|4335_1|4395_1|4385_1|4365_1|4355_1|4350_1|4360_1|4390_1|4380_1|4375_1
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 03ef3e5..4ba7acb 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -169,11 +169,11 @@
Strengthen2 3|4|5|6|7 0 0 0 0
StrengthenLevelLimit 1_1|2_1|3_1|4_1|5_1|6_1|7_1|8_2|9_3|10_3 1_1|2_1|8_1|9_1|10_1|3_2|4_2|5_2|6_2|7_2
StrengthenLevelBroadCast 20|35|50|70|90|110|130|150|170|190
-SkillPlusAttrID {}
-EquipZhuXian {"125":5, "126":10, "127":15, "128":20, "129":25, "130":30, "131":35, "132":40} {"1":[121,122,123,124], "2":[125,126,127,128], "3":[129,130,131,132]}
-LegendAttrRandRule {1:[15,25,44,52,54,55,11,51,19], 2:[22,45,44,53,54,55,20,50,49]} {(128,129,130):[2], (131,132,133):[1], (134,135,136,137):[1,2]} {(1,0):[1,2], (2,0):[3,4], (3,0):[5,6]} {15:[500,800,1000],25:[500,800,1000],44:[500,800,1000],52:[20,30,50],54:[250,400,500],55:[250,400,500],11:[600,1050,1500],51:[300,525,750],19:[360,630,900],22:[200,320,400],45:[500,800,1000],53:[3,4,5],20:[240,420,600],50:[240,420,600],49:[300,525,750]} {(2,0):1, (3,0):2}
-LegendAttrCount {(3,0):[1,0,0],(3,1):[0,1,0],(4,0):[2,0,0],(4,1):[1,1,0],(4,2):[0,2,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,1]} {(1,0):[3,0,0],(2,0):[3,0,0],(2,1):[2,1,0],(2,2):[1,2,0],(3,0):[3,0,0],(3,1):[2,1,0],(3,2):[1,2,0],(3,3):[0,3,0],(4,0):[3,0,0],(4,1):[2,1,0],(4,2):[1,2,0],(4,3):[0,3,0],(5,0):[3,0,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,0]} {(3,0):[3,0,0],(4,0):[4,0,0]} 0 0
-LegendAttrRule {1:[[15,25,44,52,54,55],[11,51,19],0],2:[[15,25,44,52,54,55],[11,51,19],0],3:[[22,45,44,53,54,55],[20,50,49],18],4:[[22,45,44,53,54,55],[20,50,49],30],5:[[22,45,44,53,54,55],[20,50,49],29],6:[[22,45,44,53,54,55],[20,50,49],14],7:[[22,45,44,53,54,55],[20,50,49],71],8:[[15,25,44,52,54,55],[11,12,70],0],9:[[15,25,44,52,54,55],[20,12,70],0],10:[[15,25,44,52,54,55],[20,12,70],0],101:[[9,10,52,53,25,55],[30,26,27],0],102:[[9,10,52,53,25,55],[14,26,27],0],103:[[9,10,52,53,25,55],[14,70,29],0],104:[[9,10,52,53,25,55],[30,70,29],0],105:[[9,10,52,53,25,55],[30,70,26],0],121:[[9,10,52,53,25,55],[30,70,26],0],122:[[9,10,52,53,25,55],[30,70,26],0],123:[[9,10,52,53,25,55],[30,70,26],0],124:[[9,10,52,53,25,55],[30,70,26],0],125:[[9,10,52,53,25,55],[30,70,26],0],126:[[9,10,52,53,25,55],[30,70,26],0],127:[[9,10,52,53,25,55],[30,70,26],0],128:[[9,10,52,53,25,55],[30,70,26],0],129:[[9,10,52,53,25,55],[30,70,26],0],130:[[9,10,52,53,25,55],[30,70,26],0],131:[[9,10,52,53,25,55],[30,70,26],0],132:[[9,10,52,53,25,55],[30,70,26],0]} 0 0 0 0
+SkillPlusAttrID {102:[50000,55000,60000],103:[50100,55100,60100],104:[50400,55400,60400],105:[50200,55200,60200],106:[50300,55300,60300],107:[50800,55800,60800],108:[51000,56000,61000],109:[50000,55000,60000],110:[50100,55100,60100],111:[50400,55400,60400],112:[50200,55200,60200],113:[50300,55300,60300],114:[50800,55800,60800],115:[51000,56000,61000]}
+EquipZhuXian {"122":2, "125":4, "124":6, "127":8, "128":10, "126":13} {"1":[121,122,123,124], "2":[125,126,127,128], "3":[129,130,131,132]}
+LegendAttrRandRule {1:[109,110,111,112,113,114,115],2:[102,103,104,105,106,107,108]} {(128,129,130):[1], (131,132,133):[2], (134,135,136,137):[1,2]} {(1,0):[1,2], (2,0):[1,3], (3,0):[1,4],(4,0):[2,5],(5,0):[2,6],(6,0):[2,7]} {102:[937,468,234],103:[875,437,218],104:[833,416,208],105:[833,416,208],106:[833,416,208],107:[833,416,208],108:[1250,625,312],109:[937,468,234],110:[875,437,218],111:[833,416,208],112:[833,416,208],113:[833,416,208],114:[833,416,208],115:[1250,625,312]} {(2,0):0, (3,0):1}
+LegendAttrCount {(3,0):[1,0,0],(3,1):[0,1,0],(4,0):[2,0,0],(4,1):[1,1,0],(4,2):[0,2,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,1]} {(1,0):[3,0,0],(2,0):[3,0,0],(2,1):[2,1,0],(2,2):[1,2,0],(3,0):[3,0,0],(3,1):[2,1,0],(3,2):[1,2,0],(3,3):[0,3,0],(4,0):[3,0,0],(4,1):[2,1,0],(4,2):[1,2,0],(4,3):[0,3,0],(5,0):[3,0,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,0]} 0 0 0
+LegendAttrRule {1:[[15,25,44,52,54,55],[11,51,19],0],2:[[15,25,44,52,54,55],[11,51,19],0],3:[[22,45,44,53,54,55],[20,50,49],18],4:[[22,45,44,53,54,55],[20,50,49],30],5:[[22,45,44,53,54,55],[20,50,49],29],6:[[22,45,44,53,54,55],[20,50,49],14],7:[[22,45,44,53,54,55],[20,50,49],71],8:[[15,25,44,52,54,55],[11,12,70],0],9:[[15,25,44,52,54,55],[20,12,70],0],10:[[15,25,44,52,54,55],[20,12,70],0],101:[[9,10,52,53,25,55],[30,26,27],0],102:[[9,10,52,53,25,55],[14,26,27],0],103:[[9,10,52,53,25,55],[14,70,29],0],104:[[9,10,52,53,25,55],[30,70,29],0],105:[[9,10,52,53,25,55],[30,70,26],0]} 0 0 0 0
LegendAttrValueByColor {51:{3:300,4:525,5:750,6:750},19:{3:360,4:630,5:900,6:900},11:{3:600,4:1050,5:1500,6:1500},12:{3:200,4:350,5:500,6:500},70:{3:800,4:1400,5:2000,6:2000},20:{3:240,4:420,5:600,6:600},50:{3:240,4:420,5:600,6:600},49:{3:300,4:525,5:750,6:750},15:{3:500,4:800,5:1000,6:1000},25:{3:500,4:800,5:1000,6:1000},52:{3:20,4:25,5:33,6:33},45:{3:500,4:800,5:1000,6:1000},44:{3:500,4:800,5:1000,6:1000},22:{3:200,4:320,5:400,6:400},53:{3:3,4:4,5:5,6:5},54:{3:250,4:400,5:500,6:500},55:{3:250,4:400,5:500,6:500}} 0 0 0 0
LegendAttrValueByColor2 {30:{2:100,3:140,4:180,5:200,6:220},26:{2:250,3:350,4:450,5:500,6:550},27:{2:250,3:350,4:450,5:500,6:550},14:{2:300,3:420,4:540,5:600,6:660},70:{2:300,3:420,4:540,5:600,6:660},29:{2:350,3:490,4:630,5:700,6:770},10:{1:450,2:750,3:1050,4:1125,5:1200},9:{1:450,2:750,3:1050,4:1125,5:1200},25:{1:120,2:200,3:280,4:300,5:320},55:{1:120,2:200,3:280,4:300,5:320},52:{1:6,2:10,3:14,4:15,5:16},53:{1:1,2:2,3:2,4:3,5:4}}
LegendAttrValueByClassLV {29:{8:600,9:900,10:1200,11:1320,12:1425,13:1500,14:1575},30:{8:1200,9:1800,10:2400,11:2640,12:2850,13:3000,14:3150},14:{8:1600,9:2400,10:3200,11:3520,12:3800,13:4000,14:4200},18:{8:1000,9:1500,10:2000,11:2200,12:2375,13:2500,14:2625},71:{8:800,9:1200,10:1600,11:1760,12:1900,13:2000,14:2100}} 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagZhuXianSuitAttr.txt b/db/PyMongoDataServer/PySysDB/tagZhuXianSuitAttr.txt
index 799665f..579cade 100644
--- a/db/PyMongoDataServer/PySysDB/tagZhuXianSuitAttr.txt
+++ b/db/PyMongoDataServer/PySysDB/tagZhuXianSuitAttr.txt
@@ -2,9 +2,9 @@
1 1 96|97|98 1000|1000|1000
1 2 96|97|98 2000|2000|2000
1 3 96|97|98 3000|3000|3000
-2 1 99|100|101 500|500|500
-2 2 99|100|101 1000|1000|1000
-2 3 99|100|101 1500|1500|1500
-3 1 90|91|93|94 5000|5000|5000
-3 2 90|91|93|94 10000|10000|10000
-3 3 90|91|93|94 15000|15000|15000
+2 1 99|100|101 1000|1000|1000
+2 2 99|100|101 2000|2000|2000
+2 3 99|100|101 3000|3000|3000
+3 1 90|91|93|94 500|500|500
+3 2 90|91|93|94 1000|1000|1000
+3 3 90|91|93|94 1500|1500|1500
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index efb7669..cacf909 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -689,6 +689,7 @@
2441 1 0 夏日时装礼盒 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1840 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
2442 1 0 橙色随机宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1840 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
2443 1 0 红色选择宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1840 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
+2444 1 0 红色符印宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 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
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 600 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 840 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 1080 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
--
Gitblit v1.8.0