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