From cad59a0f3589f11a464d6b3a5c858def698c8bab Mon Sep 17 00:00:00 2001 From: cehua_LC <tingame100@163.com> Date: 星期一, 17 九月 2018 14:11:08 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagHorseUp.txt | 130 +++++++++++++++++++++++++++++++++++++++++++ db/PyMongoDataServer/PySysDB/tagHorse.txt | 3 + CoreServerGroup/GameServer/Script/Player/PlayerFriend.pyc | 0 db/PyMongoDataServer/SysDB/tagChinItem.txt | 6 ++ 4 files changed, 139 insertions(+), 0 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFriend.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFriend.pyc index 5bc1c1e..76edf00 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerFriend.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerFriend.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagHorse.txt b/db/PyMongoDataServer/PySysDB/tagHorse.txt index f28c72f..a48cb35 100644 --- a/db/PyMongoDataServer/PySysDB/tagHorse.txt +++ b/db/PyMongoDataServer/PySysDB/tagHorse.txt @@ -11,3 +11,6 @@ 305 290 260 1 1 40 1 4 13968 GetMount7 306 288 258 1 1 50 1 5 21168 GetMount8 307 291 261 1 1 30 1 3 2116 GetMount11 +308 292 262 1 1 50 1 5 13968 GetMount12 +309 293 263 1 1 30 1 3 21168 GetMount13 +310 294 264 1 1 50 1 5 2116 GetMount14 diff --git a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt index 5a380e2..cd45f76 100644 --- a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt +++ b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt @@ -459,3 +459,133 @@ 307 28 2505 6|7|23 37076|1853|40 0 307 29 2705 6|7|23 39080|1954|40 0 307 30 0 6|7|23 41115|2055|40 0 +308 1 1945 6|7|23 10584|529|80 0 +308 2 2111 6|7|23 12140|607|80 0 +308 3 2291 6|7|23 13776|688|80 0 +308 4 2486 6|7|23 15495|774|80 49150 +308 5 2694 6|7|23 17297|864|80 0 +308 6 2915 6|7|23 19183|959|80 0 +308 7 3151 6|7|23 21204|1060|80 0 +308 8 3400 6|7|23 23366|1168|80 0 +308 9 3663 6|7|23 25675|1283|80 0 +308 10 3940 6|7|23 28137|1406|80 49155 +308 11 4231 6|7|23 30757|1537|80 0 +308 12 4535 6|7|23 33501|1675|80 0 +308 13 4853 6|7|23 36368|1818|80 0 +308 14 5185 6|7|23 39355|1967|80 0 +308 15 5531 6|7|23 42462|2123|80 0 +308 16 5891 6|7|23 45684|2284|80 0 +308 17 6264 6|7|23 49018|2450|80 0 +308 18 6651 6|7|23 52461|2623|80 0 +308 19 7052 6|7|23 56006|2800|80 0 +308 20 7467 6|7|23 59649|2982|80 49160 +308 21 7896 6|7|23 63383|3169|80 0 +308 22 8338 6|7|23 67232|3361|80 0 +308 23 8794 6|7|23 71193|3559|80 0 +308 24 9264 6|7|23 75260|3763|80 0 +308 25 9748 6|7|23 79429|3971|80 0 +308 26 10245 6|7|23 83694|4184|80 0 +308 27 10756 6|7|23 88048|4402|80 0 +308 28 11281 6|7|23 92486|4624|80 0 +308 29 11820 6|7|23 96998|4849|80 0 +308 30 12373 6|7|23 101579|5078|80 0 +308 31 12939 6|7|23 106219|5310|80 0 +308 32 13519 6|7|23 110974|5548|80 0 +308 33 14113 6|7|23 115841|5792|80 0 +308 34 14721 6|7|23 120816|6040|80 0 +308 35 15342 6|7|23 125895|6294|80 0 +308 36 15978 6|7|23 131073|6553|80 0 +308 37 16627 6|7|23 136346|6817|80 0 +308 38 17290 6|7|23 141709|7085|80 0 +308 39 17966 6|7|23 147155|7357|80 0 +308 40 18657 6|7|23 152680|7634|80 0 +308 41 19361 6|7|23 158277|7913|80 0 +308 42 20079 6|7|23 164086|8204|80 0 +308 43 20811 6|7|23 170109|8505|80 0 +308 44 21557 6|7|23 176353|8817|80 0 +308 45 22316 6|7|23 182820|9141|80 0 +308 46 23089 6|7|23 189515|9475|80 0 +308 47 23876 6|7|23 196442|9822|80 0 +308 48 24677 6|7|23 203605|10180|80 0 +308 49 25511 6|7|23 211008|10550|80 0 +308 50 0 6|7|23 218656|10932|80 0 +309 1 1945 6|7|23 10584|529|80 0 +309 2 2111 6|7|23 12140|607|80 0 +309 3 2291 6|7|23 13776|688|80 0 +309 4 2486 6|7|23 15495|774|80 49150 +309 5 2694 6|7|23 17297|864|80 0 +309 6 2915 6|7|23 19183|959|80 0 +309 7 3151 6|7|23 21204|1060|80 0 +309 8 3400 6|7|23 23366|1168|80 0 +309 9 3663 6|7|23 25675|1283|80 0 +309 10 3940 6|7|23 28137|1406|80 49155 +309 11 4231 6|7|23 30757|1537|80 0 +309 12 4535 6|7|23 33501|1675|80 0 +309 13 4853 6|7|23 36368|1818|80 0 +309 14 5185 6|7|23 39355|1967|80 0 +309 15 5531 6|7|23 42462|2123|80 0 +309 16 5891 6|7|23 45684|2284|80 0 +309 17 6264 6|7|23 49018|2450|80 0 +309 18 6651 6|7|23 52461|2623|80 0 +309 19 7052 6|7|23 56006|2800|80 0 +309 20 7467 6|7|23 59649|2982|80 49160 +309 21 7896 6|7|23 63383|3169|80 0 +309 22 8338 6|7|23 67232|3361|80 0 +309 23 8794 6|7|23 71193|3559|80 0 +309 24 9264 6|7|23 75260|3763|80 0 +309 25 9748 6|7|23 79429|3971|80 0 +309 26 10245 6|7|23 83694|4184|80 0 +309 27 10756 6|7|23 88048|4402|80 0 +309 28 11281 6|7|23 92486|4624|80 0 +309 29 11820 6|7|23 96998|4849|80 0 +309 30 12373 6|7|23 101579|5078|80 0 +310 1 1945 6|7|23 10584|529|80 0 +310 2 2111 6|7|23 12140|607|80 0 +310 3 2291 6|7|23 13776|688|80 0 +310 4 2486 6|7|23 15495|774|80 49150 +310 5 2694 6|7|23 17297|864|80 0 +310 6 2915 6|7|23 19183|959|80 0 +310 7 3151 6|7|23 21204|1060|80 0 +310 8 3400 6|7|23 23366|1168|80 0 +310 9 3663 6|7|23 25675|1283|80 0 +310 10 3940 6|7|23 28137|1406|80 49155 +310 11 4231 6|7|23 30757|1537|80 0 +310 12 4535 6|7|23 33501|1675|80 0 +310 13 4853 6|7|23 36368|1818|80 0 +310 14 5185 6|7|23 39355|1967|80 0 +310 15 5531 6|7|23 42462|2123|80 0 +310 16 5891 6|7|23 45684|2284|80 0 +310 17 6264 6|7|23 49018|2450|80 0 +310 18 6651 6|7|23 52461|2623|80 0 +310 19 7052 6|7|23 56006|2800|80 0 +310 20 7467 6|7|23 59649|2982|80 49160 +310 21 7896 6|7|23 63383|3169|80 0 +310 22 8338 6|7|23 67232|3361|80 0 +310 23 8794 6|7|23 71193|3559|80 0 +310 24 9264 6|7|23 75260|3763|80 0 +310 25 9748 6|7|23 79429|3971|80 0 +310 26 10245 6|7|23 83694|4184|80 0 +310 27 10756 6|7|23 88048|4402|80 0 +310 28 11281 6|7|23 92486|4624|80 0 +310 29 11820 6|7|23 96998|4849|80 0 +310 30 12373 6|7|23 101579|5078|80 0 +310 31 12939 6|7|23 106219|5310|80 0 +310 32 13519 6|7|23 110974|5548|80 0 +310 33 14113 6|7|23 115841|5792|80 0 +310 34 14721 6|7|23 120816|6040|80 0 +310 35 15342 6|7|23 125895|6294|80 0 +310 36 15978 6|7|23 131073|6553|80 0 +310 37 16627 6|7|23 136346|6817|80 0 +310 38 17290 6|7|23 141709|7085|80 0 +310 39 17966 6|7|23 147155|7357|80 0 +310 40 18657 6|7|23 152680|7634|80 0 +310 41 19361 6|7|23 158277|7913|80 0 +310 42 20079 6|7|23 164086|8204|80 0 +310 43 20811 6|7|23 170109|8505|80 0 +310 44 21557 6|7|23 176353|8817|80 0 +310 45 22316 6|7|23 182820|9141|80 0 +310 46 23089 6|7|23 189515|9475|80 0 +310 47 23876 6|7|23 196442|9822|80 0 +310 48 24677 6|7|23 203605|10180|80 0 +310 49 25511 6|7|23 211008|10550|80 0 +310 50 0 6|7|23 218656|10932|80 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index bdadd88..811a4bd 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -111,6 +111,9 @@ 258 1 0 坐骑：八宝葫芦 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 6000 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 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 260 1 0 坐骑：地狱冥虎 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 2000 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 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 261 1 0 坐骑：小黄鸭 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 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 +262 1 0 坐骑：白玉兽 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 6000 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 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 +263 1 0 坐骑：筋斗云 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 2000 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 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 +264 1 0 坐骑：招财猫 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 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 289 1 0 追风 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 288 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 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 280 1 0 觉灵鹿 42 19 0 0 0 1 1 0 1 0 1 0 0 0 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 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 281 1 0 皓月狼 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 588 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 @@ -123,6 +126,9 @@ 288 1 0 八宝葫芦 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 6000 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 290 1 0 地狱冥虎 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 2000 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 291 1 0 小黄鸭 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 2000 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 +292 1 0 白玉兽 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 6000 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 +293 1 0 筋斗云 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 2000 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 +294 1 0 招财猫 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 2000 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 600 1 0 时装1 91 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 220 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 601 1 0 时装2 92 0 0 0 0 999 120 1 1 0 1 0 0 0 0 0 1 220 0 50 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 602 1 0 时装3 93 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 220 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 -- Gitblit v1.8.0