From 7f9b16b8e37a4a489b738729beaa5c46925b42ff Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期二, 18 九月 2018 11:51:11 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0 db/PyMongoDataServer/PySysDB/tagTreasureUp.txt | 142 +++++++++++++++++----------------- CoreServerGroup/GameServer/Script/GM/Commands/GMT_MediaCard.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTMediaCard.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc | 0 db/PyMongoDataServer/SysDB/tagChinItem.txt | 1 db/PyMongoDataServer/PySysDB/tagTreasure.txt | 70 ++++++++-------- ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0 8 files changed, 107 insertions(+), 106 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/GMT_MediaCard.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/GMT_MediaCard.pyc index 0e3f032..1962f67 100644 --- a/CoreServerGroup/GameServer/Script/GM/Commands/GMT_MediaCard.pyc +++ b/CoreServerGroup/GameServer/Script/GM/Commands/GMT_MediaCard.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip index e2c23a4..e3c6d9f 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc index 552e295..5d65ef7 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc index 3468366..84ed322 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTMediaCard.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTMediaCard.pyc index f483dba..8bdf50a 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTMediaCard.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTMediaCard.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagTreasure.txt b/db/PyMongoDataServer/PySysDB/tagTreasure.txt index 7e04f6f..70fe961 100644 --- a/db/PyMongoDataServer/PySysDB/tagTreasure.txt +++ b/db/PyMongoDataServer/PySysDB/tagTreasure.txt @@ -1,35 +1,35 @@ -ID Category PreTreasure Achievements Potentials NeedItem -101 1 0 1 50005|50035|50065|55005|55035|55065|60005|60035|60065 -102 1 101 801|816 50105|50135|50165|55105|55135|55165|60105|60135|60165 -103 1 102 802|817 50405|50435|50465|55405|55435|55465|60405|60435|60465 -104 1 103 803|818 1005|1035|1065|2005|2035|2065|3005|3035|3065 -105 1 104 804|819 50205|50235|50265|55205|55235|55265|60205|60235|60265 -106 1 105 805|820 50305|50335|50365|55305|55335|55365|60305|60335|60365 -107 1 106 806|821 50505|50535|50565|55505|55535|55565|60505|60535|60565 -108 1 107 807|822 50605|50635|50665|55605|55635|55665|60605|60635|60665 -109 1 108 808|823 50705|50735|50765|55705|55735|55765|60705|60735|60765 -110 1 109 809|824 50805|50835|50865|55805|55835|55865|60805|60835|60865 -111 1 110 810|825 50805|50835|50865|55805|55835|55865|60805|60835|60865 -112 1 111 811|826 50805|50835|50865|55805|55835|55865|60805|60835|60865 -201 2 0 701|831 -202 2 201 702|832 -203 2 202 703|833 -204 2 203 704|834 -205 2 204 705|835 -206 2 205 706|836 -207 2 206 707|837 -208 2 207 708|838 -209 2 208 709|839 -210 2 209 710|840 -211 2 210 711|841 -212 2 211 712|842 -213 2 212 713|843 -214 2 213 714|844 -301 3 0 -302 3 0 761 -303 3 0 762 -304 3 0 763 -305 3 0 0 -306 3 0 0 -307 3 0 0 -308 3 0 0 +ID Category PreTreasure Achievements Potentials SkillPower NeedItem +101 1 0 1 50005|50035|50065|55005|55035|55065|60005|60035|60065 0|100|200 +102 1 101 801|816 50105|50135|50165|55105|55135|55165|60105|60135|60165 0|100|200 +103 1 102 802|817 50405|50435|50465|55405|55435|55465|60405|60435|60465 0|100|200 +104 1 103 803|818 1005|1035|1065|2005|2035|2065|3005|3035|3065 0|100|200 +105 1 104 804|819 50205|50235|50265|55205|55235|55265|60205|60235|60265 0|100|200 +106 1 105 805|820 50305|50335|50365|55305|55335|55365|60305|60335|60365 0|100|200 +107 1 106 806|821 50505|50535|50565|55505|55535|55565|60505|60535|60565 0|100|200 +108 1 107 807|822 50605|50635|50665|55605|55635|55665|60605|60635|60665 0|100|200 +109 1 108 808|823 50705|50735|50765|55705|55735|55765|60705|60735|60765 0|100|200 +110 1 109 809|824 50805|50835|50865|55805|55835|55865|60805|60835|60865 0|100|200 +111 1 110 810|825 50805|50835|50865|55805|55835|55865|60805|60835|60865 0|100|200 +112 1 111 811|826 50805|50835|50865|55805|55835|55865|60805|60835|60865 0|100|200 +201 2 0 701|831 +202 2 201 702|832 +203 2 202 703|833 +204 2 203 704|834 +205 2 204 705|835 +206 2 205 706|836 +207 2 206 707|837 +208 2 207 708|838 +209 2 208 709|839 +210 2 209 710|840 +211 2 210 711|841 +212 2 211 712|842 +213 2 212 713|843 +214 2 213 714|844 +301 3 0 +302 3 0 761 +303 3 0 762 +304 3 0 763 +305 3 0 0 +306 3 0 0 +307 3 0 0 +308 3 0 0 diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt index ccd5ac0..6dd3c4d 100644 --- a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt +++ b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt @@ -1,71 +1,71 @@ -MWID LV NeedExp AddAttr UnLockSkill ActiveMWID ItemAward -101 0 0 50000|55000|60000 -102 0 0 -102 1 20 -102 2 20 50100|55100|60100 -103 0 0 -103 1 20 -103 2 40 50400|55400|60400 -104 0 0 -104 1 20 -104 2 30 150|250|350 -105 0 0 -105 1 20 -105 2 30 50200|55200|60200 -105 3 20 6_10000 -106 0 0 -106 1 20 -106 2 60 7_300 -106 3 80 50300|55300|60300 -107 0 0 -107 1 50 301 -107 2 110 6_15000 -107 3 140 -107 4 110 50500|55500|60500 -108 0 0 -108 1 70 -108 2 160 7_500 -108 3 120 -108 4 150 50600|55600|60600 -109 0 0 -109 1 70 -109 2 130 6_20000 -109 3 130 -109 4 120 50700|55700|60700 -110 0 0 -110 1 80 -110 2 170 7_800 -110 3 220 -110 4 220 50800|55800|60800 -201 0 0 50900|55900|60900 -202 0 0 50901|55901|60901 -203 0 0 50902|55902|60902 -204 0 0 50903|55903|60903 -205 0 0 50904|55904|60904 -206 0 0 50905|55905|60905 -207 0 0 50906|55906|60906 -208 0 0 50907|55907|60907 -209 0 0 50908|55908|60908 -210 0 0 50909|55909|60909 -211 0 0 50910|55910|60910 -212 0 0 50911|55911|60911 -213 0 0 50912|55912|60912 -214 0 0 50913|55913|60913 -301 0 0 -301 1 5 -302 0 0 47100|47100|47100 -304 0 0 -305 0 0 46_3000 -306 0 0 19_2000 -307 0 0 60_3000 -308 0 0 18_2000 -111 0 0 -111 1 80 -111 2 170 7_1000 -111 3 220 -111 4 220 20049|20049|20049 -112 0 0 -112 1 80 -112 2 170 7_1000 -112 3 220 -112 4 220 20049|20049|20049 +MWID LV NeedExp AddAttr UnLockSkill ActiveMWID ItemAward SoulID +101 0 0 50000|55000|60000 +102 0 0 +102 1 20 +102 2 20 50100|55100|60100 +103 0 0 +103 1 20 +103 2 40 50400|55400|60400 +104 0 0 +104 1 20 +104 2 30 150|250|350 +105 0 0 +105 1 20 +105 2 30 50200|55200|60200 +105 3 20 6 +106 0 0 +106 1 20 +106 2 60 7_300 +106 3 80 50300|55300|60300 +107 0 0 +107 1 50 301 +107 2 110 6_15000 +107 3 140 +107 4 110 50500|55500|60500 +108 0 0 +108 1 70 +108 2 160 7_500 +108 3 120 +108 4 150 50600|55600|60600 +109 0 0 +109 1 70 +109 2 130 6_20000 +109 3 130 +109 4 120 50700|55700|60700 +110 0 0 +110 1 80 +110 2 170 7_800 +110 3 220 +110 4 220 50800|55800|60800 +201 0 0 50900|55900|60900 +202 0 0 50901|55901|60901 +203 0 0 50902|55902|60902 +204 0 0 50903|55903|60903 +205 0 0 50904|55904|60904 +206 0 0 50905|55905|60905 +207 0 0 50906|55906|60906 +208 0 0 50907|55907|60907 +209 0 0 50908|55908|60908 +210 0 0 50909|55909|60909 +211 0 0 50910|55910|60910 +212 0 0 50911|55911|60911 +213 0 0 50912|55912|60912 +214 0 0 50913|55913|60913 +301 0 0 +301 1 5 +302 0 0 47100|47100|47100 +304 0 0 +305 0 0 46_3000 +306 0 0 19_2000 +307 0 0 60_3000 +308 0 0 18_2000 +111 0 0 +111 1 80 +111 2 170 7_1000 +111 3 220 +111 4 220 20049|20049|20049 +112 0 0 +112 1 80 +112 2 170 7_1000 +112 3 220 +112 4 220 20049|20049|20049 diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index e78afca..ff0a5f9 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -8,6 +8,7 @@ 7 1 0 1000万铜钱 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 200 0 20 0 1 0 0 201 10000000 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 8 1 0 800万铜钱 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 160 0 20 0 1 0 0 201 8000000 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 9 1 0 1500万铜钱 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 300 0 20 0 1 0 0 201 15000000 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 +10 1 0 30万铜钱 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 6 0 20 0 1 0 0 201 300000 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 11 1 0 10绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 20 0 1 0 0 202 10 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 12 1 0 30绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 20 0 1 0 0 202 30 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 13 1 0 50绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 50 0 20 0 1 0 0 202 50 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 -- Gitblit v1.8.0