diff --git a/conf/server/GlobalSystemConfig.txt b/conf/server/GlobalSystemConfig.txt deleted file mode 100644 index c20b7d6f8..000000000 --- a/conf/server/GlobalSystemConfig.txt +++ /dev/null @@ -1,18 +0,0 @@ -Id OpenRules -int mut,int#int,1 -1 2#1 -2 2#1 -3 2#30 -4 2#30 -5 2#20 -6 2#30 -7 2#9 -8 2#30 -9 2#30 -10 2#30 -11 2#30 -12 2#30 -13 2#30 -14 2#30 -15 2#12 -0 null diff --git a/conf/server/PassiveSkillLogicConfig.txt b/conf/server/PassiveSkillLogicConfig.txt deleted file mode 100644 index 32c940965..000000000 --- a/conf/server/PassiveSkillLogicConfig.txt +++ /dev/null @@ -1,522 +0,0 @@ -Id -int -2000111 -2000112 -2000113 -2000114 -2000115 -2000116 -2000117 -2000118 -2000119 -2000120 -2000121 -2000122 -2000123 -2000124 -2000125 -2000126 -2000127 -2000128 -2000129 -2000130 -2000131 -2000132 -2000133 -2000134 -2000135 -2000136 -2000137 -2000138 -2000139 -2000140 -2000141 -2000142 -2000143 -2000144 -2000145 -2000146 -2000147 -2000148 -2000149 -2000150 -2000151 -2000152 -2000153 -2000154 -2000155 -2000156 -2000157 -2000158 -2000159 -2000160 -2000161 -2000162 -2000163 -2000164 -2000165 -2000166 -2000167 -2000168 -2000169 -2000170 -2000171 -2000172 -2000173 -2000174 -2000175 -2000176 -2000177 -2000178 -2000179 -2000180 -2000181 -2000182 -2000183 -2000184 -2000185 -2000186 -2000187 -2000188 -2000189 -2000190 -2000191 -2000192 -2000193 -2000194 -2000195 -2000196 -2000197 -2000198 -2000199 -2000200 -2000201 -2000202 -2000203 -2000204 -2000205 -2000206 -2000207 -2000208 -2000209 -2000210 -2000211 -2000212 -2000213 -2000214 -2000215 -2000216 -2000217 -2000218 -2000219 -2000220 -2000221 -2000222 -2000223 -2000224 -2000225 -2000226 -2000227 -2000228 -2000229 -2000230 -2000231 -2000232 -2000233 -2000234 -2000235 -2000236 -2000237 -2000238 -2000239 -2000240 -2000241 -2000242 -2000243 -2000244 -2000245 -2000246 -2000247 -2000248 -2000249 -2000250 -2000251 -2000252 -2000253 -2000254 -2000255 -2000256 -2000257 -2000258 -2000259 -2000260 -2000261 -2000262 -2000263 -2000264 -2000265 -2000266 -2000267 -2000268 -2000269 -2000270 -2000271 -2000272 -2000273 -2000274 -2000275 -2000276 -2000277 -2000278 -2000279 -2000280 -2000281 -2000282 -2000283 -2000284 -2000285 -2000286 -2000287 -2000288 -2000289 -2000290 -2000291 -2000292 -2000293 -2000294 -2000295 -2000296 -2000297 -2000298 -2000299 -2000300 -2000301 -2000302 -2000303 -2000304 -2000305 -2000306 -2000307 -2000308 -2000309 -2000310 -2000311 -2000312 -2000313 -2000314 -2000315 -2000316 -2000317 -2000318 -2000319 -2000320 -2000321 -2000322 -2000323 -2000324 -2000325 -2000326 -2000327 -2000328 -2000329 -2000330 -2000331 -2000332 -2000333 -2000334 -2000335 -2000336 -2000337 -2000338 -2000339 -2000340 -2000341 -2000342 -2000343 -2000344 -2000345 -2000346 -2000347 -2000348 -2000349 -2000350 -2000351 -2000352 -2000353 -2000354 -2000355 -2000356 -2000357 -2000358 -2000359 -2000360 -2000361 -2000362 -2000363 -2000364 -2000365 -2000366 -2000367 -2000368 -2000369 -2000370 -2000371 -2000372 -2000373 -2000374 -2000375 -2000376 -2000377 -2000378 -2000379 -2000380 -2000381 -2000382 -2000383 -2000384 -2000385 -2000386 -2000387 -2000388 -2000389 -2000390 -2000391 -2000392 -2000393 -2000394 -2000395 -2000396 -2000397 -2000398 -2000399 -2000400 -2000401 -2000402 -2000403 -2000404 -2000405 -2000406 -2000407 -2000408 -2000409 -2000410 -2000411 -2000412 -2000413 -2000414 -2000415 -2000416 -2000417 -2000418 -2000419 -2000420 -2000421 -2000422 -2000423 -2000424 -2000425 -2000426 -2000427 -2000428 -2000429 -2000430 -2000431 -2000432 -2000433 -2000434 -2000435 -2000436 -2000437 -2000438 -2000439 -2000440 -2000441 -2000442 -2000443 -2000444 -2000445 -2000446 -2000447 -2000448 -2000449 -2000450 -2000451 -2000452 -2000453 -2000454 -2000455 -2000456 -2000457 -2000458 -2000459 -2000460 -2000461 -2000462 -2000463 -2000464 -2000465 -2000466 -2000467 -2000468 -2000469 -2000470 -2000471 -2000472 -2000473 -2000474 -2000475 -2000476 -2000477 -2000478 -2000479 -2000480 -2000481 -2000482 -2000483 -2000484 -2000485 -2000486 -2000487 -2000488 -2000489 -2000490 -2000491 -2000492 -2000493 -2000494 -2000495 -2000496 -2000497 -2000498 -2000499 -2000500 -2000501 -2000502 -2000503 -2000504 -2000505 -2000506 -2000507 -2000508 -2000509 -2000510 -2000511 -2000512 -2000513 -2000514 -2000515 -2000516 -2000517 -2000518 -2000519 -2000520 -2000521 -2000522 -2000523 -2000524 -2000525 -2000526 -2000527 -2000528 -2000529 -2000530 -2000531 -2000532 -2000533 -2000534 -2000535 -2000536 -2000537 -2000538 -2000539 -2000540 -2000541 -2000542 -2000543 -2000544 -2000545 -2000546 -2000547 -2000548 -2000549 -2000550 -2000551 -2000552 -2000553 -2000554 -2000555 -2000556 -2000557 -2000558 -2000559 -2000560 -2000561 -2000562 -2000563 -2000564 -2000565 -2000566 -2000567 -2000568 -2000569 -2000570 -2000571 -2000572 -2000573 -2000574 -2000575 -2000576 -2000577 -2000578 -2000579 -2000580 -2000581 -2000582 -2000583 -2000584 -2000585 -2000586 -2000587 -2000588 -2000589 -2000590 -2000591 -2000592 -2000593 -2000594 -2000595 -2000596 -2000597 -2000598 -2000599 -2000600 -2000601 -2000602 -2000603 -2000604 -2000605 -2000606 -2000607 -2000608 -2000609 -2000610 -2000611 -2000612 -2000613 -2000614 -2000615 -2000616 -2000617 -2000618 -2000619 -2000620 -2000621 -2000622 -2000623 -2000624 -2000625 -2000626 -2000627 -2000628 -2000629 -2000630 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalSystemConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalSystemConfig.java deleted file mode 100644 index 1dc01fae3..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalSystemConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.ljsd.jieling.config; - -import com.ljsd.jieling.core.FunctionIdEnum; -import com.ljsd.jieling.logic.STableManager; -import com.ljsd.jieling.logic.Table; - -import java.util.Map; - -@Table(name ="GlobalSystemConfig") -public class SGlobalSystemConfig implements BaseConfig { - - private int id; - - private int[] openRules; // 1:关卡 2: 等级 - - private static Map sGlobalSystemConfigMap; - - - @Override - public void init() throws Exception { - sGlobalSystemConfigMap = STableManager.getConfig(SGlobalSystemConfig.class); - } - - public static SGlobalSystemConfig getsGlobalSystemConfigByFunctionId(FunctionIdEnum functionId) { - return sGlobalSystemConfigMap.get(functionId.getFunctionId()); - } - - public int getId() { - return id; - } - - public int[] getOpenRules() { - return openRules; - } - - -} \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SMonsterConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SMonsterConfig.java index 81380c9b8..3e2e2c64d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SMonsterConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SMonsterConfig.java @@ -62,7 +62,7 @@ public class SMonsterConfig implements BaseConfig { private int[] skillList; - private int[][] passiveSkillList; + private int[] passiveSkillList; public static Map getsMonsterConfigMap() { return sMonsterConfigMap; @@ -158,7 +158,7 @@ public class SMonsterConfig implements BaseConfig { return skillList; } - public int[][] getPassiveSkillList() { + public int[] getPassiveSkillList() { return passiveSkillList; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SPassiveSkillLogicConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SPassiveSkillLogicConfig.java new file mode 100644 index 000000000..5a6d97157 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SPassiveSkillLogicConfig.java @@ -0,0 +1,41 @@ +package com.ljsd.jieling.config; + +import com.ljsd.jieling.logic.STableManager; +import com.ljsd.jieling.logic.Table; + +import java.util.Map; + +@Table(name ="PassiveSkillLogicConfig") +public class SPassiveSkillLogicConfig implements BaseConfig { + + private int id; + + private int type; + + private float[] value; + + private static Map config; + + @Override + public void init() throws Exception { + config = STableManager.getConfig(SPassiveSkillLogicConfig.class); + } + + public static SPassiveSkillLogicConfig getConfig(int passivityId) { + return config.get(passivityId); + } + + public int getId() { + return id; + } + + public int getType() { + return type; + } + + public float[] getValue() { + return value; + } + + +} \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java index a3f8edf55..443009ca1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalItemType.java @@ -15,6 +15,7 @@ public interface GlobalItemType { int POKENMON_COMONPENT = 4; //异妖组件 int RANDOM_ITME = 5; // 随机道具 int RUNNE = 6; + int BLUE_IMAGE=7; // 蓝图 //物品使用类型 int NO_USE = 0 ; //不使用 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java index 8587c6fec..ef7e3cebf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/BehaviorUtil.java @@ -153,7 +153,7 @@ public class BehaviorUtil { } StringBuilder skillSb = new StringBuilder(); StringBuilder propertySb = new StringBuilder(); - String heroSkill = HeroLogic.getInstance().getHeroSkills(hero,skillSb).toString(); + String heroSkill = HeroLogic.getInstance().getHeroSkills(user,hero,skillSb).toString(); String property = HeroLogic.getInstance().getHeroProperty(user,hero,propertySb).toString(); CommonProto.FightUnitInfo heroFightInfo = CommonProto.FightUnitInfo .newBuilder() diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java new file mode 100644 index 000000000..beb8d7b7c --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -0,0 +1,4 @@ +package com.ljsd.jieling.logic; + +public class GlobalDataManaager { +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ArenaEnemy.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ArenaEnemy.java new file mode 100644 index 000000000..612bcea88 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/ArenaEnemy.java @@ -0,0 +1,4 @@ +package com.ljsd.jieling.logic.dao; + +public class ArenaEnemy { +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java index d8e8e86eb..6439d58d0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/Equip.java @@ -3,7 +3,6 @@ package com.ljsd.jieling.logic.dao; import com.ljsd.common.mogodb.MongoBase; import com.ljsd.jieling.config.*; import com.ljsd.jieling.core.GlobalsDef; -import com.ljsd.jieling.handler.GameGM.GMRequestHandler; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.util.KeyGenUtils; import com.ljsd.jieling.util.MathUtils; @@ -23,7 +22,9 @@ public class Equip extends MongoBase implements Cloneable{ private int level; - private int star; + private int rebuildLevel; + + private String heroId; @@ -238,6 +239,7 @@ public class Equip extends MongoBase implements Cloneable{ int value = MathUtils.random(sEquipPropertyPool.getMin() * (100 + secondPropertyPromote) / 100, sEquipPropertyPool.getMax()* (100 + secondPropertyPromote) / 100); secondValueByIdMap.put(secondPropertyId,value); } + rebuildLevel = workShopLevle; } @@ -263,13 +265,8 @@ public class Equip extends MongoBase implements Cloneable{ this.level = level; } - public int getStar() { - return star; - } - - public void setStar(int star) throws Exception { - updateString("star",star); - this.star = star; + public int getRebuildLevel() { + return rebuildLevel; } public String getHeroId() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TimeCFManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TimeCFManager.java new file mode 100644 index 000000000..1ffcf5dae --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TimeCFManager.java @@ -0,0 +1,4 @@ +package com.ljsd.jieling.logic.dao; + +public class TimeCFManager { +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TimeControllerOfFunction.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TimeControllerOfFunction.java new file mode 100644 index 000000000..9f83e0a63 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/TimeControllerOfFunction.java @@ -0,0 +1,4 @@ +package com.ljsd.jieling.logic.dao; + +public class TimeControllerOfFunction { +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/AdventureSeasonInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/AdventureSeasonInfo.java deleted file mode 100644 index f19490339..000000000 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/AdventureSeasonInfo.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.ljsd.jieling.logic.dao.root; - -import com.ljsd.GameApplication; -import com.ljsd.common.mogodb.MongoRoot; - -import java.util.Map; -import java.util.Set; - -public class AdventureSeasonInfo extends MongoRoot { - public static final String _COLLECTION_NAME = "adventureSeasonInfo"; - - - Map> recommendFinalHeroMap; - - private long updateTime; - public AdventureSeasonInfo(){ - setId(Integer.toString(GameApplication.serverId)); - } - - public Map> getRecommendFinalHeroMap() { - return recommendFinalHeroMap; - } - - public void setRecommendFinalHeroMap(Map> recommendFinalHeroMap) { - this.recommendFinalHeroMap = recommendFinalHeroMap; - } - - public long getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(long updateTime) { - this.updateTime = updateTime; - } - - @Override - public String getCollection() { - return _COLLECTION_NAME; - } - -} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/GlobalSystemControl.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/GlobalSystemControl.java new file mode 100644 index 000000000..3098f5e4a --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/GlobalSystemControl.java @@ -0,0 +1,4 @@ +package com.ljsd.jieling.logic.dao.root; + +public class GlobalSystemControl { +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CheckFight.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CheckFight.java index fc0f20683..b8afdb2d8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CheckFight.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CheckFight.java @@ -2,6 +2,7 @@ package com.ljsd.jieling.logic.fight; import org.luaj.vm2.Globals; +import org.luaj.vm2.LuaTable; import org.luaj.vm2.LuaValue; import org.luaj.vm2.lib.jse.JsePlatform; @@ -76,7 +77,10 @@ public class CheckFight { */ public synchronized int[] checkFight(int seed, LuaValue fightData, LuaValue optionData){ LuaValue func = transCoderObj.get(LuaValue.valueOf("Execute")); - LuaValue result = func.call(LuaValue.valueOf(seed),fightData,optionData); + LuaValue args = new LuaTable(); + args.set("seed",seed); + args.set("maxTime",300); + LuaValue result = func.call( args,fightData,optionData); int status = result.get("result").toint(); int[] resultCache = new int[6]; resultCache[0]=status; 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 d85ca82f5..8d6f41290 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 @@ -25,6 +25,7 @@ public class HeroLogic { private HeroLogic(){} public static List transTemplate = new ArrayList<>(); + public static List equipSkillPositionTemaplge = new ArrayList<>(6); private static Map> transTemplateByHeroPropertyName = new HashMap<>(); static { transTemplate.add(HeroAttributeEnum.CurHP.getPropertyId()); // 生命 @@ -70,6 +71,13 @@ public class HeroLogic { transTemplateByHeroPropertyName.get(4).add(HeroAttributeEnum.LandDamageBonusFactor.getPropertyId()); transTemplateByHeroPropertyName.get(5).add(HeroAttributeEnum.LightDamageBonusFactor.getPropertyId()); transTemplateByHeroPropertyName.get(6).add(HeroAttributeEnum.DarkDamageBonusFactor.getPropertyId()); + + equipSkillPositionTemaplge.add(1); + equipSkillPositionTemaplge.add(2); + equipSkillPositionTemaplge.add(3); + equipSkillPositionTemaplge.add(4); + equipSkillPositionTemaplge.add(5); + equipSkillPositionTemaplge.add(6); } private static final String VERTICAL = "|"; private static final String DIVISION = "#"; @@ -103,7 +111,6 @@ public class HeroLogic { } - public static class Instance { public final static HeroLogic instance = new HeroLogic(); } @@ -676,10 +683,28 @@ public class HeroLogic { // return result; // } - public StringBuilder getHeroSkills(Hero hero, StringBuilder sb){ + public StringBuilder getHeroSkills(User user,Hero hero, StringBuilder sb){ + for (Integer skillId : hero.getSkillList()) { sb.append(skillId).append(DIVISION); } + Map equipByPositionMap = hero.getEquipByPositionMap(); + if(!equipByPositionMap.isEmpty()){ + Map equipMap = user.getEquipManager().getEquipMap(); + for(Integer position : equipSkillPositionTemaplge){ + String equipId = equipByPositionMap.get(position); + if(StringUtil.isEmpty(equipId)){ + continue; + } + int equipTid = equipMap.get(equipId).getEquipId(); + SEquipConfig sEquipConfig = SEquipConfig.getsEquipConfigById(equipTid); + int skillId = sEquipConfig.getSkillId(); + if(skillId!=0){ + sb.append(skillId).append(DIVISION); + } + } + return sb; + } return sb; } @@ -700,7 +725,12 @@ public class HeroLogic { if(propertyValue == null){ propertyValue =0; } - sb.append(propertyValue).append(DIVISION); + if(templatePropetyId>100){ + sb.append(propertyValue*0.1/(hero.getLevel()+10)).append(DIVISION); + }else{ + sb.append(propertyValue).append(DIVISION); + } + } return sb; } @@ -708,7 +738,7 @@ public class HeroLogic { public String getOneHeroFightInfo(User user, Hero hero){ StringBuilder sb = new StringBuilder(hero.getTemplateId()).append(DIVISION); - getHeroSkills(hero,sb); + getHeroSkills(user,hero,sb); getHeroProperty(user,hero,sb); return sb.toString(); } 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 5e9be4cce..a5343159a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -106,6 +106,7 @@ public class CBean2Proto { .setId(equip.getId()) .setMainAttribute(parseFromMap(propertyValueByIdMap).get(0)) .addAllSecondAttribute(parseFromMap(secondValueByIdMap)) + .setRebuildLevel(equip.getRebuildLevel()) .build(); return equipProto; } @@ -183,6 +184,16 @@ public class CBean2Proto { monsterSkillList.append(i).append("#"); } } + if (sMonsterConfig.getPassiveSkillList()!=null && sMonsterConfig.getPassiveSkillList().length >0){ + int length = monsterSkillList.length(); + while(2-length>0){ + monsterSkillList.append(0).append("#"); + length++; + } + for (Integer i : sMonsterConfig.getPassiveSkillList()){ + monsterSkillList.append(i).append("#"); + } + } CommonProto.FightUnitInfo.Builder monsterBuilder = CommonProto.FightUnitInfo.newBuilder(); monsterBuilder.setProperty(monsterPropertyList.toString()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java index c24b87413..bbe7b89df 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -72,14 +72,16 @@ public class FightDataUtil { if (unitSkill.length==1){ unitData.set("skill", getSkill(unitSkill[0])); unitData.set("superSkill", new LuaTable()); + unitData.set("passivity", new LuaTable()); }else if (unitSkill.length==2){ unitData.set("skill", getSkill(unitSkill[0])); unitData.set("superSkill", getSkill(unitSkill[1])); + unitData.set("passivity", new LuaTable()); }else { - unitData.set("skill", new LuaTable()); - unitData.set("superSkill", new LuaTable()); + unitData.set("passivity", getPassivity(unitSkill)); } - unitData.set("passivity", new LuaTable()); + + unitData.set("property", getMonsterProperty(sMonster)); enemyData.rawset(i+1, unitData); @@ -89,6 +91,39 @@ public class FightDataUtil { return enemyData; } + private static LuaValue getPassivity(String[] unitSkill) { + LuaValue passivityData = new LuaTable(); + int length = unitSkill.length; + if(length<3){ + return passivityData; + } + + for(int i=2;i effectList = parseArraayToLuaValues(sPassiveSkillLogicConfig.getValue()); + int size = effectList.size(); + if (size > 0) { + for (int j = 0; j < size; j++) { + detail.rawset(j + 2, effectList.get(j)); + } + } + passivityData.rawset(i-1,detail); + + } + return passivityData; + } + + private static List parseArraayToLuaValues(float[] source) { + List result = new ArrayList<>(source.length); + for(float id : source){ + result.add(LuaValue.valueOf(id)); + } + return result; + } + /** * --属性 {等级,生命,最大生命,攻击力,护甲,魔抗,速度,伤害加成系数(%,伤害减免系数(%),命中率(%),闪避率(%),暴击率(%),暴击伤害系数(%),治疗加成系数(%) * -- ,火系伤害加成系数(%),火系伤害减免系数(%),冰系伤害加成系数(%),冰系伤害减免系数(%),雷系伤害加成系数(%),雷系伤害减免系数(%),风系伤害加成系数(%) @@ -167,7 +202,7 @@ public class FightDataUtil { unitData.set("skill", getSkill(skillIds[0])); unitData.set("superSkill", getSkill(skillIds[1])); - unitData.set("passivity", getTestSkill(false)); + unitData.set("passivity", getPassivity(skillIds)); unitData.set("property", getProperty(property)); return unitData; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index ee814d6c2..7d9f9982c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -218,6 +218,7 @@ public class ItemUtil { case GlobalItemType.POKENMON_COMONPENT: case GlobalItemType.RUNNE: case GlobalItemType.CARD_FRAGMENT: + case GlobalItemType.BLUE_IMAGE: itemType = GlobalItemType.ITEM; break; case GlobalItemType.RANDOM_ITME: