From 701d3fdda8c6729b348d1b6e82374e07b4b0681c Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期六, 25 八月 2018 15:18:12 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagTreasureUp.txt | 2 +- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc | 0 db/PyMongoDataServer/PySysDB/tagSuccess.txt | 1 + ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Player.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Player.pyc | 0 db/PyMongoDataServer/SysDB/tagChinSkill.txt | 10 ++++++++++ ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Pet.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_SummonNPC.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Truck.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.pyc | 0 18 files changed, 12 insertions(+), 1 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc index 0cfd58d..cb29af3 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc index ab718e8..d23fbe5 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Pet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Pet.pyc index 646efd2..c3f89b9 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Pet.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Pet.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Player.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Player.pyc index 6776124..6de2c14 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Player.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Player.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_SummonNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_SummonNPC.pyc index 0173e65..6ec1de0 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_SummonNPC.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_SummonNPC.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc index 7de63cb..4bdf3fe 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.pyc index 3532f5d..3301f0b 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Player.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Player.pyc index 130e4f3..87af2d8 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Player.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Player.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.pyc index 7ef5168..1a4ed2a 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Truck.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Truck.pyc index 35d7bf5..2e1ba4c 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Truck.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Truck.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index c82ae04..9810950 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc index 212f4d4..66c22ea 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc index 2c12fab..3e972d4 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc index 12455ac..ec315cb 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc index 9402a9a..52d2891 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt index e8ab439..d6f631c 100644 --- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt +++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt @@ -43,6 +43,7 @@ 303 4 2 0 0 2_10 0 0 107 10 304 39 2 3|4 0 2_10 0 0 107 10 305 42 1 204 0 2_10 0 0 107 10 +306 50 3 0 0 2_10 0 0 107 10 321 33 1 306|0 0 2_10 0 0 107 10 322 26 120 0 0 2_10 0 0 107 10 323 7 6 0 0 2_10 0 0 107 10 diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt index c3d406a..7c774dd 100644 --- a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt +++ b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt @@ -19,7 +19,7 @@ 106 3 80 50300|55300|60300 107 0 0 107 1 50 301 -107 2 100 6_15000 +107 2 110 6_15000 107 3 130 107 4 110 50500|55500|60500 108 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt index 861b594..3ba3306 100644 --- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt +++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt @@ -505,6 +505,16 @@ 20058 八阶鼓舞 20051 8 10 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 76 8000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500000 0 0 0 0 0 0 0 5 0 1 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 20059 九阶鼓舞 20051 9 10 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 76 9000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500000 0 0 0 0 0 0 0 5 0 1 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 20060 十阶鼓舞 20051 10 10 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 76 10000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500000 0 0 0 0 0 0 0 5 0 1 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +20081 一阶鼓舞 20081 1 10 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 94 1000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500000 0 0 0 0 0 0 0 5 0 1 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +20082 二阶鼓舞 20081 2 10 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 94 2000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500000 0 0 0 0 0 0 0 5 0 1 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +20083 三阶鼓舞 20081 3 10 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 94 3000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500000 0 0 0 0 0 0 0 5 0 1 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +20084 四阶鼓舞 20081 4 10 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 94 4000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500000 0 0 0 0 0 0 0 5 0 1 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +20085 五阶鼓舞 20081 5 10 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 94 5000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500000 0 0 0 0 0 0 0 5 0 1 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +20086 六阶鼓舞 20081 6 10 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 94 6000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500000 0 0 0 0 0 0 0 5 0 1 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +20087 七阶鼓舞 20081 7 10 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 94 7000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500000 0 0 0 0 0 0 0 5 0 1 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +20088 八阶鼓舞 20081 8 10 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 94 8000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500000 0 0 0 0 0 0 0 5 0 1 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +20089 九阶鼓舞 20081 9 10 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 94 9000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500000 0 0 0 0 0 0 0 5 0 1 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +20090 十阶鼓舞 20081 10 10 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 94 10000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1500000 0 0 0 0 0 0 0 5 0 1 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 21001 1.5倍经验药水 21001 1 3 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 43 5000 1 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3600000 0 0 0 0 0 0 0 5 0 3 11 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 21002 2倍经验药水 21001 2 3 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 43 10000 1 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3600000 0 0 0 0 0 0 0 5 0 3 11 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 21003 3倍经验药水 21001 3 3 0 0 0 9 0 0 0 0 0 0 0 0 0 0 0 0 0 43 20000 1 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3600000 0 0 0 0 0 0 0 5 0 3 11 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- Gitblit v1.8.0