From d9ac7c1dd29fdbec3cf02e0e1999ae51369875a2 Mon Sep 17 00:00:00 2001 From: gaojie Date: Wed, 16 Jan 2019 16:50:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E7=89=8C=E9=9D=99=E6=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/server/HeroConfig.txt | 115 +++++++++--------- .../java/com/ljsd/jieling/config/SCHero.java | 42 ++++--- .../com/ljsd/jieling/logic/STableManager.java | 4 +- .../com/ljsd/jieling/util/CBean2Proto.java | 1 - 4 files changed, 83 insertions(+), 79 deletions(-) diff --git a/conf/server/HeroConfig.txt b/conf/server/HeroConfig.txt index ca12bd656..5417406e7 100644 --- a/conf/server/HeroConfig.txt +++ b/conf/server/HeroConfig.txt @@ -1,58 +1,57 @@ -Id PiecesId PiecesCount Quality Profession ProfessionResourceId PropertyName Hp Attack PhysicalDefence MagicDefence Speed SkillId RankupConsumeMaterial -int int int int int int int float float float float float mut,int#int,2 mut,int#int,2 -1 2001 0 0 0 1203 1 2389 164 278 0 176 10100#10|10101#20 null -2 2002 0 0 0 1202 1 2277 155 260 0 158 10100#10|10101#20 null -3 2003 0 0 0 1202 1 2275 159 263 0 172 10100#10|10101#20 null -4 2004 0 0 0 1201 1 2269 183 0 277 132 10100#10|10101#20 null -5 2005 0 0 0 1203 1 2163 173 0 258 176 10100#10|10101#20 null -6 2006 0 0 0 1202 1 2165 174 0 261 176 10100#10|10101#20 null -7 2007 0 0 0 1201 2 2159 169 0 262 176 10100#10|10101#20 null -8 2008 0 0 0 1202 2 2020 206 0 222 132 10100#10|10101#20 null -9 2009 0 0 0 1203 2 1923 198 0 212 163 10100#10|10101#20 null -10 2010 0 0 0 1201 2 1925 200 0 208 132 10100#10|10101#20 null -11 2011 0 0 0 1201 2 1925 199 0 203 150 10100#10|10101#20 null -12 2012 0 0 0 1202 2 1763 251 201 0 150 10100#10|10101#20 null -13 2013 0 0 0 1202 3 1675 239 194 0 163 10100#10|10101#20 null -14 2014 0 0 0 1201 3 1684 235 197 0 185 10100#10|10101#20 null -15 2015 0 0 0 1203 3 1680 237 193 0 176 10100#10|10101#20 null -16 2016 0 0 0 1202 3 1513 293 167 0 154 10100#10|10101#20 null -17 2017 0 0 0 1201 3 1439 278 159 0 154 10100#10|10101#20 null -18 2018 0 0 0 1201 3 1439 278 159 0 154 10100#10|10101#20 null -19 2019 0 0 0 1201 4 1444 281 153 0 154 10100#10|10101#20 null -20 2020 0 0 0 1202 4 2277 159 261 0 154 10100#10|10101#20 null -21 2021 0 0 0 1201 4 1936 131 225 0 176 10100#10|10101#20 null -22 2022 0 0 0 1203 4 1637 168 0 178 163 10100#10|10101#20 null -23 2023 0 0 0 1201 4 1431 200 162 0 194 10100#10|10101#20 null -24 2024 0 0 0 1202 4 1220 239 133 0 154 10100#10|10101#20 null -25 2025 0 0 0 1203 4 1832 143 0 222 176 10100#10|10101#20 null -26 2026 0 0 0 1201 4 1934 136 226 0 176 10100#10|10101#20 null -27 2027 0 0 0 1201 4 1628 173 0 175 163 10100#10|10101#20 null -28 2028 0 0 0 1201 4 1428 209 165 0 194 10100#10|10101#20 null -29 1000 0 0 0 1201 4 1222 235 132 0 154 10100#10|10101#20 null -30 1000 0 0 0 1201 4 1834 149 0 224 176 10100#10|10101#20 null -31 1000 0 0 0 1201 4 1940 131 220 0 176 10100#10|10101#20 null -32 1000 0 0 0 1201 4 1632 165 0 177 163 10100#10|10101#20 null -33 1000 0 0 0 1201 4 1429 205 164 0 194 10100#10|10101#20 null -34 1000 0 0 0 1201 4 1221 242 135 0 154 10100#10|10101#20 null -35 1000 0 0 0 1201 4 1834 147 0 225 176 10100#10|10101#20 null -36 1000 0 0 0 1201 4 1934 136 217 0 176 10100#10|10101#20 null -37 1000 0 0 0 1201 4 1637 170 0 179 163 10100#10|10101#20 null -38 1000 0 0 0 1201 4 1427 201 170 0 194 10100#10|10101#20 null -39 1000 0 0 0 1201 4 1300 235 129 0 154 10100#10|10101#20 null -40 1000 0 0 0 1201 4 1948 147 0 219 176 10100#10|10101#20 null -41 1000 0 0 0 1201 4 1938 135 224 0 176 10100#10|10101#20 null -42 1000 0 0 0 1201 4 1636 174 0 179 163 10100#10|10101#20 null -43 1000 0 0 0 1201 4 1943 132 217 0 176 10100#10|10101#20 null -44 1000 0 0 0 1201 4 1627 166 0 181 163 10100#10|10101#20 null -45 1000 0 0 0 1202 4 1433 209 166 0 194 10100#10|10101#20 null -46 1000 0 0 0 1201 4 1228 241 131 0 154 10100#10|10101#20 null -47 1000 0 0 0 1201 4 1836 146 0 226 176 10100#10|10101#20 null -48 1000 0 0 0 1201 4 1939 141 223 0 176 10100#10|10101#20 null -49 1000 0 0 0 1201 4 1635 175 0 173 163 10100#10|10101#20 null -50 1000 0 0 0 1201 4 1424 208 166 0 194 10100#10|10101#20 null -51 1000 0 0 0 1201 4 1222 234 132 0 154 10100#10|10101#20 null -52 1000 0 0 0 1201 4 1834 140 0 220 176 10100#10|10101#20 null -53 1000 0 0 0 1201 4 1943 135 219 0 176 10100#10|10101#20 null -54 1000 0 0 0 1201 4 1630 169 0 176 163 10100#10|10101#20 null -55 1000 0 0 0 1201 4 1508 205 163 0 194 10100#10|10101#20 null -56 1000 0 0 0 1201 4 1297 242 137 0 154 10100#10|10101#20 null +Id PiecesId PiecesCount Profession PropertyName MaxRank Hp Attack PhysicalDefence MagicDefence Speed SkillId RankupConsumeMaterial +int int int int int int float float float float float mut,int#int,2 mut,int#int,2 +1 2001 0 1 1 10 2389 164 278 0 176 10100#10|10101#20 null +2 2002 0 5 2 10 2277 155 260 0 158 10100#10|10101#20 null +3 2003 0 2 3 10 2275 159 263 0 172 10100#10|10101#20 null +4 2004 0 3 4 10 2269 183 0 277 132 10100#10|10101#20 null +5 2005 0 4 5 10 2163 173 0 258 176 10100#10|10101#20 null +6 2006 0 3 6 10 2165 174 0 261 176 10100#10|10101#20 null +7 2007 0 0 2 10 2159 169 0 262 176 10100#10|10101#20 null +8 2008 0 0 2 10 2020 206 0 222 132 10100#10|10101#20 null +9 2009 0 0 2 10 1923 198 0 212 163 10100#10|10101#20 null +10 2010 0 0 2 10 1925 200 0 208 132 10100#10|10101#20 null +11 2011 0 0 2 10 1925 199 0 203 150 10100#10|10101#20 null +12 2012 0 0 2 10 1763 251 201 0 150 10100#10|10101#20 null +13 2013 0 0 3 10 1675 239 194 0 163 10100#10|10101#20 null +14 2014 0 0 3 10 1684 235 197 0 185 10100#10|10101#20 null +15 2015 0 0 3 10 1680 237 193 0 176 10100#10|10101#20 null +16 2016 0 0 3 10 1513 293 167 0 154 10100#10|10101#20 null +17 2017 0 0 3 10 1439 278 159 0 154 10100#10|10101#20 null +18 2018 0 0 3 10 1439 278 159 0 154 10100#10|10101#20 null +19 2019 0 0 4 10 1444 281 153 0 154 10100#10|10101#20 null +20 2020 0 0 4 10 2277 159 261 0 154 10100#10|10101#20 null +21 2021 0 0 4 10 1936 131 225 0 176 10100#10|10101#20 null +22 2022 0 0 4 10 1637 168 0 178 163 10100#10|10101#20 null +23 2023 0 0 4 10 1431 200 162 0 194 10100#10|10101#20 null +24 2024 0 0 4 10 1220 239 133 0 154 10100#10|10101#20 null +25 2025 0 0 4 10 1832 143 0 222 176 10100#10|10101#20 null +26 2026 0 0 4 10 1934 136 226 0 176 10100#10|10101#20 null +27 2027 0 0 4 10 1628 173 0 175 163 10100#10|10101#20 null +28 2028 0 0 4 10 1428 209 165 0 194 10100#10|10101#20 null +29 2029 0 0 4 10 1222 235 132 0 154 10100#10|10101#20 null +30 2030 0 0 4 10 1834 149 0 224 176 10100#10|10101#20 null +31 2031 0 0 4 10 1940 131 220 0 176 10100#10|10101#20 null +32 2032 0 0 4 10 1632 165 0 177 163 10100#10|10101#20 null +33 2033 0 0 4 10 1429 205 164 0 194 10100#10|10101#20 null +34 2034 0 0 4 10 1221 242 135 0 154 10100#10|10101#20 null +35 2035 0 0 4 10 1834 147 0 225 176 10100#10|10101#20 null +36 2036 0 0 4 10 1934 136 217 0 176 10100#10|10101#20 null +37 2037 0 0 4 10 1637 170 0 179 163 10100#10|10101#20 null +38 2038 0 0 4 10 1427 201 170 0 194 10100#10|10101#20 null +39 2039 0 0 4 10 1300 235 129 0 154 10100#10|10101#20 null +40 2040 0 0 4 10 1948 147 0 219 176 10100#10|10101#20 null +41 2041 0 0 4 10 1938 135 224 0 176 10100#10|10101#20 null +42 2042 0 0 4 10 1636 174 0 179 163 10100#10|10101#20 null +43 2043 0 0 4 10 1943 132 217 0 176 10100#10|10101#20 null +44 2044 0 0 4 10 1627 166 0 181 163 10100#10|10101#20 null +45 2045 0 0 4 10 1433 209 166 0 194 10100#10|10101#20 null +46 2046 0 0 4 10 1228 241 131 0 154 10100#10|10101#20 null +47 2047 0 0 4 10 1836 146 0 226 176 10100#10|10101#20 null +48 2048 0 0 4 10 1939 141 223 0 176 10100#10|10101#20 null +49 2049 0 0 4 10 1635 175 0 173 163 10100#10|10101#20 null +50 2050 0 0 4 10 1424 208 166 0 194 10100#10|10101#20 null +51 2051 0 0 4 10 1222 234 132 0 154 10100#10|10101#20 null +52 2052 0 0 4 10 1834 140 0 220 176 10100#10|10101#20 null +53 2053 0 0 4 10 1943 135 219 0 176 10100#10|10101#20 null +54 2054 0 0 4 10 1630 169 0 176 163 10100#10|10101#20 null +55 2055 0 0 4 10 1508 205 163 0 194 10100#10|10101#20 null \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SCHero.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SCHero.java index 342da7455..210016388 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SCHero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SCHero.java @@ -16,23 +16,25 @@ public class SCHero implements BaseConfig{ private int piecesCount; - private int quality; + private int propertyName; //角色属性 - private int profession; + private int profession; //角色职业 - private int maxRank; + private int maxRank; //角色最高星级 private float hp; - private float attack; + private float attack; //攻击力 - private float pDefence; + private float physicalDefence; //护甲 - private float mDefence; + private float magicDefence; //魔抗 - private float speed; + private float speed; //速度 - private String skillList; + private int[][] skillId; + + private int[][] rankupConsumeMaterial; @Override public void init() throws Exception { @@ -58,10 +60,6 @@ public class SCHero implements BaseConfig{ return piecesCount; } - public int getQuality() { - return quality; - } - public int getProfession() { return profession; } @@ -78,19 +76,27 @@ public class SCHero implements BaseConfig{ return attack; } - public float getpDefence() { - return pDefence; + public float getPhysicalDefence() { + return physicalDefence; } - public float getmDefence() { - return mDefence; + public float getMagicDefence() { + return magicDefence; } public float getSpeed() { return speed; } - public String getSkillList() { - return skillList; + public int getPropertyName() { + return propertyName; + } + + public int[][] getSkillId() { + return skillId; + } + + public int[][] getRankupConsumeMaterial() { + return rankupConsumeMaterial; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java index 966db3c48..fa91b1b7e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/STableManager.java @@ -168,7 +168,7 @@ public class STableManager { * 处理参数 */ private static void dealParams(Class clazz, Map map, List key, List type, T obj, String[] prarms) throws NoSuchFieldException, IllegalAccessException { - int id = Integer.parseInt(prarms[0]); + int id = Integer.parseInt(prarms[0]); for (int i = 0; i < prarms.length; i++) { try { Field field = clazz.getDeclaredField(key.get(i)); @@ -180,7 +180,7 @@ public class STableManager { break; case "string": case "stringt": - if (!"null".equalsIgnoreCase(prarms[i])) { + if (!"null".equalsIgnoreCase(prarms[i]) || !"".equalsIgnoreCase(prarms[i])) { field.set(obj, prarms[i]); } break; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index f2817d53a..fdfaa9c91 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -28,7 +28,6 @@ public class CBean2Proto { public static CommonProto.Common.Item getItem(Item item){ CommonProto.Common.Item itemProto = CommonProto.Common.Item .newBuilder() - .setId(item.getId()) .setItemId(item.getItemId()) .setItemNum(item.getItemNum()) .setItemType(item.getItemType())