From 8c15175d4ad7a04cb079cf211750d0d9459818c3 Mon Sep 17 00:00:00 2001
From: cehua-HWJ35 <hwj35@163.com>
Date: 星期二, 15 一月 2019 16:51:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagCoat.txt | 12 +++---
db/PyMongoDataServer/PySysDB/tagTrialExchange.txt | 4 +-
CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 3 +
db/PyMongoDataServer/PySysDB/tagCoatChestUp.txt | 62 +++++++++++++++++++++++++-----
5 files changed, 61 insertions(+), 20 deletions(-)
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
index c1e3f2c..c784da3 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagCoat.txt b/db/PyMongoDataServer/PySysDB/tagCoat.txt
index 000e06e..1e3b968 100644
--- a/db/PyMongoDataServer/PySysDB/tagCoat.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCoat.txt
@@ -1,10 +1,10 @@
CoatID EquipItemID UnlockItemID MaxLV CostItemCnt StarAttr
-1 6000|6200 5800 3 1|2|3 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3000}}
-2 6001|6201 5801 3 1|2|4 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3001}}
-3 6002|6202 5802 3 1|2|5 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3002}}
-4 6003|6203 5803 3 1|2|6 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3003}}
-5 6004|6204 5804 3 1|2|7 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3004}}
-6 6005|6205 5805 3 1|2|8 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3005}}
+1 6000|6200 5800 3 1|2|3 {"1":{"6":25800,"7":860},"2":{"6":51600,"7":1720},"3":{"6":77400,"7":2580}}
+2 6001|6201 5801 3 1|2|4 {"1":{"6":20700,"7":690},"2":{"6":41400,"7":1380},"3":{"6":62100,"7":2070}}
+3 6002|6202 5802 3 1|2|5 {"1":{"6":31000,"7":1040},"2":{"6":62000,"7":2080},"3":{"6":93000,"7":3120}}
+4 6003|6203 5803 3 1|2|6 {"1":{"6":25300,"7":850},"2":{"6":50600,"7":1700},"3":{"6":75900,"7":2550}}
+5 6004|6204 5804 3 1|2|7 {"1":{"6":20300,"7":680},"2":{"6":40600,"7":1360},"3":{"6":60900,"7":2040}}
+6 6005|6205 5805 3 1|2|8 {"1":{"6":30400,"7":1020},"2":{"6":60800,"7":2040},"3":{"6":91200,"7":3060}}
7 6006|6206 5806 3 1|2|9 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3006}}
8 6007|6207 5807 3 1|2|10 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3007}}
9 6008|6208 5808 3 1|2|11 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3008}}
diff --git a/db/PyMongoDataServer/PySysDB/tagCoatChestUp.txt b/db/PyMongoDataServer/PySysDB/tagCoatChestUp.txt
index 84debaa..a886078 100644
--- a/db/PyMongoDataServer/PySysDB/tagCoatChestUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCoatChestUp.txt
@@ -1,11 +1,51 @@
-LV NeedExp AttrType
-1 108 6_100|7_200
-2 127 6_100|7_201
-3 149 6_100|7_202
-4 192 6_100|7_203
-5 221 6_100|7_204
-6 264 6_100|7_205
-7 293 6_100|7_206
-8 314 6_100|7_207
-9 332 6_100|7_208
-10 400 6_100|7_209
+LV NeedExp Attr
+1 1710 6_4873|7_244
+2 1870 6_9898|7_495
+3 2070 6_15081|7_754
+4 2270 6_20430|7_1022
+5 2500 6_25953|7_1298
+6 2750 6_31657|7_1583
+7 3020 6_37551|7_1878
+8 3330 6_43642|7_2182
+9 3660 6_49938|7_2497
+10 4020 6_56448|7_2822
+11 4350 6_63179|7_3159
+12 4680 6_70141|7_3507
+13 4950 6_77341|7_3867
+14 5210 6_84789|7_4239
+15 5460 6_92493|7_4625
+16 5600 6_100462|7_5023
+17 5760 6_108705|7_5435
+18 5930 6_117230|7_5862
+19 6130 6_126048|7_6302
+20 6330 6_135168|7_6758
+21 6460 6_144599|7_7230
+22 7000 6_154350|7_7718
+23 8310 6_164432|7_8222
+24 9310 6_174853|7_8743
+25 10500 6_185625|7_9281
+26 11740 6_196757|7_9838
+27 12830 6_208259|7_10413
+28 13480 6_220141|7_11007
+29 14190 6_232414|7_11621
+30 14980 6_245088|7_12254
+31 16140 6_258174|7_12909
+32 17310 6_271683|7_13584
+33 19160 6_285625|7_14281
+34 22100 6_300011|7_15001
+35 26360 6_314853|7_15743
+36 32060 6_330161|7_16508
+37 38900 6_345948|7_17297
+38 46070 6_362223|7_18111
+39 52280 6_378999|7_18950
+40 56020 6_396288|7_19814
+41 58630 6_414101|7_20705
+42 63860 6_432450|7_21622
+43 75610 6_451347|7_22567
+44 95220 6_470804|7_23540
+45 126570 6_490833|7_24542
+46 161850 6_511447|7_25572
+47 204190 6_532658|7_26633
+48 248640 6_554479|7_27724
+49 287160 6_576922|7_28846
+50 310270 6_600000|7_30000
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 4d36f58..87e4889 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -270,7 +270,7 @@
DogzAssist 3|6 5409 2|3|5 1_10|2_20|3_30|4_40|5_50|6_50 8352
DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',6,6,6], (161):[20302003,8,'7200',8,8,8], (162):[20302004,8,'7200',8,8,8], (163):[20302005,8,'7200',8,8,8], (164):[20302008,8,'7200',8,8,8], (165):[20302009,8,'7200',8,8,8], (166):[20302006,8,'7200',8,8,8], (167):[20302007,8,'7200',8,8,8]} 20303001 [20302002, 20302003]
DogzFBCollect {20302001:2,20302002:2} {20302001:2,20302002:4}
-RandomRefreshNPC {32020:{1:[[40108001], [101,102,103,104,105,106,107,108,109,110], 1, 5, 30], 2:[[40108002], [111,112,113], 1, 2, 60]}}
+RandomRefreshNPC {32020:{1:[[40108002], [101,102,103,104,105,106,107,108], 1, 2, 60], 2:[[40108001], [109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125], 1, 10, 30]}}
XMZZBetCfg {}
XMZZAward {"3":[[181,5,1]],"6":[[181,5,1]],"9":[[197,1,1]],"12":[[197,1,1]],"15":[[56,1,1]]} [] [[992,1,1]] [[993,1,1]] 500
XMZZRobot [30403002,30403003,30403004] 30403001
@@ -333,3 +333,4 @@
GatherSoulLevelUp int(4529520*(0+0.02*(level/49.0)+0.08*pow(level/49.0,2)+0.2*pow(level/49.0,3)+0.3*pow(level/49.0,4)+0.4*pow(level/49.0,5))-4529520*(0+0.02*((level-1)/49.0)+0.08*pow((level-1)/49.0,2)+0.2*pow((level-1)/49.0,3)+0.3*pow((level-1)/49.0,4)+0.4*pow((level-1)/49.0,5))) {"62":{"1":0.5,"2":0.65,"3":0.8,"4":0.9,"5":1},"63":{"1":0.33,"2":0.47,"3":0.53,"4":0.6,"5":0.67}} 1_1|2_1.8|3_2.7|4_3.6 1_100|2_200|3_300|4_400|5_500 0_1|1_1.2
GatherSoulPackCount 150
ShareUseCntItem [[2387,2428,2430],[2388,2429]]
+ChangeOldItem {102:[101,6, 'GodWeaponStoneMail'],105:[104,6, 'GodWeaponStoneMail'],108:[107,6, 'GodWeaponStoneMail'],111:[110,6, 'GodWeaponStoneMail']}
diff --git a/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt b/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
index f39d361..09f069c 100644
--- a/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
@@ -7,7 +7,7 @@
6 10333|20333 1 0 1134 4
7 10337|20337 1 0 1134 3
8 10335|20335 1 0 1134 3
-9 2335 1 1 1132 12
+9 2335 1 1 1132 16
10 10431|20431 1 0 1135 6
11 10432|20432 1 0 1135 5
12 10434|20434 1 0 1135 5
@@ -15,7 +15,7 @@
14 10433|20433 1 0 1135 4
15 10437|20437 1 0 1135 3
16 10435|20435 1 0 1135 3
-17 2337 1 1 1133 12
+17 2337 1 1 1133 24
18 10531|20531 1 0 1136 6
19 10532|20532 1 0 1136 5
20 10534|20534 1 0 1136 5
--
Gitblit v1.8.0