diff --git a/conf/server/1.Map_101.txt b/conf/server/1.Map_101.txt new file mode 100644 index 000000000..04d2194b5 --- /dev/null +++ b/conf/server/1.Map_101.txt @@ -0,0 +1,24 @@ +id Event Groups +int int mut,int#int,2 +1 101005 9#14|10#14|9#15|10#15 +2 101001 5#8|6#8|5#9|6#9 +3 101005 8#11|9#11|8#12|9#12 +4 101005 7#19|8#19|8#20 +5 101010 8#9 +6 101008 10#11 +7 101009 2#18 +8 101004 10#5|10#6 +9 101005 1#7|2#7|1#8|2#8 +10 101005 2#14|3#14|2#15|3#15 +11 101006 8#3 +12 101007 5#5 +13 101001 3#16|4#16|3#17|4#17 +14 101011 7#16 +15 101001 6#2|5#3|6#3 +16 101001 8#4|9#4|8#5|7#6|7#7 +17 101012 3#5|4#5|3#6|4#6 +18 101005 4#19|3#20 +19 101001 4#11|4#12 +20 101002 1#12|2#12|1#13|2#13|5#18|6#18|6#19 +21 101001 6#14|6#15 +22 101003 4#4 diff --git a/conf/server/ItemConfig.txt b/conf/server/ItemConfig.txt index f824d803e..dd32c333e 100644 --- a/conf/server/ItemConfig.txt +++ b/conf/server/ItemConfig.txt @@ -1,6 +1,6 @@ Id BackpackOrNot ItemType ItemBaseType Quantity IsStacking int bool int int int bool -1 false 1 1 5 false -2 true 1 1 5 false -3 true 1 1 5 false -4 false 1 1 5 false \ No newline at end of file +1 false 1 1 5 false +2 true 1 1 5 false +3 true 1 1 5 false +4 false 1 1 5 false diff --git a/conf/server/MapConfig.txt b/conf/server/MapConfig.txt new file mode 100644 index 000000000..b4804f9e8 --- /dev/null +++ b/conf/server/MapConfig.txt @@ -0,0 +1,12 @@ +Id Info Size MoveConfused EnergyConfused OpenRule +int string mut,int#int,1 int int string +101 战乱荒林 20#10 1 10 null +102 林渊深处 20#10 2 10 null +103 三途津 20#15 2 20 null +104 青龙门 15#20 2 20 null +105 风见原野 20#20 2 20 null +106 荒芜丘陵 20#10 2 20 null +107 观澜港 20#15 2 20 null +108 白叶渡 20#20 2 20 null +109 荆棘流域 30#30 2 20 null +110 中心枢纽 20#10 2 20 null diff --git a/conf/server/MapEventsConfig.txt b/conf/server/MapEventsConfig.txt new file mode 100644 index 000000000..e868acd0e --- /dev/null +++ b/conf/server/MapEventsConfig.txt @@ -0,0 +1,28 @@ +Id Style Refresh TriggerRules IsSchedule ExploreValues +int int int int bool int +101001 1 2 1 0 0 +101002 2 2 1 0 0 +101003 4 2 1 0 0 +101004 1 2 1 0 0 +101005 1 2 1 0 0 +101006 5 3 1 0 0 +101007 5 4 1 0 0 +101008 5 2 1 0 0 +101009 5 3 1 0 0 +101010 5 2 1 0 0 +101011 5 2 1 0 0 +101012 3 2 1 0 0 +102001 1 2 1 0 0 +102002 1 2 1 0 0 +102003 1 2 1 0 0 +102004 1 2 1 0 0 +102005 5 3 1 0 0 +102006 5 3 1 0 0 +102007 5 3 1 0 0 +102008 5 3 1 0 0 +102009 5 3 1 0 0 +102010 2 1 1 0 0 +102011 2 2 1 0 0 +102012 2 2 1 0 0 +102013 2 1 1 0 0 +102014 2 2 1 0 0 \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapConfig.java index 44f8bf8ba..a568671f6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapConfig.java @@ -6,14 +6,15 @@ import com.ljsd.jieling.logic.Table; import java.util.Map; -@Table(name = "1.MapConfig") +@Table(name = "MapConfig") public class SCMapConfig implements BaseConfig { public static Map sCMapSize; private int id; private String info; private int[] size; // 0:行 1列 - private int confused; //地图消耗 - private String openRule; // 开启条件 + private int moveConfused; //地图上的行动力消耗 + private int energyConfused; //妖灵师精力消耗 + private String openRule; //开启条件 @Override public void init() throws Exception { sCMapSize = STableManager.getConfig(SCMapConfig.class); @@ -27,12 +28,20 @@ public class SCMapConfig implements BaseConfig { return info; } + public static Map getsCMapSize() { + return sCMapSize; + } + public int[] getSize() { return size; } - public int getConfused() { - return confused; + public int getMoveConfused() { + return moveConfused; + } + + public int getEnergyConfused() { + return energyConfused; } public String getOpenRule() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapEvent.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapEvent.java index 9a67dbc38..7ab27198c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapEvent.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SCMapEvent.java @@ -5,9 +5,8 @@ import com.ljsd.jieling.logic.Table; import java.util.Map; -@Table(name = "2.MapEventsConfig") +@Table(name = "MapEventsConfig") public class SCMapEvent implements BaseConfig{ - public static Map scMapEventMap; private int id; @@ -23,6 +22,20 @@ public class SCMapEvent implements BaseConfig{ * 3一次性 */ private int refresh; + /** + * 事件点触发规则 + * 1边缘触发 + * 2覆盖触发 + */ + private int triggerRules; + /** + * 是否记录进度 + */ + private boolean isSchedule; + /** + * 探索值 + */ + private int exploreValues; @Override public void init() throws Exception { @@ -40,4 +53,20 @@ public class SCMapEvent implements BaseConfig{ public int getRefresh() { return refresh; } + + public static Map getScMapEventMap() { + return scMapEventMap; + } + + public int getTriggerRules() { + return triggerRules; + } + + public boolean isSchedule() { + return isSchedule; + } + + public int getExploreValues() { + return exploreValues; + } }