From 3bdeac780dd392ae0837dd4667ea08931ff6d9fe Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期五, 23 十一月 2018 10:15:51 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc | 0 db/PyMongoDataServer/PySysDB/tagTreasureUp.txt | 2 +- db/PyMongoDataServer/PySysDB/tagSuccess.txt | 28 ++++++++++++++-------------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc index 110a05e..7d88ddb 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt index af68c49..b72fb88 100644 --- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt +++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt @@ -131,7 +131,7 @@ 471 39 1 5|3 0 3_100000 0 0 108 10 472 33 1 307|0 0 3_100000 0 0 108 10 474 42 1 404 0 3_100000 0 0 108 10 -475 46 10 0 0 3_100000 0 0 108 10 +475 46 10 0 0 3_100000 0 0 476 128 6 0 0 3_100000 0 0 108 10 477 91 5 50305|55305|60305 0 3_100000 0 0 108 10 478 91 5 50505|55505|60505 0 3_100000 0 0 108 10 @@ -311,20 +311,20 @@ 824 3 1 107020 0 0 0 0 0 825 3 1 108020 0 0 0 0 0 826 3 1 109020 0 0 0 0 0 -831 30 1 10|2 0 0 0 0 0 -832 30 1 11|5 0 0 0 0 0 +831 30 1 10|0 0 0 0 0 0 +832 30 1 11|3 0 0 0 0 0 833 30 1 12|5 0 0 0 0 0 -834 30 1 13|6 0 0 0 0 0 -835 30 1 14|6 0 0 0 0 0 -836 30 1 15|7 0 0 0 0 0 -837 30 1 16|4 0 0 0 0 0 -838 30 1 17|0 0 0 0 0 0 -839 30 1 18|0 0 0 0 0 0 -840 30 1 19|0 0 0 0 0 0 -841 30 1 20|0 0 0 0 0 0 -842 30 1 21|0 0 0 0 0 0 -843 30 1 22|0 0 0 0 0 0 -844 30 1 23|0 0 0 0 0 0 +834 30 1 13|7 0 0 0 0 0 +835 30 1 14|9 0 0 0 0 0 +836 30 1 15|9 0 0 0 0 0 +837 30 1 16|9 0 0 0 0 0 +838 30 1 17|9 0 0 0 0 0 +839 30 1 18|9 0 0 0 0 0 +840 30 1 19|9 0 0 0 0 0 +841 30 1 20|9 0 0 0 0 0 +842 30 1 21|9 0 0 0 0 0 +843 30 1 22|9 0 0 0 0 0 +844 30 1 23|9 0 0 0 0 0 901 55 10 0 0 4609_1 0 0 0 0 902 55 20 0 0 4609_1 0 0 0 0 903 55 50 0 0 4610_1 0 0 0 0 diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt index 2e95850..4669850 100644 --- a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt +++ b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt @@ -26,7 +26,7 @@ 108 1 80 7_500 108 2 130 4 108 3 150 6 -108 4 170 50600|55600|60600 +108 4 160 50600|55600|60600 109 0 0 109 1 90 6_20000 109 2 120 5 -- Gitblit v1.8.0