From b71d2fb312da571e31b821817e9d95958595e4ba Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期一, 14 一月 2019 11:59:10 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_30.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3000.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_4012.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1302.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3001.pyc | 0 db/PyMongoDataServer/PySysDB/tagWeekParty.txt | 40 ++++++++++++++++++++-------------------- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_2004.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3002.pyc | 0 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc index 1452dc5..3d1685c 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/BuffSkill.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1302.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1302.pyc index 89e394c..246f127 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1302.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/BuffProcess_1302.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_2004.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_2004.pyc index f442ec5..5cbaf22 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_2004.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_2004.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3000.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3000.pyc index 71ac54c..303a8ca 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3000.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3000.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3001.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3001.pyc index 67b1527..2737356 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3001.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3001.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3002.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3002.pyc index 680b667..9d88278 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3002.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_3002.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_4012.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_4012.pyc index 3bead29..5753201 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_4012.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameBuffs/Buff_4012.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_30.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_30.pyc index 8082095..da9b369 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_30.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_30.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagWeekParty.txt b/db/PyMongoDataServer/PySysDB/tagWeekParty.txt index 7949c79..e826837 100644 --- a/db/PyMongoDataServer/PySysDB/tagWeekParty.txt +++ b/db/PyMongoDataServer/PySysDB/tagWeekParty.txt @@ -1,26 +1,26 @@ TemplateID ActionType TotalTimes SingleTimes Reward Point -100 1 20 10 [(2426,1,1),(882,1,1)] 10 -200 2 2 1 [(2426,1,1),(882,1,1)] 10 -201 2 3 1 [(2426,1,1),(882,1,1)] 10 -300 3 2 1 [(2426,1,1),(882,1,1)] 10 -301 3 3 1 [(2426,1,1),(882,1,1)] 10 -302 3 5 1 [(2426,1,1),(882,1,1)] 10 -400 4 2 1 [(2426,1,1),(882,1,1)] 10 -401 4 3 1 [(2426,1,1),(882,1,1)] 10 -500 5 5 1 [(2426,1,1),(882,1,1)] 10 -600 6 50 50 [(2426,1,1),(882,1,1)] 10 -700 7 3 1 [(2426,1,1),(882,1,1)] 10 -701 7 4 1 [(2426,1,1),(882,1,1)] 10 +100 1 1 1 [(2426,1,1),(882,1,1)] 10 +200 2 1 1 [(2426,1,1),(882,1,1)] 10 +201 2 1 1 [(2426,1,1),(882,1,1)] 10 +300 3 1 1 [(2426,1,1),(882,1,1)] 10 +301 3 1 1 [(2426,1,1),(882,1,1)] 10 +302 3 1 1 [(2426,1,1),(882,1,1)] 10 +400 4 1 1 [(2426,1,1),(882,1,1)] 10 +401 4 1 1 [(2426,1,1),(882,1,1)] 10 +500 5 1 1 [(2426,1,1),(882,1,1)] 10 +600 6 1 1 [(2426,1,1),(882,1,1)] 10 +700 7 1 1 [(2426,1,1),(882,1,1)] 10 +701 7 1 1 [(2426,1,1),(882,1,1)] 10 800 8 1 1 [(2426,1,1),(882,1,1)] 10 -900 9 5 1 [(2426,1,1),(882,1,1)] 10 -901 9 8 1 [(2426,1,1),(882,1,1)] 10 +900 9 1 1 [(2426,1,1),(882,1,1)] 10 +901 9 1 1 [(2426,1,1),(882,1,1)] 10 1000 10 1 1 [(2426,1,1),(882,1,1)] 10 -1100 11 10 5 [(2427,1,1),(882,1,1)] 20 -1101 11 15 5 [(2427,1,1),(882,1,1)] 20 -1102 11 20 5 [(2427,1,1),(882,1,1)] 20 -1200 12 1000 1000 [(2427,1,1),(882,1,1)] 60 -1300 13 9 9 [(2427,1,1),(882,1,1)] 60 -1301 13 21 21 [(2427,1,1),(882,1,1)] 60 +1100 11 1 1 [(2427,1,1),(882,1,1)] 20 +1101 11 1 1 [(2427,1,1),(882,1,1)] 20 +1102 11 1 1 [(2427,1,1),(882,1,1)] 20 +1200 12 1 1 [(2427,1,1),(882,1,1)] 60 +1300 13 1 1 [(2427,1,1),(882,1,1)] 60 +1301 13 1 1 [(2427,1,1),(882,1,1)] 60 1400 14 1 1 [(2427,1,1),(882,1,1)] 10 1500 15 1 1 [(2427,1,1),(882,1,1)] 10 1600 16 1 1 [(2427,1,1),(882,1,1)] 10 -- Gitblit v1.8.0