From dc65abefefd5cb4acc8f51d25835dfea4eed7df5 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期四, 13 九月 2018 17:53:18 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/SysDB/tagChinSkill.txt | 2 +- db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt | 12 ++++++------ db/PyMongoDataServer/PySysDB/tagSuccess.txt | 34 +++++++++++++++++----------------- CoreServerGroup/GameServer/Script/Player/PlayerSealDemon.pyc | 0 CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt | 12 ++++++------ 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt b/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt index 617adf9..4d69ba7 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt @@ -4,12 +4,12 @@ 3 2 200 2 0 0 4 2 200 2 0 0 5 4 500 2 0 1 -6 5 25 2 5 0 -7 5 25 2 5 0 -8 5 25 2 5 0 -9 5 25 2 5 0 -10 5 25 2 5 0 -11 5 25 2 5 0 +6 5 100 2 4 0 +7 5 100 2 4 0 +8 5 100 2 4 0 +9 5 200 2 5 0 +10 5 200 2 5 0 +11 5 200 2 5 0 12 5 25 2 5 0 13 5 25 2 5 0 14 5 25 2 5 0 diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerSealDemon.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerSealDemon.pyc index 9278554..05d76e3 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerSealDemon.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerSealDemon.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt b/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt index b647179..aac3db7 100644 --- a/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt +++ b/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt @@ -4,12 +4,12 @@ 3 2 200 2 0 4 2 200 2 0 5 4 500 2 0 -6 5 25 2 5 -7 5 25 2 5 -8 5 25 2 5 -9 5 25 2 5 -10 5 25 2 5 -11 5 25 2 5 +6 5 100 2 4 +7 5 100 2 4 +8 5 100 2 4 +9 5 200 2 5 +10 5 200 2 5 +11 5 200 2 5 12 5 25 2 5 13 5 25 2 5 14 5 25 2 5 diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt index 84c2434..b7f8e88 100644 --- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt +++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt @@ -273,23 +273,23 @@ 761 112 1 2122 0 0 0 0 0 762 112 1 2123 0 0 0 0 0 763 112 1 2124 0 0 0 0 0 -771 36 10 10101001 0 0 0 0 6 -772 5 10 0 0 0 0 0 7 -773 48 20 0 0 0 0 0 8 -774 81 20 31080 0 0 0 0 9 -775 10 1 100|20 0 0 0 0 10 -776 58 1 50106001|20 0 0 0 0 11 -777 19 10 0 0 0 0 0 12 -778 78 3 0 0 0 0 0 13 -779 27 7 25 0 0 0 0 14 -780 28 3 0 0 0 0 0 15 -781 54 1 4|1|1 0 0 0 0 16 -782 42 1 208 0 0 0 0 17 -783 1 150 0 0 0 0 0 18 -784 6 1 0 0 0 0 0 19 -785 50 6 0 0 0 0 0 20 -786 12 6 0 0 0 0 0 21 -787 120 60 0 0 0 0 0 22 +771 28 1 0 0 0 0 0 6 +772 54 1 4|1|2 0 0 0 0 7 +773 50 6 0 0 0 0 0 8 +774 10 1 201|20 0 0 0 0 9 +775 12 6 0 0 0 0 0 10 +776 120 80 0 0 0 0 0 11 +777 36 10 10101001 0 0 0 0 12 +778 5 10 0 0 0 0 0 13 +779 48 20 0 0 0 0 0 14 +780 81 20 31080 0 0 0 0 15 +781 58 1 50106001|20 0 0 0 0 16 +782 19 10 0 0 0 0 0 17 +783 78 3 0 0 0 0 0 18 +784 27 7 25 0 0 0 0 19 +785 42 1 208 0 0 0 0 20 +786 1 150 0 0 0 0 0 21 +787 6 1 0 0 0 0 0 22 801 30 1 1 0 0 0 0 0 802 30 1 2 0 0 0 0 0 803 30 1 3 0 0 0 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt index d82fc0a..ed6604c 100644 --- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt +++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt @@ -761,7 +761,7 @@ 49175 潜心 49175 1 1 0 5 0 7 3 0 0 0 0 0 0 0 0 0 0 0 0 4002 2000 3000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 63339 0 0 0 0 0 0 0 4 0 0 0 0 0 0 49180 旺盛 49180 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 510 307 6 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 3598 0 0 0 0 0 0 0 0 0 0 0 0 0 0 49185 强攻 49185 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 511 3 7 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 8995 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -49190 必杀 49190 1 1 0 5 0 7 0 0 0 0 41 0 0 10000 0 0 0 0 0 4007 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 31482 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +49190 必杀 49190 1 1 0 5 0 7 0 0 0 0 41 0 0 10000 0 0 0 0 0 4051 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 31482 0 0 0 0 0 0 0 0 0 0 0 0 0 0 50000 金箍幻灭 50000 1 1 2 1 0 1 0 0 2 8 40 4 0 8000 0 0 0 0 0 1010 25000 0 0 1200 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 692 0 0 0 0 0 0 0 2 0 0 0 0 0 0 50100 皓月腾空 50100 1 1 2 1 0 1 0 0 2 6 41 10 0 16000 0 0 0 0 0 1010 30000 0 0 1200 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 50101 0 0 0 0 0 0 0 0 0 0 2 879 0 0 0 0 0 0 0 2 0 0 0 0 0 0 50101 加速 50101 1 1 0 0 0 5 0 0 0 0 10 0 0 0 0 0 0 0 0 16 1000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 50100 0 0 0 0 -- Gitblit v1.8.0