From 43c8eca7dafe792ea4779a39bfb67cef5e3b6983 Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期二, 28 八月 2018 14:35:29 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0 db/PyMongoDataServer/PySysDB/tagSuccess.txt | 74 ++++++++++++++++++------------------ db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 1 db/PyMongoDataServer/SysDB/tagChinItem.txt | 5 ++ CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 1 db/PyMongoDataServer/PySysDB/tagDienstgrad.txt | 3 + ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc | 0 CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt | 14 +++--- ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc | 0 db/PyMongoDataServer/PySysDB/tagChests.txt | 3 + db/PyMongoDataServer/PySysDB/tagDailyQuest.txt | 1 db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt | 14 +++--- db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 3 + ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc | 0 15 files changed, 66 insertions(+), 53 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt b/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt index f905664..648d5ef 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFamilyRedPack.txt @@ -11,13 +11,13 @@ 10 5 50 2 4 0 11 5 50 2 4 0 12 5 50 2 4 0 -13 5 100 2 6 0 -14 5 100 2 6 0 -15 5 100 2 6 0 -16 5 100 2 6 0 -17 5 100 2 6 0 -18 5 200 2 8 0 -19 5 200 2 8 0 +13 5 50 2 4 0 +14 5 50 2 4 0 +15 5 50 2 4 0 +16 5 50 2 4 0 +17 5 50 2 4 0 +18 5 50 2 4 0 +19 5 50 2 4 0 20 5 500 2 15 0 21 5 500 2 15 0 22 5 1000 2 25 0 diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt index e3fa4db..ccf0c14 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt @@ -88,3 +88,4 @@ 136 250 0 0 137 205 0 0 138 0 11003 0 +139 130 0 0 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip index 1b9474e..64e57b0 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/GameWorldLogic/FBProcess/FBCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc index 508cf0e..5f06689 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc index 204f92e..273ab67 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MergeBoss.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc index 9097eae..0aea2d4 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc index f436d35..d522673 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt index d536bcd..f654e88 100644 --- a/db/PyMongoDataServer/PySysDB/tagChests.txt +++ b/db/PyMongoDataServer/PySysDB/tagChests.txt @@ -130,3 +130,6 @@ 2340 0 0 0 1 1 2341 0 0 0 1 1 2342 0 0 0 1 1 +2343 0 0 0 1 1 +2344 0 0 0 1 1 +2345 0 0 0 1 1 diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt index 067e0b1..a130172 100644 --- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt +++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt @@ -127,3 +127,6 @@ 2340 0 [[3000,[181,20]],[6000,[181,25]],[8000,[181,30]],[9000,[181,35]],[10000,[181,40]]] 1 2341 0 [[1300,[2107,3]],[1500,[4609,1]],[1600,[4610,1]],[1800,[181,10]],[2000,[4151,10]],[2400,[14,1]],[3000,[151,1]],[5000,[181,1]],[7000,[4151,1]],[10000,[150,1]]] 1 [2107,4609,4610,14] 2342 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] 1 +2343 0 181_38 +2344 0 181_100 +2345 0 201_1 diff --git a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt index 7cb8063..7542d04 100644 --- a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt +++ b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt @@ -24,3 +24,4 @@ 24 1 16 23 1 20 0 25 2 31240 22 1 30 0 26 2 31150 92 1 30 0 +27 1 17 139 1 0 0 diff --git a/db/PyMongoDataServer/PySysDB/tagDienstgrad.txt b/db/PyMongoDataServer/PySysDB/tagDienstgrad.txt index eadc882..cda43ba 100644 --- a/db/PyMongoDataServer/PySysDB/tagDienstgrad.txt +++ b/db/PyMongoDataServer/PySysDB/tagDienstgrad.txt @@ -12,8 +12,9 @@ 12 1 0 6|7 1000|40 16 3 0 6|7 690|50 17 3 0 6|7 1580|105 +21 1 0 6|7|18 3000|300|500 23 1 0 6|7 1580|105 24 3 0 6|7 5000|300 25 3 0 6|7 5600|320 -26 1 144000 37 500 +26 3 144000 37 500 28 1 0 6|7|8 3230|200|30 47113 diff --git a/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt b/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt index 252fcb1..8ef6772 100644 --- a/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt +++ b/db/PyMongoDataServer/PySysDB/tagFamilyRedPack.txt @@ -11,13 +11,13 @@ 10 5 50 2 4 11 5 50 2 4 12 5 50 2 4 -13 5 100 2 6 -14 5 100 2 6 -15 5 100 2 6 -16 5 100 2 6 -17 5 100 2 6 -18 5 200 2 8 -19 5 200 2 8 +13 5 50 2 4 +14 5 50 2 4 +15 5 50 2 4 +16 5 50 2 4 +17 5 50 2 4 +18 5 50 2 4 +19 5 50 2 4 20 5 500 2 15 21 5 500 2 15 22 5 1000 2 25 diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt index 51e532c..c4be995 100644 --- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt +++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt @@ -88,3 +88,4 @@ 136 250 0 0 0 137 205 0 0 0 138 0 11003 0 0 +139 130 0 0 0 diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt index d6f631c..2bfb046 100644 --- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt +++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt @@ -1,43 +1,43 @@ ID Type NeedCnt Condition PreSuccess AwardItemList Money Exp AwardAttribute RedPacketID MagicWeaponID MagicWeaponExp 1 3 1 1000 0 0 0 101 0 2 3 1 1000 0 0 0 101 0 -11 1 10 0 0 2_10 0 0 102 10 -12 39 1 1|1 0 2_10 0 0 102 10 -16 39 4 1|1 0 2_10 0 0 102 10 -17 26 10 0 0 2_10 0 0 102 10 -41 39 6 1|1 0 2_10 0 0 103 10 -42 1 25 0 0 2_10 0 0 103 10 -46 36 1 60203001 0 2_10 0 0 103 10 -47 39 3 1|2 0 2_10 0 0 103 10 -48 1 30 0 0 2_10 0 0 103 10 -49 26 20 0 0 2_10 0 0 103 10 -71 36 28 10202001 0 2_10 0 0 104 10 -72 42 1 102 0 2_10 0 0 104 10 -73 39 5 1|2 0 2_10 0 0 104 10 -74 42 1 104 0 2_10 0 0 104 10 -75 44 1 2 0 2_10 0 0 104 10 -101 42 1 106 0 2_10 0 0 105 10 -102 36 40 10301003 0 2_10 0 0 105 10 -103 60 1 1 0 2_10 0 0 105 10 -105 49 1 1 0 2_10 0 0 105 10 -106 58 1 50106001|4 0 2_10 0 0 105 10 -107 58 1 50106001|10 0 2_10 0 0 105 10 -108 49 1 2 0 2_10 0 0 105 10 -201 1 70 0 0 2_10 0 0 106 10 -202 36 1 60203003 0 2_10 0 0 106 10 -221 114 450 0 0 2_10 0 0 106 10 -222 50 1 0 0 2_10 0 0 106 10 -223 46 1 0 0 2_10 0 0 106 10 -224 39 3 3|3 0 2_10 0 0 106 10 -225 5 10 0 0 2_10 0 0 106 10 -241 33 1 305|0 0 2_10 0 0 106 10 -242 7 2 0 0 2_10 0 0 106 10 -243 5 20 0 0 2_10 0 0 106 10 -244 42 1 202 0 2_10 0 0 106 10 -246 50 2 0 0 2_10 0 0 106 10 -247 54 1 1|1|1 0 2_10 0 0 106 10 -248 39 1 3|4 0 2_10 0 0 106 10 -249 36 1 60203006 0 2_10 0 0 106 10 +11 1 10 0 0 2_5 0 0 102 10 +12 39 1 1|1 0 2_5 0 0 102 10 +16 39 4 1|1 0 2_5 0 0 102 10 +17 26 10 0 0 2_5 0 0 102 10 +41 39 6 1|1 0 2_5 0 0 103 10 +42 1 25 0 0 2_5 0 0 103 10 +46 36 1 60203001 0 2_5 0 0 103 10 +47 39 3 1|2 0 2_5 0 0 103 10 +48 1 30 0 0 2_5 0 0 103 10 +49 26 20 0 0 2_5 0 0 103 10 +71 36 28 10202001 0 2_5 0 0 104 10 +72 42 1 102 0 2_5 0 0 104 10 +73 39 5 1|2 0 2_5 0 0 104 10 +74 42 1 104 0 2_5 0 0 104 10 +75 44 1 2 0 2_5 0 0 104 10 +101 42 1 106 0 2_5 0 0 105 10 +102 36 40 10301003 0 2_5 0 0 105 10 +103 60 1 1 0 2_5 0 0 105 10 +105 49 1 1 0 2_5 0 0 105 10 +106 58 1 50106001|4 0 2_5 0 0 105 10 +107 58 1 50106001|10 0 2_5 0 0 105 10 +108 49 1 2 0 2_5 0 0 105 10 +201 1 70 0 0 2_5 0 0 106 10 +202 36 1 60203003 0 2_5 0 0 106 10 +221 114 450 0 0 2_5 0 0 106 10 +222 50 1 0 0 2_5 0 0 106 10 +223 46 1 0 0 2_5 0 0 106 10 +224 39 3 3|3 0 2_5 0 0 106 10 +225 5 10 0 0 2_5 0 0 106 10 +241 33 1 305|0 0 2_5 0 0 106 10 +242 7 2 0 0 2_5 0 0 106 10 +243 5 20 0 0 2_5 0 0 106 10 +244 42 1 202 0 2_5 0 0 106 10 +246 50 2 0 0 2_5 0 0 106 10 +247 54 1 1|1|1 0 2_5 0 0 106 10 +248 39 1 3|4 0 2_5 0 0 106 10 +249 36 1 60203006 0 2_5 0 0 106 10 301 46 2 0 0 2_10 0 0 107 10 302 7 4 0 0 2_10 0 0 107 10 303 4 2 0 0 2_10 0 0 107 10 diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index 6ed2b2e..eac8ea3 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -235,7 +235,7 @@ 1101 1 0 花粉 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 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 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1102 1 0 魂印 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 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 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1103 1 0 令牌 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 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 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1104 1 0 技能钥匙 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 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 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +1104 1 0 技能钥匙 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 10 0 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 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1105 1 0 钥匙 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 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 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1106 1 0 兵刃 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 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 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1107 1 0 花粉 17 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1 0 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 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -444,6 +444,9 @@ 2340 1 0 坐骑养成礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 120 0 5 0 1 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 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2341 1 0 复活礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 120 0 5 0 1 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 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2342 1 0 随机材料袋 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 10 0 5 0 1 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 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +2343 1 0 坐骑丹礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 10 0 5 0 1 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 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +2344 1 0 高级坐骑丹礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 10 0 5 0 1 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 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +2345 1 0 攻击神兵石礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 10 0 5 0 1 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 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3501 1 0 1级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 1 1 3502 6 190 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 3502 1 0 2级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 1 2 3503 6 465 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 3503 1 0 3级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 1 3 3504 6 1160 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 -- Gitblit v1.8.0