diff --git a/conf/server/HeroConfig.txt b/conf/server/HeroConfig.txt index 8e00f8749..6d0826e43 100644 --- a/conf/server/HeroConfig.txt +++ b/conf/server/HeroConfig.txt @@ -1,58 +1,58 @@ -Id PiecesId PiecesCount Star Profession PropertyName MaxRank Hp Attack PhysicalDefence MagicDefence Speed SkillId RankupConsumeMaterial +Id PiecesId PiecesCount Star Profession PropertyName MaxRank Hp Attack PhysicalDefence MagicDefence Speed RankupConsumeMaterial OpenSkillRules int int int int int int int float float float float float mut,int#int,2 mut,int#int,2 -10001 11001 50 5 1 1 10 2390 167 275 96 176 10100#10|10101#20 null -10002 11002 50 5 5 2 10 2278 165 265 93 158 10100#10|10101#20 null -10003 11003 50 5 2 3 10 2277 155 259 91 172 10100#10|10101#20 null -10004 11004 50 5 3 4 10 2263 183 97 278 132 10100#10|10101#20 null -10005 11005 50 5 4 5 10 2163 170 92 263 176 10100#10|10101#20 null -10006 11006 50 5 3 6 10 2159 174 93 265 176 10100#10|10101#20 null -10007 11007 50 5 0 2 10 2161 168 91 261 176 10100#10|10101#20 null -10008 11008 50 5 0 2 10 2016 208 77 220 132 10100#10|10101#20 null -10009 11009 50 5 0 2 10 1922 196 74 212 163 10100#10|10101#20 null -10010 11010 50 5 0 2 10 1919 202 71 203 132 10100#10|10101#20 null -10011 11011 50 5 0 2 10 1921 198 71 203 150 10100#10|10101#20 null -10012 11012 50 5 0 2 10 1768 253 201 70 150 10100#10|10101#20 null -10013 11013 50 5 0 3 10 1682 244 199 70 163 10100#10|10101#20 null -10014 11014 50 5 0 3 10 1676 245 200 70 185 10100#10|10101#20 null -10015 11015 50 5 0 3 10 1680 245 198 69 176 10100#10|10101#20 null -10016 11016 50 5 0 3 10 1507 293 160 56 154 10100#10|10101#20 null -10017 11017 50 5 0 3 10 1437 278 157 55 154 10100#10|10101#20 null -10018 11018 50 5 0 3 10 1440 285 154 54 154 10100#10|10101#20 null -10019 11019 50 5 0 4 10 1440 284 159 56 154 10100#10|10101#20 null -10020 11020 50 5 0 4 10 2280 164 256 90 154 10100#10|10101#20 null -10021 11021 40 4 0 4 10 1941 133 218 76 176 10100#10|10101#20 null -10022 11022 40 4 0 4 10 1630 175 62 178 163 10100#10|10101#20 null -10023 11023 40 4 0 4 10 1428 208 161 56 194 10100#10|10101#20 null -10024 11024 40 4 0 4 10 1225 237 135 47 154 10100#10|10101#20 null -10025 11025 40 4 0 4 10 1831 148 78 223 176 10100#10|10101#20 null -10026 11026 40 4 0 4 10 1943 132 223 78 176 10100#10|10101#20 null -10027 11027 40 4 0 4 10 1629 169 61 173 163 10100#10|10101#20 null -10028 11028 40 4 0 4 10 1431 203 166 58 194 10100#10|10101#20 null -10029 11029 40 4 0 4 10 1223 241 136 48 154 10100#10|10101#20 null -10030 11030 40 4 0 4 10 1835 140 76 218 176 10100#10|10101#20 null -10031 11031 40 4 0 4 10 1940 133 221 77 176 10100#10|10101#20 null -10032 11032 40 4 0 4 10 1636 172 61 175 163 10100#10|10101#20 null -10033 11033 40 4 0 4 10 1433 209 169 59 194 10100#10|10101#20 null -10034 11034 40 4 0 4 10 1222 237 137 48 154 10100#10|10101#20 null -10035 11035 40 4 0 4 10 1832 147 76 217 176 10100#10|10101#20 null -10036 11036 40 4 0 4 10 1933 137 217 76 176 10100#10|10101#20 null -10037 11037 40 4 0 4 10 1630 170 63 180 163 10100#10|10101#20 null -10038 11038 40 4 0 4 10 1428 204 169 59 194 10100#10|10101#20 null -10039 11039 40 4 0 4 10 1292 235 136 48 154 10100#10|10101#20 null -10040 11040 40 4 0 4 10 1945 142 78 224 176 10100#10|10101#20 null -10041 11041 40 4 0 4 10 1935 134 225 79 176 10100#10|10101#20 null -10042 11042 40 4 0 4 10 1634 172 63 179 163 10100#10|10101#20 null -10043 11043 40 4 0 4 10 1943 134 220 77 176 10100#10|10101#20 null -10044 11044 40 4 0 4 10 1629 169 61 173 163 10100#10|10101#20 null -10045 11045 40 4 0 4 10 1423 200 167 58 194 10100#10|10101#20 null -10046 11046 30 3 0 4 10 1222 240 135 47 154 10100#10|10101#20 null -10047 11047 30 3 0 4 10 1838 140 79 225 176 10100#10|10101#20 null -10048 11048 30 3 0 4 10 1940 138 220 77 176 10100#10|10101#20 null -10049 11049 30 3 0 4 10 1627 165 62 176 163 10100#10|10101#20 null -10050 11050 30 3 0 4 10 1433 204 169 59 194 10100#10|10101#20 null -10051 11051 30 3 0 4 10 1222 233 131 46 154 10100#10|10101#20 null -10052 11052 30 3 0 4 10 1834 142 79 225 176 10100#10|10101#20 null -10053 11053 30 3 0 4 10 1937 141 224 78 176 10100#10|10101#20 null -10054 11054 30 3 0 4 10 1633 167 61 174 163 10100#10|10101#20 null -10055 11055 30 3 0 4 10 1516 202 166 58 194 10100#10|10101#20 null -10056 11056 30 3 0 4 10 1299 235 129 45 154 10100#10|10101#20 null +10001 11001 50 5 1 1 10 2390 167 275 96 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10002 11002 50 5 5 2 10 2278 165 265 93 158 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10003 11003 50 5 2 3 10 2277 155 259 91 172 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10004 11004 50 5 3 4 10 2263 183 97 278 132 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10005 11005 50 5 4 5 10 2163 170 92 263 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10006 11006 50 5 3 6 10 2159 174 93 265 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10007 11007 50 5 1 2 10 2161 168 91 261 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10008 11008 50 5 5 2 10 2016 208 77 220 132 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10009 11009 50 5 2 2 10 1922 196 74 212 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10010 11010 50 5 3 2 10 1919 202 71 203 132 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10011 11011 50 5 4 2 10 1921 198 71 203 150 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10012 11012 50 5 3 2 10 1768 253 201 70 150 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10013 11013 50 5 1 3 10 1682 244 199 70 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10014 11014 50 5 5 3 10 1676 245 200 70 185 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10015 11015 50 5 2 3 10 1680 245 198 69 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10016 11016 50 5 3 3 10 1507 293 160 56 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10017 11017 50 5 4 3 10 1437 278 157 55 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10018 11018 50 5 3 3 10 1440 285 154 54 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10019 11019 50 5 1 4 10 1440 284 159 56 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10020 11020 50 5 5 4 10 2280 164 256 90 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10021 11021 40 4 2 4 10 1941 133 218 76 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10022 11022 40 4 3 4 10 1630 175 62 178 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10023 11023 40 4 4 4 10 1428 208 161 56 194 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10024 11024 40 4 3 4 10 1225 237 135 47 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10025 11025 40 4 1 4 10 1831 148 78 223 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10026 11026 40 4 5 4 10 1943 132 223 78 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10027 11027 40 4 2 4 10 1629 169 61 173 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10028 11028 40 4 3 4 10 1431 203 166 58 194 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10029 11029 40 4 4 4 10 1223 241 136 48 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10030 11030 40 4 3 4 10 1835 140 76 218 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10031 11031 40 4 1 4 10 1940 133 221 77 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10032 11032 40 4 5 4 10 1636 172 61 175 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10033 11033 40 4 2 4 10 1433 209 169 59 194 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10034 11034 40 4 3 4 10 1222 237 137 48 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10035 11035 40 4 4 4 10 1832 147 76 217 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10036 11036 40 4 3 4 10 1933 137 217 76 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10037 11037 40 4 1 4 10 1630 170 63 180 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10038 11038 40 4 5 4 10 1428 204 169 59 194 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10039 11039 40 4 2 4 10 1292 235 136 48 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10040 11040 40 4 3 4 10 1945 142 78 224 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10041 11041 40 4 4 4 10 1935 134 225 79 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10042 11042 40 4 3 4 10 1634 172 63 179 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10043 11043 40 4 1 4 10 1943 134 220 77 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10044 11044 40 4 5 4 10 1629 169 61 173 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10045 11045 40 4 2 4 10 1423 200 167 58 194 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10046 11046 30 3 3 4 10 1222 240 135 47 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10047 11047 30 3 4 4 10 1838 140 79 225 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10048 11048 30 3 3 4 10 1940 138 220 77 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10049 11049 30 3 1 4 10 1627 165 62 176 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10050 11050 30 3 5 4 10 1433 204 169 59 194 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10051 11051 30 3 2 4 10 1222 233 131 46 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10052 11052 30 3 3 4 10 1834 142 79 225 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10053 11053 30 3 4 4 10 1937 141 224 78 176 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10054 11054 30 3 3 4 10 1633 167 61 174 163 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10055 11055 30 3 1 4 10 1516 202 166 58 194 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 +10056 11056 30 3 5 4 10 1299 235 129 45 154 null 5#1000111|5#1000121|6#1000112|6#1000122|7#1000113|7#1000123|8#1000114|8#1000124|9#1000115|9#1000125|10#1000116|10#1000126 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 3eff8a213..38e1f5873 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SCHero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SCHero.java @@ -3,6 +3,9 @@ package com.ljsd.jieling.config; import com.ljsd.jieling.logic.STableManager; import com.ljsd.jieling.logic.Table; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; import java.util.Map; @Table(name = "HeroConfig") @@ -38,11 +41,30 @@ public class SCHero implements BaseConfig{ private int[][] rankupConsumeMaterial; + private int[][] openSkillRules; + + private Map> skillListByStar; + + @Override public void init() throws Exception { - sCHero = STableManager.getConfig(SCHero.class); - + Map integerSCHeroMap = STableManager.getConfig(SCHero.class); + for(SCHero scHero : integerSCHeroMap.values()){ + int[][] openSkillRules = scHero.getOpenSkillRules(); + Map> skillListByStarTmp = new HashMap<>(); + scHero.setSkillListByStar(skillListByStarTmp); + for(int i=0;i()); + } + skillListByStarTmp.get(star).add(skillId); + } + } + sCHero = integerSCHeroMap; } @@ -101,4 +123,20 @@ public class SCHero implements BaseConfig{ public int[][] getRankupConsumeMaterial() { return rankupConsumeMaterial; } + + public int[][] getOpenSkillRules() { + return openSkillRules; + } + + public int getStar() { + return star; + } + + public void setSkillListByStar(Map> skillListByStar) { + this.skillListByStar = skillListByStar; + } + + public Map> getSkillListByStar() { + return skillListByStar; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/SaveTeamPosHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/SaveTeamPosHandler.java new file mode 100644 index 000000000..e10db0c2e --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/SaveTeamPosHandler.java @@ -0,0 +1,27 @@ +package com.ljsd.jieling.handler; + +import com.ljsd.jieling.logic.hero.HeroLogic; +import com.ljsd.jieling.netty.cocdex.PacketNetData; +import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.protocols.HeroInfoProto; +import com.ljsd.jieling.protocols.MessageTypeProto; +import org.springframework.stereotype.Component; + +import java.util.List; + +@Component +public class SaveTeamPosHandler extends BaseHandler{ + @Override + public MessageTypeProto.MessageType getMessageCode() { + return MessageTypeProto.MessageType.TEAM_POS_SAVE_REQUEST; + } + + @Override + public void process(ISession iSession, PacketNetData netData) throws Exception { + HeroInfoProto.TeamposSaveRequest teamposSaveRequest = HeroInfoProto.TeamposSaveRequest.parseFrom(netData.parseClientProtoNetData()); + int teamId = teamposSaveRequest.getTeamId(); + List heroIdsList = teamposSaveRequest.getHeroIdsList(); + List pokemonIdsList = teamposSaveRequest.getPokemonIdsList(); + HeroLogic.getInstance().saveTeamPos(iSession,teamId,heroIdsList,pokemonIdsList); + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java index 2ae3bad07..6eb0e744f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Hero.java @@ -28,7 +28,7 @@ public class Hero extends MongoBase { private float speed; - private List skillList; + private List skillList; private List equipList; @@ -47,6 +47,8 @@ public class Hero extends MongoBase { this.speed = scHero.getSpeed(); this.skillList = new ArrayList<>(); this.equipList = new ArrayList<>(); + List skillIds = scHero.getSkillListByStar().get(star); + this.skillList.addAll(skillIds); } @@ -131,7 +133,13 @@ public class Hero extends MongoBase { return speed; } - public void setSkillList(List skillList) { + + public List getSkillList() { + return skillList; + } + + public void setSkillList(List skillList) { + this.skillList = skillList; } @@ -139,9 +147,6 @@ public class Hero extends MongoBase { this.equipList = equipList; } - public List getSkillList() { - return skillList; - } public List getEquipList() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java index f2b76466a..5c36bd448 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TeamPosManager.java @@ -23,9 +23,9 @@ public class TeamPosManager extends MongoBase { updateString("teamNames",teamNames); } - public void changeTeamInfo(int teamId,List heroIds,List pokenIds) throws Exception { + public void changeTeamInfo(int teamId,List heroIds,List pokemonoIds) throws Exception { teamPosForHero.put(teamId,heroIds); - teamPosForPoken.put(teamId,pokenIds); + teamPosForPoken.put(teamId,pokemonoIds); updateString("teamPosForHero",teamPosForHero); updateString("teamPosForPoken",teamPosForPoken); 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 6f25e4f62..48b5e02b2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -48,25 +48,12 @@ public class CBean2Proto { .setPDefence((int)hero.getpDefence()) .setMDefence((int)hero.getmDefence()) .setSpeed((int)hero.getSpeed()) - .addAllSkillList(getHeroSkill(hero.getSkillList())) + .addAllSkillIdList(hero.getSkillList()) .addAllEquipIdList(getHeroEquip(hero.getEquipList())) .build(); return heroProto; } - private static List getHeroSkill(List skillList) { - - List skills = new ArrayList<>(); - for(Skill skill : skillList){ - CommonProto.Skill skill1 = CommonProto.Skill - .newBuilder() - .setSkillId(skill.getSkillId()) - .setLevel(skill.getLevel()) - .build(); - skills.add(skill1); - } - return skills; - } private static List getHeroEquip(List equipList) { List equips = new ArrayList<>();