From eb7c619eb5c1e4f0e4d4991cd5367928d886ea34 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 3 Apr 2019 16:28:43 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8E=A2=E7=B4=A2=E5=BA=A6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=A4=9A=E4=BA=8B=E4=BB=B6=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/server/AccomplishmentConfig.txt | 160 +++++++++--------- .../jieling/config/SAccomplishmentConfig.java | 4 +- .../ljsd/jieling/handler/map/MapLogic.java | 21 ++- 3 files changed, 93 insertions(+), 92 deletions(-) diff --git a/conf/server/AccomplishmentConfig.txt b/conf/server/AccomplishmentConfig.txt index 0ef4643e2..5a669b514 100644 --- a/conf/server/AccomplishmentConfig.txt +++ b/conf/server/AccomplishmentConfig.txt @@ -1,82 +1,80 @@ id MapId Logic Values Score -int int int mut,int#int,1 int -1 101 1 101046#1 11 -2 101 1 101064#1 5 -3 101 1 101142#1 5 -4 101 1 101230#1 6 -5 101 1 101233#2 6 -6 101 1 101237#3 6 -7 101 1 101026#1 7 -8 101 1 101061#1 8 -9 101 3 101220#1 8 -10 101 3 101222#1 8 -11 101 3 0#10 5 -12 101 6 0#20 5 -13 101 6 0#30 5 -14 101 6 0#50 5 -15 101 6 0#75 5 -16 101 6 0#100 5 -17 102 1 102028#1 6 -18 102 1 102061#1 7 -19 102 1 102077#1 7 -20 102 1 102016#1 6 -21 102 1 102036#1 4 -22 102 1 102039#1 4 -23 102 1 102042#1 4 -24 102 1 102105#1 7 -25 102 1 102137#1 7 -26 102 1 102172#1 7 -27 102 1 102026#1 7 -28 102 2 102140#1 6 -29 102 1 102164#1 4 -30 102 1 102166#1 4 -31 102 3 0#20 3 -32 102 3 0#30 3 -33 102 3 0#40 4 -34 102 3 0#50 4 -35 102 3 0#60 6 -36 103 1 103063#1 6 -37 103 1 103041#1 5 -38 103 1 103013#1 5 -39 103 1 103094#1 6 -40 103 1 103109#1 6 -41 103 1 103123#1 6 -42 103 1 103138#1 6 -43 103 1 101187#1 6 -44 103 1 101164#1 5 -45 103 1 101197#1 5 -46 103 1 103083#1 3 -47 103 1 103126#1 3 -48 103 1 103128#1 3 -49 103 5 0#1 3 -50 103 5 0#3 3 -51 103 5 0#6 3 -52 103 3 0#20 3 -53 103 3 0#30 3 -54 103 3 0#50 3 -55 103 6 0#100 6 -56 103 6 0#150 10 -57 104 1 104021#1 6 -58 104 1 104023#1 6 -59 104 1 104024#1 6 -60 104 1 104026#1 6 -61 104 1 104022#1 4 -62 104 1 104025#1 4 -63 104 1 104027#1 4 -64 104 1 104028#1 4 -65 104 1 104029#1 4 -66 104 1 104004#1 4 -67 104 1 104030#1 4 -68 104 1 104019#1 4 -69 104 1 104020#1 4 -70 104 1 0#1 4 -71 104 1 0#1 4 -72 104 1 0#1 4 -73 104 7 0#2 4 -74 104 7 0#4 6 -75 104 7 0#1 4 -76 104 7 0#2 6 -77 104 5 0#10 3 -78 104 5 0#20 3 -79 104 3 0#20 3 -0 0 3 0#40 3 +int int int mut,int#int,2 int +1 101 1 101046|1 11 +2 101 1 101064|1 5 +3 101 1 101142|1 5 +4 101 1 101230|1 6 +5 101 1 101233|2 6 +6 101 1 101237|3 6 +7 101 1 101026|1 7 +8 101 1 101061|1 8 +9 101 1 101221#101227|1 8 +10 101 1 101222|1 8 +11 101 3 0|10 5 +12 101 3 0|20 5 +13 101 3 0|30 5 +14 101 6 0|50 5 +15 101 6 0|75 5 +16 101 6 0|100 5 +17 102 1 102028|1 6 +18 102 1 102061|1 7 +19 102 1 102077|1 7 +20 102 1 102016|1 6 +21 102 1 102036|1 4 +22 102 1 102039|1 4 +23 102 1 102042|1 4 +24 102 1 102105|1 7 +25 102 1 102137|1 7 +26 102 1 102172|1 7 +27 102 1 102026|1 7 +28 102 2 102140|1 6 +29 102 1 102164|1 4 +30 102 1 102166|1 4 +31 102 3 0|20 3 +32 102 3 0|30 3 +33 102 3 0|40 4 +34 102 3 0|50 4 +35 102 3 0|60 6 +36 103 1 103063|1 6 +37 103 1 103041|1 5 +38 103 1 103013|1 5 +39 103 1 103094|1 6 +40 103 1 103109|1 6 +41 103 1 103123|1 6 +42 103 1 103138|1 6 +43 103 1 101187|1 6 +44 103 1 101164|1 5 +45 103 1 101197|1 5 +46 103 1 103083|1 3 +47 103 1 103126|1 3 +48 103 1 103128|1 3 +49 103 5 0|1 3 +50 103 5 0|3 3 +51 103 5 0|6 3 +52 103 3 0|20 3 +53 103 3 0|30 3 +54 103 3 0|50 3 +55 103 6 0|100 6 +56 103 6 0|150 10 +57 104 1 104031|1 6 +58 104 1 104041|1 6 +59 104 1 104073|1 6 +60 104 1 104111|1 6 +61 104 1 104080|1 5 +62 104 1 104165|1 5 +63 104 1 104179|1 5 +64 104 1 104187|1 5 +65 104 1 104196|1 5 +66 104 1 104203|1 5 +67 104 1 104216|1 5 +68 104 1 104019|1 4 +69 104 1 104170|1 5 +70 104 1 104219|1 4 +71 104 7 0|2 4 +72 104 7 0|4 6 +73 104 7 0|1 4 +74 104 7 0|2 6 +75 104 5 0|10 3 +76 104 5 0|20 3 +77 104 3 0|20 3 +78 104 3 0|40 3 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentConfig.java index 80bb47063..5478d64cb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SAccomplishmentConfig.java @@ -17,7 +17,7 @@ public class SAccomplishmentConfig implements BaseConfig { private int logic; - private int[] values; + private int[][] values; private int score; @@ -60,7 +60,7 @@ public class SAccomplishmentConfig implements BaseConfig { return logic; } - public int[] getValues() { + public int[][] getValues() { return values; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index e809764f4..3e512efb1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -1033,19 +1033,22 @@ public class MapLogic { SAccomplishmentConfig sAccomplishmentConfig = SAccomplishmentConfig.getsAccomplishmentConfigByIdMap(missionId); int score = sAccomplishmentConfig.getScore(); int logic = sAccomplishmentConfig.getLogic(); - int[] values = sAccomplishmentConfig.getValues(); - int targetEventId = values[0]; - int targetEventValue = values[1]; + int[][] values = sAccomplishmentConfig.getValues(); + int targetEventId = values[0][0]; + int targetEventValue = values[1][0]; if(logic == MapMissionType.FINISH_EVEVNT.getMissionTypeValue()){ - if(targetEventId == eventId){ - if(missionValue Date: Wed, 3 Apr 2019 17:39:38 +0800 Subject: [PATCH 2/6] fix gm --- .../java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index c21ee296d..63963c610 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -166,7 +166,7 @@ public class GMRequestHandler extends BaseHandler{ int totalWeight = 0; for(SAccomplishmentConfig sAccomplishmentConfig : sAccomplishmentConfigs){ int id = sAccomplishmentConfig.getId(); - int value = sAccomplishmentConfig.getValues()[1]; + int value = sAccomplishmentConfig.getValues()[1][0]; missionProgress.put(id,value); totalWeight+=sAccomplishmentConfig.getScore(); } From 5495dab69a676a0fde3d5f15a0e82099ce7d0541 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 3 Apr 2019 19:20:25 +0800 Subject: [PATCH 3/6] fix --- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 596d8d9a1..d870c7bcf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -249,7 +249,7 @@ public class HeroLogic { int weight =0; for(SLotteryRewardConfig sLotteryRewardConfig :sLotteryRewardConfigListByPoolId){ weight += sLotteryRewardConfig.getWeight(); - if(weight>randCount){ + if(weight>=randCount){ return sLotteryRewardConfig.getReward(); } From c6a892ab239ee8e72a08422d2f4526915a93eff5 Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Wed, 3 Apr 2019 20:43:03 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=BF=B7=E9=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/handler/map/MapLogic.java | 10 ++++++---- .../java/com/ljsd/jieling/logic/fight/CombatLogic.java | 7 ++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index e809764f4..ceeb7e087 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -75,7 +75,8 @@ public class MapLogic { } // 初始序章地图 if (user.getPlayerInfoManager().getMapId() == 0) { - String error = initTeamInfo(teamId, uid, user, mapManager); + SCMapConfig scMapConfig = SCMapConfig.getsCMapSize().get(100); + String error = initTeamInfo(teamId, uid, user, mapManager, scMapConfig.getMoveConfused()); if (!error.isEmpty()){ LOGGER.info("enterMap() uid=>{} error =>{} ", uid, error); MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), ""); @@ -123,7 +124,7 @@ public class MapLogic { MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "精力不足!"); return; } - String error = initTeamInfo(teamId, uid, user, mapManager); + String error = initTeamInfo(teamId, uid, user, mapManager, scMapConfig.getMoveConfused()); if (!error.isEmpty()){ LOGGER.info("enterMap() uid=>{} error =>{} ", uid, error); MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), ""); @@ -153,13 +154,14 @@ public class MapLogic { mapEnterResponse.addAllMapList(cells); mapEnterResponse.setLeftStep(mapManager.getTotalStep()); mapEnterResponse.setCurXY(mapManager.getCurXY()); + mapEnterResponse.addAllWakeCells(mapManager.getWalkCells() == null ? new ArrayList<>() : mapManager.getWalkCells()); if (mapManager.getTemporaryItems() != null) { mapEnterResponse.setTemporaryItems(CBean2Proto.getDrop(mapManager.getTemporaryItems())); } MessageUtil.sendMessage(iSession, 1, messageType.getNumber(), mapEnterResponse.build(), true); } - private String initTeamInfo(int teamId, int uid, User user, MapManager mapManager) throws Exception { + private String initTeamInfo(int teamId, int uid, User user, MapManager mapManager, int moveUse) throws Exception { List teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId); if (teamPosHeroInfos == null || teamPosHeroInfos.isEmpty()) { return "阵容不存在"; @@ -182,7 +184,7 @@ public class MapLogic { return "阵容有误"; } mapManager.setTeamId(teamId); - mapManager.setTotalStep(totalStep + 5); + mapManager.setTotalStep(totalStep + moveUse * 5); return ""; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index d24286bbe..fb1b3bda3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -332,7 +332,12 @@ public class CombatLogic { if(type == GlobalsDef.FOOD_ADDITION_EXPLORE_TYPE){ for(int[] effectPara : effectParas){ if(effectPara[0] == GlobalsDef.EXPLORE_MAP_ACTION_POWER_RORMULA_TYPE){ - mapManager.setTotalStep(mapManager.getTotalStep() + effectPara[1]); + SCMapConfig scMapConfig = SCMapConfig.getsCMapSize().get(mapManager.getCurMapId()); + int totalStep = mapManager.getTotalStep(); + if (totalStep < scMapConfig.getMoveConfused() * 5) { + totalStep = scMapConfig.getMoveConfused() * 5; + } + mapManager.setTotalStep(totalStep + effectPara[1]); } } } From b7d51deb0497949af9a61861b18b53e1751cb645 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 4 Apr 2019 14:00:49 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java | 3 +++ .../main/java/com/ljsd/jieling/logic/dao/TeamPosHeroInfo.java | 1 - .../src/main/java/com/ljsd/jieling/logic/dao/root/User.java | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index 63963c610..cac84658e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -19,6 +19,7 @@ import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MessageTypeProto; +import com.ljsd.jieling.protocols.PlayerInfoProto; import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.MessageUtil; import com.ljsd.jieling.util.TimeUtils; @@ -69,6 +70,8 @@ public class GMRequestHandler extends BaseHandler{ int nowTime =(int) (TimeUtils.now()/1000); Mail mail = new Mail(uid,"GM","GM",prarm1+"#"+prarm2,nowTime,30*24*60*60,"GM", Global.MAIL_TYPE_GM); cUser.getMailManager().addMail(mail); + PlayerInfoProto.RedPointInfo redPointInfo = PlayerInfoProto.RedPointInfo.newBuilder().setType(1).build(); + MessageUtil.sendMessage(iSession,1,MessageTypeProto.MessageType.SEND_RED_POINT_INDICATION_VALUE,redPointInfo,true); break; case GlobalGm.HERO_STAR: CommonProto.Drop.Builder drop = ItemUtil.drop(cUser, new int[][]{{prarm1, 1}}); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosHeroInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosHeroInfo.java index b5d447315..aeddd7a1e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosHeroInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosHeroInfo.java @@ -1,6 +1,5 @@ package com.ljsd.jieling.logic.dao; -import java.util.Comparator; public class TeamPosHeroInfo implements Comparable { private String heroId; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java index 0d9c4feec..2acbe5daa 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java @@ -1,6 +1,5 @@ package com.ljsd.jieling.logic.dao.root; -import com.ljsd.common.mogodb.MongoRoot; import com.ljsd.jieling.db.mongo.MongoKey; import com.ljsd.jieling.handler.map.MapManager; import com.ljsd.jieling.handler.mission.MissionManager; From 1d7c0587d38ab86e5c04769620e9cb1454606280 Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Thu, 4 Apr 2019 14:02:50 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/server/AccomplishmentConfig.txt | 146 +++++---- conf/server/EventPointConfig.txt | 118 ++++++- conf/server/FoodsConfig.txt | 6 +- conf/server/MapConfig.txt | 8 +- conf/server/MapPointConfig.txt | 46 +-- conf/server/Map_100.txt | 4 +- conf/server/Map_104.txt | 132 ++++---- conf/server/MissionEventsConfig.txt | 20 +- conf/server/OptionAddCondition.txt | 20 +- conf/server/OptionConfig.txt | 467 ++++++++++++++++++--------- conf/server/PropertyConfig.txt | 1 + 11 files changed, 619 insertions(+), 349 deletions(-) diff --git a/conf/server/AccomplishmentConfig.txt b/conf/server/AccomplishmentConfig.txt index 5a669b514..e5d45baf9 100644 --- a/conf/server/AccomplishmentConfig.txt +++ b/conf/server/AccomplishmentConfig.txt @@ -1,80 +1,78 @@ id MapId Logic Values Score int int int mut,int#int,2 int 1 101 1 101046|1 11 -2 101 1 101064|1 5 -3 101 1 101142|1 5 -4 101 1 101230|1 6 -5 101 1 101233|2 6 -6 101 1 101237|3 6 +2 101 1 101064|1 6 +3 101 1 101142|1 6 +4 101 1 101230|1 8 +5 101 1 101233|1 8 +6 101 1 101237|1 8 7 101 1 101026|1 7 8 101 1 101061|1 8 9 101 1 101221#101227|1 8 -10 101 1 101222|1 8 -11 101 3 0|10 5 -12 101 3 0|20 5 -13 101 3 0|30 5 -14 101 6 0|50 5 -15 101 6 0|75 5 -16 101 6 0|100 5 -17 102 1 102028|1 6 -18 102 1 102061|1 7 -19 102 1 102077|1 7 -20 102 1 102016|1 6 -21 102 1 102036|1 4 -22 102 1 102039|1 4 -23 102 1 102042|1 4 -24 102 1 102105|1 7 -25 102 1 102137|1 7 -26 102 1 102172|1 7 -27 102 1 102026|1 7 -28 102 2 102140|1 6 -29 102 1 102164|1 4 -30 102 1 102166|1 4 -31 102 3 0|20 3 -32 102 3 0|30 3 -33 102 3 0|40 4 -34 102 3 0|50 4 -35 102 3 0|60 6 -36 103 1 103063|1 6 -37 103 1 103041|1 5 -38 103 1 103013|1 5 -39 103 1 103094|1 6 -40 103 1 103109|1 6 -41 103 1 103123|1 6 -42 103 1 103138|1 6 -43 103 1 101187|1 6 -44 103 1 101164|1 5 -45 103 1 101197|1 5 -46 103 1 103083|1 3 -47 103 1 103126|1 3 -48 103 1 103128|1 3 -49 103 5 0|1 3 -50 103 5 0|3 3 -51 103 5 0|6 3 -52 103 3 0|20 3 -53 103 3 0|30 3 -54 103 3 0|50 3 -55 103 6 0|100 6 -56 103 6 0|150 10 -57 104 1 104031|1 6 -58 104 1 104041|1 6 -59 104 1 104073|1 6 -60 104 1 104111|1 6 -61 104 1 104080|1 5 -62 104 1 104165|1 5 -63 104 1 104179|1 5 -64 104 1 104187|1 5 -65 104 1 104196|1 5 -66 104 1 104203|1 5 -67 104 1 104216|1 5 -68 104 1 104019|1 4 -69 104 1 104170|1 5 -70 104 1 104219|1 4 -71 104 7 0|2 4 -72 104 7 0|4 6 -73 104 7 0|1 4 -74 104 7 0|2 6 -75 104 5 0|10 3 -76 104 5 0|20 3 -77 104 3 0|20 3 -78 104 3 0|40 3 +10 101 3 0|10 5 +11 101 3 0|20 5 +12 101 3 0|30 5 +13 101 6 0|50 5 +14 101 6 0|75 5 +15 101 6 0|100 5 +16 102 1 102028|1 6 +17 102 1 102061|1 7 +18 102 1 102077|1 7 +19 102 1 102016|1 6 +20 102 1 102036|1 4 +21 102 1 102039|1 4 +22 102 1 102042|1 4 +23 102 1 102105|1 8 +24 102 1 102137|1 8 +25 102 1 102172|1 8 +26 102 1 102026|1 8 +27 102 2 102140|1 6 +28 102 1 102165|1 4 +29 102 3 0|5 3 +30 102 3 0|10 3 +31 102 3 0|20 4 +32 102 3 0|30 4 +33 102 3 0|40 6 +34 103 1 103063|1 6 +35 103 1 103041|1 5 +36 103 1 103013|1 5 +37 103 1 103094|1 6 +38 103 1 103109|1 6 +39 103 1 103123|1 6 +40 103 1 103138|1 6 +41 103 1 101187|1 6 +42 103 1 101164|1 5 +43 103 1 101197|1 5 +44 103 1 103083|1 3 +45 103 1 103126|1 3 +46 103 1 103128|1 3 +47 103 5 0|1 3 +48 103 5 0|3 3 +49 103 5 0|6 3 +50 103 3 0|20 3 +51 103 3 0|30 3 +52 103 3 0|50 3 +53 103 6 0|100 6 +54 103 6 0|150 10 +55 104 1 104031|1 6 +56 104 1 104041|1 6 +57 104 1 104073|1 6 +58 104 1 104111|1 6 +59 104 1 104080|1 5 +60 104 1 104165|1 5 +61 104 1 104179|1 5 +62 104 1 104187|1 5 +63 104 1 104196|1 5 +64 104 1 104203|1 5 +65 104 1 104216|1 5 +66 104 1 104019|1 4 +67 104 1 104170|1 5 +68 104 1 104219|1 4 +69 104 7 0|2 4 +70 104 7 0|4 6 +71 104 7 0|1 4 +72 104 7 0|2 6 +73 104 5 0|10 3 +74 104 5 0|20 3 +75 104 3 0|20 3 +76 104 3 0|40 3 diff --git a/conf/server/EventPointConfig.txt b/conf/server/EventPointConfig.txt index 5547b1977..17e0edc3f 100644 --- a/conf/server/EventPointConfig.txt +++ b/conf/server/EventPointConfig.txt @@ -13,9 +13,9 @@ int mut,int#int,1 100011 100013 100012 100014 100013 null -100014 100015 -100015 100016#100017 -100016 null +100014 100015#100016 +100015 100019#100020 +100016 100017#100018 100017 null 100018 null 100019 100021 @@ -602,7 +602,7 @@ int mut,int#int,1 104013 104017#104018 104014 104019#104020 104015 10409 -104016 null +104016 104155 104017 104021#104022 104018 104023 104019 104024 @@ -669,8 +669,8 @@ int mut,int#int,1 104079 104111#104112 104080 104113 104081 null -104082 null -104083 null +104082 104115#104116 +104083 104117 104084 null 104085 null 104086 null @@ -695,9 +695,9 @@ int mut,int#int,1 104103 104138 104104 104139#104140 104105 104141#104142 -104106 104143 -104107 104144 -104108 104145#104146 +104106 null +104107 null +104108 null 104109 104147 104110 104148 104111 104149 @@ -706,9 +706,9 @@ int mut,int#int,1 104114 104153 104115 104154 104116 null -104117 null +104117 10409 104118 null -104119 null +104119 104144 104120 10402 104121 10404 104122 10405 @@ -722,8 +722,8 @@ int mut,int#int,1 104130 104164 104131 104165 104132 104166 -104133 null -104134 null +104133 104156 +104134 104157 104137 10409 104138 10409 104139 104169#104170 @@ -745,6 +745,98 @@ int mut,int#int,1 104155 104187 104156 104188 104157 104189 +104158 104190#104191 +104159 104192#104193#104194 +104160 104195#104196 +104161 104197#104198#104199 +104162 104200#104201 +104163 104202#104203 +104164 104204#104205#104206 +104165 104207 +104166 104210#104211 +104167 104212 +104168 104213 +104169 104214 +104170 104215#104216#104217#104218 +104171 104219#104220 +104172 104221#104222 +104173 104223#104224 +104174 104225#104226#104227 +104175 104228 +104176 104229#104230 +104177 104231#104232 +104178 104233#104234#104235 +104179 104236 +104180 104237#104238 +104181 104239#104240 +104182 104241#104242 +104183 104243#104244 +104184 104245#104246 +104185 104247#104248 +104186 104249#104250 +104187 104251 +104188 104252#104253 +104189 104254#104255 +104190 104256#104257#104258 +104191 104259 +104192 104260#104261 +104193 104262#104263 +104194 104264#104265#104266 +104195 104267#104268 +104196 104269 +104197 104270#104271 +104198 104272#104273 +104199 104274 +104200 104275#104276 +104201 104277 +104202 104278#104279 +104203 104280 +104204 null +104205 104283#104284 +104206 104285#104286#104287 +104207 104288#104289 +104208 104290#104291#104292 +104209 104293#104294 +104210 104295#104296 +104211 104297#104298 +104212 104299#104300 +104213 104301#104302 +104214 104303#104304 +104215 104305 +104216 104306 +104217 null +104218 104308#104309 +104219 104310 +104220 104311#104312 +104221 104313 +104222 104314#104315 +104223 104316#104317 +104224 104318#104319 +104225 104320#104321 +104226 104322#104323 +104227 104324#104325 +104228 104326#104327 +104229 104328#104329 +104230 104330#104331 +104231 104332#104333 +104232 104334#104335 +104233 104336 +104234 104337#104338 +104235 104339#104340 +104236 104341#104342 +104237 104343#104344 +104238 104345#104346 +104239 104347#104348 +104240 104349#104350 +104241 104351#104352#104353#104354 +104242 104355 +104243 104356 +104244 104357#104358 +104245 104359 +104246 104360#104361#104362#104363 +104247 104364 +104248 104365 +0 null 105001 10501 105002 10502 105003 10503 diff --git a/conf/server/FoodsConfig.txt b/conf/server/FoodsConfig.txt index ef43152b5..a71521198 100644 --- a/conf/server/FoodsConfig.txt +++ b/conf/server/FoodsConfig.txt @@ -31,5 +31,7 @@ int int int int mut,int#int,2 int 9229 15 0 0 null 1 9230 15 0 0 null 1 9231 15 0 0 null 1 -1 0 2 2 5#10 2 -2 0 1 1 1#100 2 +1 0 2 2 5#30 2 +2 0 1 1 6#1500 2 +3 0 2 2 5#60 2 +4 0 1 1 6#-100 2 diff --git a/conf/server/MapConfig.txt b/conf/server/MapConfig.txt index 6f77501e1..87675ac40 100644 --- a/conf/server/MapConfig.txt +++ b/conf/server/MapConfig.txt @@ -2,10 +2,10 @@ Id Info Size MoveConfused EnergyConfused OpenRule int string mut,int#int,1 int int mut,int#int,1 100 序章 10#10 0 0 null 101 战乱荒林 15#20 1 10 1#2 -102 三途津 15#20 2 10 2#4 -103 青龙门 20#15 2 20 3#5 -104 风见原野 40#20 2 20 4#2 -105 观澜港 15#20 2 20 5#3 +102 三途津 15#20 2 10 3#4 +103 青龙门 20#15 2 20 5#6 +104 风见原野 40#20 2 20 6#3 +105 观澜港 15#20 2 20 7#5 106 白叶渡 20#30 2 20 null 107 荆棘流域 30#30 2 20 null 108 中心枢纽 10#20 2 20 null diff --git a/conf/server/MapPointConfig.txt b/conf/server/MapPointConfig.txt index 8bfe3d41d..5a9fa26ce 100644 --- a/conf/server/MapPointConfig.txt +++ b/conf/server/MapPointConfig.txt @@ -59,7 +59,7 @@ int int int int int int int 102008 2 2 2 0 102008 0 102009 2 1 2 0 102009 0 102010 2 1 2 0 102010 0 -102011 5 3 2 0 102011 0 +102011 5 3 2 0 102138 0 102012 3 2 2 0 102013 0 102013 4 2 2 0 102014 0 102014 8 0 0 0 0 0 @@ -126,7 +126,7 @@ int int int int int int int 104033 1 2 1 0 104122 0 104034 1 2 1 0 104123 0 104003 1 2 1 0 104003 0 -104004 1 3 1 0 104004 0 +104004 2 3 2 0 104197 0 104005 2 2 2 0 104005 0 104006 2 2 2 0 104006 0 104007 2 2 2 0 104007 0 @@ -144,33 +144,33 @@ int int int int int int int 104017 8 0 0 0 0 0 104018 5 3 2 0 104124 0 104019 5 3 2 0 104125 0 -104020 5 3 2 0 104126 0 +104020 5 3 2 0 104166 0 104021 5 3 2 0 104017 0 -104022 5 3 2 0 104127 0 +104022 5 3 2 0 104075 0 104023 5 3 2 0 104135 0 104024 5 3 2 0 104047 0 -104025 5 3 2 0 104128 0 +104025 5 3 2 0 104158 0 104026 5 3 2 0 104136 0 -104027 5 3 2 0 104129 0 -104028 5 3 2 0 104130 0 -104029 5 3 2 0 104131 0 -104030 5 3 2 0 104132 0 +104027 5 3 2 0 104171 0 +104028 5 3 2 0 104180 0 +104029 5 3 2 0 104188 0 +104030 5 3 2 0 104205 0 104036 1 2 1 0 104137 0 104037 1 2 1 0 104138 0 -104038 5 3 2 0 0 0 -104039 7 0 0 0 0 0 -104040 1 0 0 0 0 0 -104041 5 0 0 0 0 0 -104042 5 0 0 0 0 0 -104043 5 0 0 0 0 0 -104044 5 0 0 0 0 0 -104045 5 0 0 0 0 0 -104046 5 0 0 0 0 0 -104047 5 2 2 0 0 0 -104048 5 0 0 0 0 0 -104049 5 0 0 0 0 0 -104050 5 0 0 0 0 0 -104051 5 0 0 0 0 0 +104038 5 3 2 0 104139 0 +104039 7 3 2 0 104119 0 +104040 1 3 1 0 104117 0 +104041 5 2 2 0 104240 0 +104042 5 2 2 0 104244 0 +104043 5 2 2 0 104218 0 +104044 5 3 2 0 104222 0 +104045 5 3 2 0 104228 0 +104046 5 3 2 0 104234 0 +104047 5 2 2 0 104113 0 +104048 5 2 2 0 104082 0 +104049 5 2 2 0 0 0 +104050 5 2 2 0 0 0 +104051 5 2 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 105001 1 2 1 0 105001 0 diff --git a/conf/server/Map_100.txt b/conf/server/Map_100.txt index b6fef21e4..bb606f394 100644 --- a/conf/server/Map_100.txt +++ b/conf/server/Map_100.txt @@ -1,6 +1,4 @@ id Event Groups isMustAppear int int mut,int#int,2 int 1 100004 7#7 0 -2 100005 2#7 0 -3 100002 4#4 0 -4 100006 2#9 0 +2 100002 4#4 0 diff --git a/conf/server/Map_104.txt b/conf/server/Map_104.txt index 7523880d1..9c1efed09 100644 --- a/conf/server/Map_104.txt +++ b/conf/server/Map_104.txt @@ -4,68 +4,70 @@ int int mut,int#int,2 int 2 104032 9#6|9#7 0 3 104015 34#2 0 4 104007 7#16|6#17|6#18|7#18 0 -5 104028 26#10 0 -6 104001 1#9|1#10|2#10|1#11|1#12 0 -7 104032 27#16|27#17|27#18|28#18|27#19 0 -8 104133 20#4 0 -9 104002 24#8|23#9|24#9|24#10|10#11|8#12|9#12|9#13|10#13 0 -10 104010 16#13|18#13|17#14 0 -11 104002 27#2|26#3|26#4|27#4|26#5 0 -12 104016 6#2 0 -13 104012 2#13|2#14 0 -14 104031 8#16|8#17|9#17|8#18|9#19 0 -15 104001 21#9|22#10 0 -16 104017 4#1|5#1|6#1|7#1|8#1|9#1|10#1|11#1|12#1|13#1|14#1|15#1|16#1|17#1|18#1|19#1|20#1|21#1|22#1|23#1|24#1|29#1|30#1|31#1|32#1|34#1|35#1|36#1|37#1|38#1|39#1|40#1|7#2|8#2|9#2|10#2|11#2|12#2|15#2|16#2|17#2|18#2|19#2|20#2|21#2|22#2|23#2|24#2|36#2|37#2|38#2|39#2|40#2|6#3|7#3|8#3|9#3|10#3|11#3|15#3|16#3|17#3|18#3|19#3|20#3|21#3|22#3|23#3|37#3|38#3|39#3|40#3|6#4|7#4|8#4|9#4|10#4|11#4|15#4|16#4|17#4|18#4|19#4|21#4|22#4|38#4|39#4|40#4|5#5|6#5|7#5|8#5|9#5|10#5|17#5|18#5|19#5|21#5|22#5|40#5|5#6|6#6|7#6|8#6|10#6|34#6|39#6|40#6|7#7|34#7|35#7|36#7|39#7|40#7|34#8|35#8|36#8|39#8|40#8|34#9|35#9|36#9|16#10|17#10|18#10|19#10|20#10|21#10|34#10|35#10|36#10|15#11|16#11|17#11|18#11|19#11|20#11|21#11|22#11|36#11|16#12|17#12|18#12|19#12|20#12|21#12|29#18|30#18|31#18|32#18|33#18|34#18|35#18|36#18|37#18|38#18|39#18|40#18|10#19|11#19|12#19|13#19|14#19|15#19|16#19|17#19|18#19|19#19|20#19|21#19|22#19|28#19|29#19|30#19|31#19|32#19|33#19|34#19|35#19|36#19|37#19|38#19|39#19|40#19|9#20|10#20|11#20|12#20|13#20|14#20|15#20|16#20|17#20|18#20|19#20|20#20|21#20|22#20|23#20|27#20|28#20|29#20|30#20|31#20|32#20|33#20|34#20|35#20|36#20|37#20|38#20|39#20|40#20 1 -17 104031 14#4|13#5|14#5 0 -18 104031 2#1|3#1 0 -19 104031 29#4|30#4 0 -20 104041 13#2|35#3|28#5|23#6|6#13|34#13|30#15|20#17|1#19 0 -21 104012 14#9|13#10|14#10|12#11|13#11 0 -22 104010 27#13|27#14|28#15 0 -23 104002 16#7|17#7|15#8|17#8 0 -24 104026 35#11 0 -25 104032 14#15|15#15|1#16|14#16|1#17|14#17|1#18|2#18 0 -26 104005 1#6|2#6|2#7 0 -27 104047 12#16 0 -28 104024 2#20 0 -29 104045 26#18 0 -30 104022 7#19 0 -31 104043 33#8|19#13 0 -32 104020 32#14 0 -33 104001 36#16|37#16|36#17|37#17 0 -34 104012 25#13|24#14|25#15|24#16 0 -35 104029 30#2 0 -36 104008 10#16|10#17 0 -37 104134 39#5 0 -38 104010 29#7|29#8|30#8 0 -39 104001 6#8|7#8 0 -40 104031 18#15|18#16|17#17|18#17|18#18 0 -41 104030 40#12 0 -42 104001 38#9|39#9|40#9|39#10 0 -43 104032 39#13|38#14|39#14|40#15 0 -44 104015 32#2|20#5|38#5 0 -45 104013 1#3 0 -46 104009 19#8|19#9 0 -47 104036 5#2 0 -48 104001 28#8|27#9|28#9|28#10|27#11 0 -49 104032 4#8|4#9|4#10 0 -50 104001 37#4|36#5|37#5 0 -51 104001 4#18|5#18|4#19|5#19|5#20 0 -52 104002 33#5|32#6|33#6|32#7|33#7 0 -53 104039 33#1 0 -54 104018 12#7 0 -55 104036 5#3 0 -56 104015 33#2|20#6|38#6 0 -57 104031 25#16|26#16|24#17|25#18|24#19 0 -58 104048 4#4 0 -59 104001 31#9|31#10|31#11|32#12 0 -60 104027 31#17 0 -61 104004 24#4 0 -62 104025 16#5 0 -63 104046 12#13 0 -64 104005 5#9|6#9|5#11 0 -65 104044 22#12 0 -66 104023 9#15 0 -67 104042 26#1|31#5|8#9|40#10|14#12|25#20 0 -68 104007 11#8|10#9|9#10 0 -69 104021 4#14 0 +5 104040 38#6 0 +6 104028 26#10 0 +7 104001 1#9|1#10|2#10|1#11|1#12 0 +8 104032 27#16|27#17|27#18|28#18|27#19 0 +9 104133 20#4 0 +10 104002 24#8|23#9|24#9|24#10|10#11|8#12|9#12|9#13|10#13 0 +11 104010 16#13|18#13|17#14 0 +12 104002 27#2|26#3|26#4|27#4|26#5 0 +13 104016 6#2 0 +14 104012 2#13|2#14 0 +15 104031 8#16|8#17|9#17|8#18|9#19 0 +16 104001 21#9|22#10 0 +17 104017 4#1|5#1|6#1|7#1|8#1|9#1|10#1|11#1|12#1|13#1|14#1|15#1|16#1|17#1|18#1|19#1|20#1|21#1|22#1|23#1|24#1|29#1|30#1|31#1|32#1|34#1|35#1|36#1|37#1|38#1|39#1|40#1|7#2|8#2|9#2|10#2|11#2|12#2|15#2|16#2|17#2|18#2|19#2|20#2|21#2|22#2|23#2|24#2|36#2|37#2|38#2|39#2|40#2|6#3|7#3|8#3|9#3|10#3|11#3|15#3|16#3|17#3|18#3|19#3|20#3|21#3|22#3|23#3|37#3|38#3|39#3|40#3|6#4|7#4|8#4|9#4|10#4|11#4|15#4|16#4|17#4|18#4|19#4|21#4|22#4|38#4|39#4|40#4|5#5|6#5|7#5|8#5|9#5|10#5|17#5|18#5|19#5|21#5|22#5|40#5|5#6|6#6|7#6|8#6|10#6|34#6|39#6|40#6|7#7|34#7|35#7|36#7|39#7|40#7|34#8|35#8|36#8|39#8|40#8|34#9|35#9|36#9|16#10|17#10|18#10|19#10|20#10|21#10|34#10|35#10|36#10|15#11|16#11|17#11|18#11|19#11|20#11|21#11|22#11|36#11|16#12|17#12|18#12|19#12|20#12|21#12|29#18|30#18|31#18|32#18|33#18|34#18|35#18|36#18|37#18|38#18|39#18|40#18|10#19|11#19|12#19|13#19|14#19|15#19|16#19|17#19|18#19|19#19|20#19|21#19|22#19|28#19|29#19|30#19|31#19|32#19|33#19|34#19|35#19|36#19|37#19|38#19|39#19|40#19|9#20|10#20|11#20|12#20|13#20|14#20|15#20|16#20|17#20|18#20|19#20|20#20|21#20|22#20|23#20|27#20|28#20|29#20|30#20|31#20|32#20|33#20|34#20|35#20|36#20|37#20|38#20|39#20|40#20 1 +18 104031 14#4|13#5|14#5 0 +19 104031 2#1|3#1 0 +20 104031 29#4|30#4 0 +21 104041 13#2|35#3|28#5|23#6|6#13|34#13|30#15|20#17|1#19 0 +22 104012 14#9|13#10|14#10|12#11|13#11 0 +23 104010 27#13|27#14|28#15 0 +24 104002 16#7|17#7|15#8|17#8 0 +25 104026 35#11 0 +26 104032 14#15|15#15|1#16|14#16|1#17|14#17|1#18|2#18 0 +27 104005 1#6|2#6|2#7 0 +28 104047 12#16 0 +29 104024 2#20 0 +30 104045 26#18 0 +31 104022 7#19 0 +32 104043 33#8|19#13 0 +33 104020 32#14 0 +34 104001 36#16|37#16|36#17|37#17 0 +35 104012 25#13|24#14|25#15|24#16 0 +36 104029 30#2 0 +37 104008 10#16|10#17 0 +38 104134 39#5 0 +39 104010 29#7|29#8|30#8 0 +40 104001 6#8|7#8 0 +41 104031 18#15|18#16|17#17|18#17|18#18 0 +42 104030 40#12 0 +43 104001 38#9|39#9|40#9|39#10 0 +44 104032 39#13|38#14|39#14|40#15 0 +45 104015 32#2|20#5 0 +46 104013 1#3 0 +47 104009 19#8|19#9 0 +48 104036 5#2 0 +49 104001 28#8|27#9|28#9|28#10|27#11 0 +50 104032 4#8|4#9|4#10 0 +51 104001 37#4|36#5|37#5 0 +52 104001 4#18|5#18|4#19|5#19|5#20 0 +53 104002 33#5|32#6|33#6|32#7|33#7 0 +54 104039 33#1 0 +55 104018 12#7 0 +56 104036 5#3 0 +57 104040 38#5 0 +58 104015 33#2|20#6 0 +59 104031 25#16|26#16|24#17|25#18|24#19 0 +60 104048 4#4 0 +61 104001 31#9|31#10|31#11|32#12 0 +62 104027 31#17 0 +63 104004 24#4 0 +64 104025 16#5 0 +65 104046 12#13 0 +66 104005 5#9|6#9|5#11 0 +67 104044 22#12 0 +68 104023 9#15 0 +69 104042 26#1|31#5|8#9|40#10|14#12|25#20 0 +70 104007 11#8|10#9|9#10 0 +71 104021 4#14 0 diff --git a/conf/server/MissionEventsConfig.txt b/conf/server/MissionEventsConfig.txt index ebe8a0ad5..ccc760641 100644 --- a/conf/server/MissionEventsConfig.txt +++ b/conf/server/MissionEventsConfig.txt @@ -2,16 +2,16 @@ Id Type MissionNum Reward int int int int 1 1 3 2000 2 1 5 2001 -502 1 4 2024 -3 1 3 2002 -503 1 6 2025 -4 1 3 2003 -5 1 5 2004 -6 1 3 2005 -7 1 2 2006 -8 1 2 2007 -9 1 1 2008 -10 1 2 2009 +3 1 4 2024 +4 1 3 2002 +5 1 6 2025 +6 1 3 2003 +7 1 5 2004 +8 1 3 2005 +9 1 2 2006 +10 1 2 2007 +11 1 1 2008 +12 1 2 2009 101 2 4 2002 102 2 3 2002 103 2 1 2002 diff --git a/conf/server/OptionAddCondition.txt b/conf/server/OptionAddCondition.txt index bc783da6a..8e9063cb6 100644 --- a/conf/server/OptionAddCondition.txt +++ b/conf/server/OptionAddCondition.txt @@ -21,23 +21,23 @@ int int mut,int#int,2 10104 0 null 10105 0 null 10106 6 0#2#2 -10107 6 0#502#0 -10108 6 0#502#1 +10107 6 0#3#0 +10108 6 0#3#1 10109 0 null -10110 6 0#502#2 -10111 6 0#502#3 +10110 6 0#3#2 +10111 6 0#3#3 10201 0 null 10202 0 null 10203 0 null 10301 3 0#2#1200 10302 3 1#2#900 10303 1 1#103020#103094 -10401 6 0#5#3 -10402 6 1#5#3 -10501 6 1#6#4 -10502 6 0#6#4 -10601 6 1#7#3 -10602 6 0#7#3 +10401 6 0#7#3 +10402 6 1#7#3 +10501 6 1#8#4 +10502 6 0#8#4 +10601 6 1#9#3 +10602 6 0#9#3 0 0 null 0 0 null 0 0 null diff --git a/conf/server/OptionConfig.txt b/conf/server/OptionConfig.txt index d5f77a9e0..0680b5aaf 100644 --- a/conf/server/OptionConfig.txt +++ b/conf/server/OptionConfig.txt @@ -14,12 +14,12 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 100012 0 1 10102 null 1 100011 100013 0 13 1 null 1 100012 100014 0 15 100004 null 4 null -100015 0 30 100#1#9#100005 null 4 null -100016 0 29 1503#1 1001#1101#1201#1301 4 null -100017 0 0 null null 4 null -100018 0 0 null null 0 null -100019 0 0 null null 0 null -100020 0 0 null null 0 null +100015 0 6 3 null 1 100016 +100016 0 0 null null 4 null +100017 0 6 1 null 1 100014 +100018 0 0 null null 4 null +100019 0 8 6 null 4 null +100020 0 0 null null 4 null 100021 0 0 null null 1 100020 100022 0 0 null null 1 100021 100023 0 0 null null 1 100022 @@ -170,8 +170,8 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 0 0 0 null null 0 null 0 0 0 null null 0 null 101136 0 0 null null 1 101099 -101137 0 27 3 null 1 101100 -101138 0 9 502 null 4 null +101137 0 27 4 null 1 101100 +101138 0 9 3 null 4 null 101139 0 0 null null 0 null 101140 0 0 null null 0 null 101141 0 0 null null 0 null @@ -209,30 +209,30 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101173 0 1 10103 null 1 101126 101174 0 0 null null 4 null 101175 0 0 null null 4 null -101176 1 2 1503#1#101019 1001#1101#1201#1301 4 null +101176 1 29 1503#1 1001#1101#1201#1301 4 null 101177 0 0 null null 4 null -101178 1 2 1503#1#101020 1001#1101#1201#1301 4 null +101178 1 29 1503#1 1001#1101#1201#1301 4 null 101179 0 0 null null 4 null -101180 1 2 1503#1#101021 1001#1101#1201#1301 4 null +101180 1 29 1503#1 1001#1101#1201#1301 4 null 101181 0 0 null null 4 null -101182 1 2 1503#1#101022 1001#1101#1201#1301 4 null +101182 1 29 1503#1 1001#1101#1201#1301 4 null 101183 0 0 null null 4 null 101184 0 0 null null 4 null 101185 0 0 null null 4 null -101186 1 2 1503#1#101015 1001#1101#1201#1301 4 null +101186 1 29 1503#1 1001#1101#1201#1301 4 null 101187 0 0 null null 4 null 101188 0 0 null null 5 101136 101189 0 0 null null 5 101140 101190 0 0 null null 0 null -101191 0 9 502 null 4 null +101191 0 9 3 null 4 null 101192 0 0 null null 0 null 101193 0 0 null null 1 101141 -101194 0 27 502 null 1 101142 +101194 0 27 3 null 1 101142 101195 0 9 2 null 4 null 101196 0 0 null null 5 101144 101197 0 0 null null 5 101145 101198 0 0 null null 1 101146 -101199 0 27 3 null 1 101147 +101199 0 27 4 null 1 101147 101200 0 19 2#0 null 4 null 101201 0 0 null null 4 null 101202 10 0 null null 1 101067 @@ -313,7 +313,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101277 0 0 null null 4 null 101278 0 27 101 null 1 101197 101279 0 15 101024 null 4 null -101280 0 26 502 null 4 null +101280 0 26 3 null 4 null 101281 0 0 null null 0 null 101282 0 0 null null 0 null 101283 0 0 null null 0 null @@ -341,10 +341,10 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101305 0 0 null null 1 null 101306 0 0 null null 1 null 101307 0 0 null null 1 null -101308 0 26 3 null 4 null +101308 0 26 4 null 4 null 101309 0 8 1 null 3 101221#101227|1#10108 101310 0 0 null null 4 null -101311 0 9 502 null 4 null +101311 0 9 3 null 4 null 101312 0 8 2 null 1 101223 101313 0 0 null null 4 null 101314 0 0 null null 4 null @@ -355,29 +355,29 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 101319 10107 0 null null 1 101229 101320 0 0 null null 4 null 101321 0 1 1010004 null 1 101230 -101322 0 18 502#1010004#101016 null 4 null +101322 0 18 3#1010004#101016 null 4 null 101323 10110 0 null null 1 101232 101324 0 0 null null 4 null 101325 0 1 1010005 null 1 101233 -101326 0 18 502#1010005#101038 null 4 null +101326 0 18 3#1010005#101038 null 4 null 101327 10111 0 null null 1 101235 101328 0 0 null null 4 null 101329 0 1 1010006 null 1 101236 101330 0 1 1010007 null 1 101237 101331 0 6 2 100002#100004#101005#102002 5 101095 -102001 1 2 1503#1#102004 1002#1102#1202#1302 4 null +102001 1 29 1503#1 1002#1102#1202#1302 4 null 102002 0 0 null null 4 null -102003 1 2 1503#1#102005 1002#1102#1202#1302 4 null +102003 1 29 1503#1 1002#1102#1202#1302 4 null 102004 0 0 null null 4 null -102005 1 2 1503#1#102006 1002#1102#1202#1302 4 null +102005 1 29 1503#1 1002#1102#1202#1302 4 null 102006 0 0 null null 4 null -102007 1 2 1503#1#102007 1002#1102#1202#1302 4 null +102007 1 29 1503#1 1002#1102#1202#1302 4 null 102008 0 0 null null 4 null -102009 1 2 1503#1#102008 1002#1102#1202#1302 4 null +102009 1 29 1503#1 1002#1102#1202#1302 4 null 102010 0 0 null null 4 null -102011 1 2 1503#1#102009 1002#1102#1202#1302 4 null +102011 1 29 1503#1 1002#1102#1202#1302 4 null 102012 0 0 null null 4 null -102013 1 2 1503#1#102010 1002#1102#1202#1302 4 null +102013 1 29 1503#1 1002#1102#1202#1302 4 null 102014 0 0 null null 4 null 102015 0 1 10204 null 1 102012 102016 0 0 null null 4 null @@ -388,11 +388,11 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102021 0 0 null null 4 null 102022 0 5 103#19#2 null 4 null 102023 0 0 null null 4 null -102024 6 14 503|1503#1 null 1 102016 +102024 6 14 5|1503#1 null 1 102016 102025 0 0 null null 4 null 102026 0 15 102015 null 4 null 102027 0 0 null null 0 null -102028 0 19 503#0 null 6 102013 +102028 0 19 5#0 null 6 102013 102029 0 0 null null 0 null 102030 0 0 null null 5 102021 102031 0 0 null null 4 null @@ -403,7 +403,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102036 0 0 null null 1 102026 102037 0 0 null null 1 102027 102038 0 0 null null 1 102028 -102039 0 9 3 null 4 null +102039 0 9 4 null 4 null 102040 0 0 null null 0 null 102041 0 0 null null 0 null 102042 0 0 null null 0 null @@ -412,15 +412,15 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102045 0 0 null null 4 null 102046 0 0 null null 5 102036 102047 0 0 null null 4 null -102048 0 18 503#1020001#102019 null 4 null +102048 0 18 5#1020001#102019 null 4 null 102049 0 0 null null 4 null 102050 0 0 null null 5 102039 102051 0 0 null null 4 null -102052 0 18 503#1020001#102020 null 4 null +102052 0 18 5#1020001#102020 null 4 null 102053 0 0 null null 4 null 102054 0 0 null null 5 102042 102055 0 0 null null 4 null -102056 0 18 503#1020001#102021 null 4 null +102056 0 18 5#1020001#102021 null 4 null 102057 0 0 null null 4 null 102058 0 0 null null 1 102045 102059 0 0 null null 4 null @@ -436,7 +436,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102069 0 0 null null 4 null 102070 0 0 null null 0 null 102071 0 0 null null 0 null -102072 0 0 null null 1 102056 +102072 0 8 2 null 1 102056 102073 0 0 null null 0 null 102074 0 0 null null 4 null 102075 0 0 null null 0 null @@ -445,12 +445,12 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102078 0 0 null null 0 null 102079 0 1 1020004 null 1 102057 102080 0 0 null null 4 null -102081 9 6 2 null 5 102058 +102081 0 6 2 null 5 102058 102082 0 0 null null 4 null 102083 0 0 null null 1 102059 102084 0 0 null null 5 102060 102085 0 0 null null 5 102061 -102086 0 9 3 null 4 null +102086 0 9 4 null 4 null 102087 0 0 null null 0 null 102088 0 0 null null 0 null 102089 0 0 null null 1 102064 @@ -479,20 +479,20 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102112 0 1 1020006 null 5 102082 102113 0 0 null null 4 null 102114 0 27 102 null 1 102083 -102115 0 9 3 10102 6 102078 +102115 0 9 4 10102 6 102078 102116 0 0 null null 1 102079 102117 0 0 null null 1 102080 102118 0 0 null null 6 102078 102119 0 0 null null 0 null 102120 0 0 null null 0 null -102121 0 27 503 null 5 102077 +102121 0 27 5 null 5 102077 102122 0 0 null null 0 null 102123 0 0 null null 0 null 102124 0 0 null null 1 102085 102125 0 0 null null 4 null 102126 0 1 1020007 null 1 102086 102127 0 0 null null 4 null -102128 0 1 1020007 null 1 102089 +102128 0 0 null null 1 102089 102129 0 0 null null 4 null 102130 0 0 null null 0 null 102131 0 0 null null 0 null @@ -500,11 +500,11 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102133 0 0 null null 0 null 102134 0 1 1020007 null 1 102090 102135 0 0 null null 4 null -102136 0 1 1020007 null 1 102091 +102136 0 0 null null 1 102091 102137 0 0 null null 4 null 102138 0 1 1020008 null 1 102092 102139 0 0 null null 4 null -102140 0 1 1020008 null 1 102093 +102140 0 0 null null 1 102093 102141 0 0 null null 4 null 102142 0 1 1020009 null 1 102094 102143 0 0 null null 4 null @@ -518,9 +518,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102151 0 0 null null 1 102101 102152 0 0 null null 1 102102 102153 0 0 null null 1 102103 -102154 0 27 4 null 1 102104 +102154 0 27 6 null 1 102104 102155 0 27 103 null 1 102105 -102156 0 25 503#102012#102017 null 4 null +102156 0 25 5#102012#102017 null 4 null 102157 0 0 null null 4 null 102158 0 0 null null 4 null 102159 0 1 10505 null 1 102109 @@ -531,7 +531,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102164 0 0 null null 1 102113 102165 0 0 null null 1 102114 102166 0 0 null null 1 102115 -102167 0 27 3 null 1 102116 +102167 0 27 4 null 1 102116 102168 0 19 2#0 null 4 null 102169 0 0 null null 5 102118 102170 0 0 null null 1 102119 @@ -541,8 +541,8 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102174 0 15 102030 null 4 null 102175 0 0 null null 1 102124 102176 0 0 null null 1 102125 -102177 0 27 4 null 1 102126 -102178 0 19 3#0 null 4 null +102177 0 27 6 null 1 102126 +102178 0 19 4#0 null 4 null 102179 0 0 null null 1 102128 102180 0 0 null null 4 null 102181 0 0 null null 1 102129 @@ -585,7 +585,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102218 0 6 2 null 1 102152 102219 0 1 102031 null 1 102153 102220 0 0 null null 5 102169 -102221 0 26 503 null 4 null +102221 0 26 5 null 4 null 102222 0 0 null null 0 null 102223 0 0 null null 0 null 102224 0 0 null null 0 null @@ -611,10 +611,10 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102244 0 1 102014 null 1 102162 102245 0 0 null null 4 null 102246 0 0 null null 4 null -102247 0 26 4 null 4 null -102248 0 0 null null 1 102165 +102247 0 26 6 null 4 null +102248 0 8 3 null 1 102165 102249 0 0 null null 4 null -102250 0 0 null null 4 null +102250 0 15 102032 null 4 null 102251 0 0 null null 1 102167 102252 0 0 null null 4 null 102253 0 0 null null 4 null @@ -625,25 +625,25 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 102258 0 9 103 null 4 null 102259 0 26 102 null 4 null 102260 0 26 103 null 4 null -103001 1 2 1503#1#103004 1003#1103#1203#1303 4 null +103001 1 29 1503#1 1003#1103#1203#1303 4 null 103002 0 0 null null 4 null -103003 1 2 1503#1#103005 1003#1103#1203#1303 4 null +103003 1 29 1503#1 1003#1103#1203#1303 4 null 103004 0 0 null null 4 null -103005 1 2 1503#1#103006 1003#1103#1203#1303 4 null +103005 1 29 1503#1 1003#1103#1203#1303 4 null 103006 0 0 null null 4 null -103007 1 2 1503#1#103007 1003#1103#1203#1303 4 null +103007 1 29 1503#1 1003#1103#1203#1303 4 null 103008 0 0 null null 4 null -103009 1 2 1503#1#103008 1003#1103#1203#1303 4 null +103009 1 29 1503#1 1003#1103#1203#1303 4 null 103010 0 0 null null 4 null -103011 1 2 1503#1#103009 1003#1103#1203#1303 4 null +103011 1 29 1503#1 1003#1103#1203#1303 4 null 103012 0 0 null null 4 null -103013 1 2 1503#1#103010 1003#1103#1203#1303 4 null +103013 1 29 1503#1 1003#1103#1203#1303 4 null 103014 0 0 null null 4 null 103015 0 5 0 null 4 null 103016 0 0 null null 4 null 103017 0 0 null null 4 null 103018 0 0 null null 4 null -103019 0 18 4#10304#103013 null 4 null +103019 0 18 6#10304#103013 null 4 null 103020 0 0 null null 4 null 103021 0 15 103014 100002#100004#101005#102002 4 null 103022 0 0 null null 4 null @@ -668,8 +668,8 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103041 0 0 null null 1 103035 103042 0 0 null null 1 103036 103043 0 0 null null 1 103037 -103044 0 27 5 null 1 103038 -103045 0 13 4 null 1 103041 +103044 0 27 7 null 1 103038 +103045 0 13 6 null 1 103041 103046 0 0 null null 0 null 103047 0 0 null null 0 null 103048 0 15 103018 null 4 null @@ -701,7 +701,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103074 0 0 null null 1 103061 103075 0 0 null null 1 103062 103076 0 0 null null 1 103063 -103077 0 25 4#103018#103019 null 4 null +103077 0 25 6#103018#103019 null 4 null 103078 0 0 null null 0 null 103079 0 0 null null 0 null 103080 0 0 null null 4 null @@ -721,8 +721,8 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103094 0 0 null null 1 103079 103095 0 0 null null 1 103080 103096 0 0 null null 5 103081 -103097 0 27 5 null 5 103082 -103098 0 19 4#0 null 4 null +103097 0 27 7 null 5 103082 +103098 0 19 6#0 null 4 null 103099 0 0 null null 1 103084 103100 0 0 null null 4 null 103101 0 0 null null 1 103085 @@ -810,7 +810,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103183 0 0 null null 4 null 103184 0 0 null null 4 null 103185 0 0 null null 4 null -103186 0 26 5 null 4 null +103186 0 26 7 null 4 null 103187 0 0 null null 1 103127 103188 0 0 null null 4 null 103189 0 15 103028 null 4 null @@ -839,21 +839,21 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 103212 10303 0 null null 1 103144 103213 0 0 null null 4 null 103214 0 0 null null 1 103086 -104001 1 30 1503#1#104005 1004#1104#1204#1304 4 null +104001 1 29 1503#1 1004#1104#1204#1304 4 null 104002 0 0 null null 4 null -104003 1 30 1503#1#104006 1004#1104#1204#1304 4 null +104003 1 29 1503#1 1004#1104#1204#1304 4 null 104004 0 0 null null 4 null -104005 1 30 1503#1#104007 1004#1104#1204#1304 4 null +104005 1 29 1503#1 1004#1104#1204#1304 4 null 104006 0 0 null null 4 null -104007 1 30 1503#1#104008 1004#1104#1204#1304 4 null +104007 1 29 1503#1 1004#1104#1204#1304 4 null 104008 0 0 null null 4 null -104009 1 30 1503#1#104009 1004#1104#1204#1304 4 null +104009 1 29 1503#1 1004#1104#1204#1304 4 null 104010 0 0 null null 4 null -104011 1 30 1503#1#104010 1004#1104#1204#1304 4 null +104011 1 29 1503#1 1004#1104#1204#1304 4 null 104012 0 0 null null 4 null -104013 1 30 1503#1#104011 1004#1104#1204#1304 4 null +104013 1 29 1503#1 1004#1104#1204#1304 4 null 104014 0 0 null null 4 null -104015 1 30 1503#1#104012 1004#1104#1204#1304 4 null +104015 1 29 1503#1 1004#1104#1204#1304 4 null 104016 0 0 null null 4 null 104017 0 5 0 null 4 null 104018 0 0 null null 4 null @@ -882,8 +882,8 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 104041 0 0 null null 4 null 104042 0 1 1040001 null 1 104030 104043 0 0 null null 4 null -104044 0 0 null null 5 104031 -104045 0 24 104023#104032 100001 4 null +104044 0 24 104023#104032 null 5 104031 +104045 0 9 7 100001 4 null 104046 0 0 null null 1 104033 104047 0 0 null null 4 null 104048 0 0 null null 1 104034 @@ -898,9 +898,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 104057 0 0 null null 1 104039 104058 0 0 null null 4 null 104059 0 0 null null 1 104040 -104060 0 24 104023#104048 100001 1 104041 +104060 0 24 104024#104048 100001 1 104041 104061 0 0 null null 4 null -104062 0 9 5 null 4 null +104062 0 9 7 null 4 null 104063 0 0 null null 0 null 104064 10402 5 0 null 4 null 104065 0 0 null null 0 null @@ -939,7 +939,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 104098 0 0 null null 1 104071 104099 0 1 1040005 null 5 104072 104100 0 0 null null 5 104073 -104101 0 9 5 null 4 null +104101 0 9 7 null 4 null 104102 0 0 null null 0 null 104103 0 0 null null 1 104076 104104 0 0 null null 4 null @@ -953,9 +953,9 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 104112 0 0 null null 4 null 104113 0 0 null null 4 null 104114 0 0 null null 0 null -104115 0 0 null null 0 null -104116 0 0 null null 0 null -104117 0 0 null null 0 null +104115 0 0 null null 1 null +104116 0 0 null null 4 null +104117 0 0 null null 4 null 104118 0 0 null null 4 null 104119 0 0 null null 1 104092 104120 0 0 null null 4 null @@ -982,20 +982,20 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 104141 0 0 null 10102 5 104109 104142 0 0 null null 4 null 104143 0 0 null null 0 null -104144 0 0 null null 0 null +104144 0 0 null 100003#102010 4 null 104145 0 0 null null 0 null 104146 0 0 null null 0 null 104147 0 0 null null 1 104110 -104148 0 27 6 null 1 104111 -104149 0 9 5 null 4 null +104148 0 27 8 null 1 104111 +104149 0 9 7 null 4 null 104150 0 0 null null 0 null 104151 0 0 null null 3 104115#104114|1#10401 104152 0 0 null null 4 null -104153 0 0 null null 4 null -104154 0 25 5#104026#104091 null 4 null -104155 0 0 null null 0 null -104156 0 0 null null 0 null -104157 0 0 null null 0 null +104153 0 9 7 null 4 null +104154 0 25 7#104026#104091 null 4 null +104155 0 0 null 100003#102010 4 null +104156 0 0 null 100003#102010 4 null +104157 0 0 null 100003#102010 4 null 104158 0 0 null null 4 null 104159 0 0 null null 4 null 104160 0 0 null null 4 null @@ -1016,7 +1016,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 104175 0 0 null null 5 null 104176 0 0 null null 5 null 104177 0 0 null null 5 null -104178 0 26 6 null 4 null +104178 0 26 8 null 4 null 104179 0 0 null null 1 104148 104180 0 0 null null 1 104149 104181 0 0 null null 1 104150 @@ -1026,23 +1026,200 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 104185 0 0 null null 5 104154 104186 0 0 null null 1 104155 104187 0 0 null null 1 104156 -104188 0 27 6 null 1 104157 -104189 0 19 5#0 null 4 null -105001 1 2 1503#1#105005 1005#1105#1205#1305 4 null +104188 0 27 8 null 1 104157 +104189 0 19 7#0 null 4 null +104190 0 0 null null 1 104159 +104191 0 0 null null 4 null +104192 0 0 null null 1 104160 +104193 0 0 null null 1 104161 +104194 0 0 null null 4 null +104195 0 1 10403 null 1 104161 +104196 0 0 null null 4 null +104197 0 0 null null 1 104163 +104198 0 0 null null 1 104162 +104199 0 0 null null 4 null +104200 0 0 null null 1 104159 +104201 0 0 null null 4 null +104202 0 1 10403 null 1 104164 +104203 0 0 null null 4 null +104204 0 0 null null 1 104161 +104205 0 0 null null 1 104165 +104206 0 0 null null 4 null +104207 0 0 null 100010 4 null +104208 0 0 null null 0 null +104209 0 0 null null 0 null +104210 0 0 null null 1 104167 +104211 0 0 null null 4 null +104212 0 0 null null 1 104168 +104213 0 0 null null 1 104169 +104214 0 0 null null 1 104170 +104215 0 2 1503#1 null 4 null +104216 0 2 1503#1 null 4 null +104217 0 2 1503#1 null 4 null +104218 0 0 null null 4 null +104219 0 0 null null 1 104172 +104220 0 0 null null 4 null +104221 0 1 10403 null 1 104173 +104222 0 0 null null 4 null +104223 0 0 null null 1 104174 +104224 0 0 null null 4 null +104225 0 0 null null 1 104176 +104226 0 0 null null 1 104175 +104227 0 0 null null 4 null +104228 0 1 10403 null 1 104176 +104229 0 1 10403 null 1 104177 +104230 0 0 null null 4 null +104231 0 1 10403 null 1 104178 +104232 0 0 null null 4 null +104233 0 0 null null 1 104179 +104234 0 0 null null 1 104179 +104235 0 0 null null 4 null +104236 0 0 null null 4 null +104237 0 0 null null 1 104181 +104238 0 0 null null 4 null +104239 0 1 10404 null 1 104182 +104240 0 0 null null 4 null +104241 0 1 10404 null 1 104183 +104242 0 0 null null 4 null +104243 0 0 null null 1 104184 +104244 0 0 null null 4 null +104245 0 0 null null 1 104185 +104246 0 0 null null 4 null +104247 0 1 10407 null 1 104186 +104248 0 0 null null 4 null +104249 0 0 null null 1 104187 +104250 0 0 null null 4 null +104251 0 0 null null 4 null +104252 0 0 null null 1 104189 +104253 0 0 null null 4 null +104254 0 1 10402 null 1 104190 +104255 0 0 null null 4 null +104256 0 0 null null 1 104191 +104257 0 0 null null 1 104192 +104258 0 0 null null 4 null +104259 0 1 10401 null 1 104192 +104260 0 1 10401 null 1 104193 +104261 0 0 null null 4 null +104262 0 1 10402 null 1 104194 +104263 0 0 null null 4 null +104264 0 0 null null 1 104195 +104265 0 0 null null 1 104195 +104266 0 0 null null 4 null +104267 0 1 10406 null 1 104196 +104268 0 0 null null 4 null +104269 0 0 null null 4 null +104270 0 0 null null 1 104198 +104271 0 0 null null 4 null +104272 0 0 null null 1 104199 +104273 0 0 null null 4 null +104274 0 0 null null 6 104200 +104275 0 0 null null 1 104201 +104276 0 0 null null 4 null +104277 0 0 null null 1 104202 +104278 0 1 10408 null 1 104203 +104279 0 0 null null 4 null +104280 0 0 null null 4 null +104281 0 0 null null 0 null +104282 0 0 null null 0 null +104283 0 0 null null 1 104206 +104284 0 0 null null 4 null +104285 0 0 null null 1 104207 +104286 0 0 null null 1 104207 +104287 0 0 null null 4 null +104288 0 1 10401 null 1 104208 +104289 0 0 null null 4 null +104290 0 0 null null 1 104209 +104291 0 0 null null 1 104209 +104292 0 0 null null 4 null +104293 0 1 10402 null 1 104210 +104294 0 0 null null 4 null +104295 0 1 10402 null 1 104211 +104296 0 0 null null 4 null +104297 0 1 10403 null 1 104212 +104298 0 0 null null 4 null +104299 0 1 10404 null 1 104213 +104300 0 0 null null 4 null +104301 0 0 null null 1 104214 +104302 0 0 null null 4 null +104303 0 1 10405 null 1 104215 +104304 0 0 null null 4 null +104305 0 0 null null 5 104216 +104306 0 0 null null 4 null +104307 0 0 null null 0 null +104308 0 0 null null 1 104219 +104309 0 0 null null 4 null +104310 0 0 null null 4 null +104311 0 0 null null 1 104221 +104312 0 0 null null 4 null +104313 0 0 null null 4 null +104314 0 0 null null 1 104223 +104315 0 0 null null 4 null +104316 0 1 10401 null 1 104224 +104317 0 0 null null 4 null +104318 0 0 null null 1 104225 +104319 0 0 null null 4 null +104320 0 1 10402 null 1 104226 +104321 0 0 null null 4 null +104322 0 0 null null 1 104227 +104323 0 0 null null 4 null +104324 0 1 10403 null 4 null +104325 0 0 null null 4 null +104326 0 0 null null 1 104229 +104327 0 0 null null 4 null +104328 0 1 10402 null 1 104230 +104329 0 0 null null 4 null +104330 0 0 null null 1 104231 +104331 0 0 null null 4 null +104332 0 1 10403 null 1 104232 +104333 0 0 null null 4 null +104334 0 0 null null 1 104233 +104335 0 0 null null 4 null +104336 0 0 null null 4 null +104337 0 0 null null 1 104235 +104338 0 0 null null 4 null +104339 0 1 10401 null 1 104236 +104340 0 0 null null 4 null +104341 0 1 10402 null 1 104237 +104342 0 0 null null 4 null +104343 0 0 null null 1 104238 +104344 0 0 null null 4 null +104345 0 1 10402 null 1 104239 +104346 0 0 null null 4 null +104347 0 1 10403 null 4 null +104348 0 0 null null 4 null +104349 0 0 null null 1 104241 +104350 0 0 null null 4 null +104351 0 0 null null 1 104242 +104352 0 0 null null 1 104242 +104353 0 0 null null 1 104243 +104354 0 0 null null 4 null +104355 0 0 null null 4 null +104356 0 0 null null 4 null +104357 0 0 null null 1 104245 +104358 0 0 null null 4 null +104359 0 0 null null 1 104246 +104360 0 1 10408 null 1 104247 +104361 0 1 10408 null 1 104247 +104362 0 1 10408 null 1 104247 +104363 0 0 null null 4 null +104364 0 0 null null 1 104248 +104365 0 0 null null 4 null +0 0 0 null null 0 null +105001 1 29 1503#1 1005#1105#1205#1305 4 null 105002 0 0 null null 4 null -105003 1 2 1503#1#105006 1005#1105#1205#1305 4 null +105003 1 29 1503#1 1005#1105#1205#1305 4 null 105004 0 0 null null 4 null -105005 1 2 1503#1#105007 1005#1105#1205#1305 4 null +105005 1 29 1503#1 1005#1105#1205#1305 4 null 105006 0 0 null null 4 null -105007 1 2 1503#1#105008 1005#1105#1205#1305 4 null +105007 1 29 1503#1 1005#1105#1205#1305 4 null 105008 0 0 null null 4 null -105009 1 2 1503#1#105009 1005#1105#1205#1305 4 null +105009 1 29 1503#1 1005#1105#1205#1305 4 null 105010 0 0 null null 4 null -105011 1 2 1503#1#105010 1005#1105#1205#1305 4 null +105011 1 29 1503#1 1005#1105#1205#1305 4 null 105012 0 0 null null 4 null -105013 1 2 1503#1#105011 1005#1105#1205#1305 4 null +105013 1 29 1503#1 1005#1105#1205#1305 4 null 105014 0 0 null null 4 null -105015 1 2 1503#1#105012 1005#1105#1205#1305 4 null +105015 1 29 1503#1 1005#1105#1205#1305 4 null 105016 0 0 null null 4 null 105017 0 0 null null 4 null 105018 0 0 null null 4 null @@ -1145,8 +1322,8 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 105115 0 0 null null 1 105074 105116 0 0 null null 5 105075 105117 0 0 null null 5 105076 -105118 0 27 7 null 1 105077 -105119 0 9 6 null 4 null +105118 0 27 9 null 1 105077 +105119 0 9 8 null 4 null 105120 0 0 null null 4 null 105121 0 0 null null 4 null 105122 0 0 null null 4 null @@ -1200,7 +1377,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 105170 0 0 null null 4 null 105171 0 0 null null 1 null 105172 0 0 null null 1 null -105173 0 26 7 null 4 null +105173 0 26 9 null 4 null 105174 0 0 null null 1 105115 105175 0 0 null null 5 105116 105176 0 0 null null 5 105117 @@ -1217,24 +1394,24 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 105187 0 0 null null 1 105128 105188 0 0 null null 5 105129 105189 0 0 null null 5 105130 -105190 0 27 7 null 1 105131 -105191 0 19 6#0 null 4 null +105190 0 27 9 null 1 105131 +105191 0 19 8#0 null 4 null 105192 10502 5 0 null 4 null -106001 1 2 1503#1#106004 10102 4 null +106001 1 29 1503#1 10102 4 null 106002 0 0 null null 4 null -106003 1 2 1503#1#106005 10102 4 null +106003 1 29 1503#1 10102 4 null 106004 0 0 null null 4 null -106005 1 2 1503#1#106006 10102 4 null +106005 1 29 1503#1 10102 4 null 106006 0 0 null null 4 null -106007 1 2 1503#1#106007 10102 4 null +106007 1 29 1503#1 10102 4 null 106008 0 0 null null 4 null -106009 1 2 1503#1#106008 10102 4 null +106009 1 29 1503#1 10102 4 null 106010 0 0 null null 4 null -106011 1 2 1503#1#106009 10102 4 null +106011 1 29 1503#1 10102 4 null 106012 0 0 null null 4 null -106013 1 2 1503#1#106010 10102 4 null +106013 1 29 1503#1 10102 4 null 106014 0 0 null null 4 null -106015 1 2 1503#1#106011 10102 4 null +106015 1 29 1503#1 10102 4 null 106016 0 0 null null 4 null 106017 0 5 0 null 4 null 106018 0 0 null null 4 null @@ -1268,7 +1445,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 106046 0 0 null null 4 null 106047 0 0 null null 1 106030 106048 0 0 null null 4 null -106049 0 25 7#106021#106037 null 4 null +106049 0 25 9#106021#106037 null 4 null 106050 0 0 null null 0 null 106051 10602 5 0 null 4 null 106052 0 0 null null 0 null @@ -1301,8 +1478,8 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 106079 0 0 null null 1 106051 106080 0 1 1060004 null 1 106052 106081 0 0 null null 1 106053 -106082 0 27 8 null 1 106054 -106083 0 25 7#106023#106056 null 4 null +106082 0 27 10 null 1 106054 +106083 0 25 9#106023#106056 null 4 null 106084 0 0 null null 4 null 106085 0 0 null null 1 106057 106086 0 0 null null 4 null @@ -1329,7 +1506,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 106107 0 1 1060006 null 5 106067 106108 0 0 null null 5 106068 106109 0 0 null null 5 106069 -106110 0 9 8 null 4 null +106110 0 9 10 null 4 null 106111 0 0 null null 5 106073 106112 0 0 null null 0 null 106113 0 0 null null 0 null @@ -1345,27 +1522,27 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 106123 0 0 null null 4 null 106124 0 0 null null 1 106089 106125 0 0 null null 1 106090 -106126 0 27 8 null 1 106091 -106127 0 19 7#0 null 4 null -107001 1 2 1503#1#107005 10102 4 null +106126 0 27 10 null 1 106091 +106127 0 19 9#0 null 4 null +107001 1 29 1503#1 10102 4 null 107002 0 0 null null 4 null -107003 1 2 1503#1#107006 10102 4 null +107003 1 29 1503#1 10102 4 null 107004 0 0 null null 4 null -107005 1 2 1503#1#107007 10102 4 null +107005 1 29 1503#1 10102 4 null 107006 0 0 null null 4 null -107007 1 2 1503#1#107008 10102 4 null +107007 1 29 1503#1 10102 4 null 107008 0 0 null null 4 null -107009 1 2 1503#1#107009 10102 4 null +107009 1 29 1503#1 10102 4 null 107010 0 0 null null 4 null -107011 1 2 1503#1#107010 10102 4 null +107011 1 29 1503#1 10102 4 null 107012 0 0 null null 4 null -107013 1 2 1503#1#107011 10102 4 null +107013 1 29 1503#1 10102 4 null 107014 0 0 null null 4 null -107015 1 2 1503#1#107012 10102 4 null +107015 1 29 1503#1 10102 4 null 107016 0 0 null null 4 null 107017 0 5 0 null 4 null 107018 0 0 null null 4 null -107019 0 19 8#108#5#19 null 4 null +107019 0 19 10#108#5#19 null 4 null 107020 0 0 null null 4 null 107021 0 0 null null 4 null 107022 0 1 10101 null 1 107017 @@ -1410,7 +1587,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 107061 0 0 null null 5 107051 107062 0 0 null null 1 107052 107063 0 0 null null 1 107053 -107064 0 11 8|107#15#2#107014 null 1 107054 +107064 0 11 10|107#15#2#107014 null 1 107054 107065 0 15 107023 null 4 null 107066 0 0 null null 4 null 107067 0 0 null null 4 null @@ -1513,22 +1690,22 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 108092 0 0 null null 1 108065 108093 0 22 9#108018#109#5#17 null 4 null 108094 0 0 null null 4 null -108095 1 2 1503#1#108019 10102 4 null +108095 1 29 1503#1 10102 4 null 108096 0 0 null null 4 null -108097 1 2 1503#1#108020 10102 4 null +108097 1 29 1503#1 10102 4 null 108098 0 0 null null 4 null -108099 1 2 1503#1#108021 10102 4 null +108099 1 29 1503#1 10102 4 null 108100 0 0 null null 4 null 109001 0 5 0 null 4 null 109002 0 0 null null 4 null -109003 0 19 10#0 null 4 null +109003 0 19 12#0 null 4 null 109004 0 0 null 10102 4 null 109005 0 0 null null 1 109012 109006 0 0 null null 4 null 109007 0 0 null null 4 null 109008 0 0 null null 4 null 109009 1 16 1503#1 null 5 109016 -109010 0 23 10 null 4 null +109010 0 23 12 null 4 null 109011 0 0 null null 1 109017 109012 0 0 null null 5 109018 109013 0 0 null null 5 109019 @@ -1536,7 +1713,7 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 109015 0 0 null null 1 109021 109016 0 0 null null 5 109022 109017 0 0 null null 5 109023 -109018 0 9 10 null 4 null +109018 0 9 12 null 4 null 109019 0 0 null null 1 109025 109020 0 0 null null 1 109026 109021 0 0 null null 1 109027 @@ -1586,25 +1763,25 @@ int int int mut,int#int,2 mut,int#int,1 int mut,int#int,2 109065 0 0 null null 4 null 109066 0 0 null null 4 null 109067 0 0 null null 4 null -109068 1 2 1503#1#109027 10102 4 null +109068 1 29 1503#1 10102 4 null 109069 0 0 null null 4 null -109070 1 2 1503#1#109028 10102 4 null +109070 1 29 1503#1 10102 4 null 109071 0 0 null null 4 null -109072 1 2 1503#1#109029 10102 4 null +109072 1 29 1503#1 10102 4 null 109073 0 0 null null 4 null -109074 1 2 1503#1#109030 10102 4 null +109074 1 29 1503#1 10102 4 null 109075 0 0 null null 4 null -109076 1 2 1503#1#109031 10102 4 null +109076 1 29 1503#1 10102 4 null 109077 0 0 null null 4 null -109078 1 2 1503#1#109032 10102 4 null +109078 1 29 1503#1 10102 4 null 109079 0 0 null null 4 null -110001 1 2 1503#1#110007 10102 4 null +110001 1 29 1503#1 10102 4 null 110002 0 0 null null 4 null -110003 1 2 1503#1#110008 10102 4 null +110003 1 29 1503#1 10102 4 null 110004 0 0 null null 4 null -110005 1 2 1503#1#110009 10102 4 null +110005 1 29 1503#1 10102 4 null 110006 0 0 null null 4 null -110007 1 2 1503#1#110010 10102 4 null +110007 1 29 1503#1 10102 4 null 110008 0 0 null null 4 null 110009 0 5 0 null 4 null 110010 0 0 null null 4 null diff --git a/conf/server/PropertyConfig.txt b/conf/server/PropertyConfig.txt index b857093fd..882c8e45f 100644 --- a/conf/server/PropertyConfig.txt +++ b/conf/server/PropertyConfig.txt @@ -5,6 +5,7 @@ int int float 3 1 0.5 4 1 0.5 5 1 0.5 +6 1 0.0 51 2 0.0 52 2 0.0 53 2 0.5