From ab7971804a6934afe657ddc1606f6eb1df478d90 Mon Sep 17 00:00:00 2001 From: cehua_lgq <cehua_lgq@163.com> Date: 星期四, 22 十一月 2018 20:50:43 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt | 4 ++-- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0 CoreServerGroup/GameServer/Script/DataRecordPack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc | 0 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2 +- CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0 7 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/DataRecordPack.pyc b/CoreServerGroup/GameServer/Script/DataRecordPack.pyc index 2e4425e..7ccd72e 100644 --- a/CoreServerGroup/GameServer/Script/DataRecordPack.pyc +++ b/CoreServerGroup/GameServer/Script/DataRecordPack.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc index 2c224f3..c42591c 100644 --- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc +++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc index 941630a..62c0cc4 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc index 5064750..29f1ef6 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc index 597abb7..2f6d0a8 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt index b9b21b2..9b727b5 100644 --- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt +++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt @@ -181,7 +181,7 @@ VIPCard 1_978|2_979|3_980 VIPLV 1_0|2_500|3_1000|4_2000|5_5000|6_10000|7_20000|8_50000|9_100000|10_200000 5 VIPPrice 1_1288|2_788|3_288 1_4320|2_2160|3_720 1_至尊VIP（半年卡）|2_白金VIP（季度卡）|3_黄金VIP（包月卡） 1_增加180天VIP时长，赠送200点VIP经验，实力首选|2_增加90天VIP时长，赠送100点VIP经验|3_增加30天VIP时长 1_VipCard1|2_VipCard2|3_VipCard3 -VIPTitle 1_1|2_1|3_1|4_2|5_3|6_5|7_6|8_7|9_8|10_9 +VIPTitle 1_1|2_1|3_2|4_2|5_3|6_5|7_6|8_7|9_8|10_9 VIPLimit 1095 ["VIPAwardMail",30] 259200 1_200|2_100|3_5 VIPExperience 6_2|10_1|5_1 5400 VIPAddAtkEXP int(npcLV/5.0)+1 303 0 0 0 diff --git a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt index 8099973..5dc470c 100644 --- a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt +++ b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt @@ -5,7 +5,7 @@ 4 2000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 5 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 6 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -7 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 +7 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 8 0 0 0 0 0 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 5000 9 0 0 0 0 0 0 0 1 1 1 1 1 1 1 1 1 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -26,7 +26,7 @@ 25 2 3 4 5 6 7 8 10 12 14 16 18 20 22 24 25 26 0 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 27 0 0 1 2 2 3 3 4 4 4 4 5 5 5 5 5 -28 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +28 0 0 0 1 1 1 1 1 1 1 1 1 1 1 1 1 29 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 30 0 1 1 2 2 3 5 7 10 12 15 15 15 15 15 15 31 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -- Gitblit v1.8.0