Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
commit
4ae13de871
|
@ -38,6 +38,7 @@ public interface GlobalItemType {
|
|||
int MOUNT_FRAGMENTS_ITEM = 28;//坐骑碎片
|
||||
int TRANSFORMATION_CARD = 29;//化身卡
|
||||
int TRUMP_CHIP=30;//法宝碎片(法宝聚灵使用)
|
||||
int HOOK_PROP=32;//挂机奖励资源道具
|
||||
//物品使用类型
|
||||
int NO_USE = 0 ; //不使用
|
||||
int RANDOM_USE = 1; // 随机使用
|
||||
|
|
|
@ -2133,6 +2133,7 @@ public class MapLogic {
|
|||
* 3:鸿蒙阵等级(6-15后)
|
||||
* 4:指定星级(运算星级)装备数量(初始可用)
|
||||
* 5:英雄总好感度等级(5-10后)
|
||||
* 6:逍遥游通关次数(5-10后)
|
||||
* 7:达到指定英雄等级及数量
|
||||
*
|
||||
* @param user
|
||||
|
@ -2195,6 +2196,12 @@ public class MapLogic {
|
|||
}
|
||||
break;
|
||||
}
|
||||
case 6:{
|
||||
if (user.getMapManager().getJourneyFinishNum() < ints[1]) {
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 7: {
|
||||
int num = 0;
|
||||
for (Map.Entry<String, Hero> stringHeroEntry : user.getHeroManager().getHeroMap().entrySet()) {
|
||||
|
|
|
@ -592,6 +592,7 @@ public class ItemUtil {
|
|||
case GlobalItemType.MOUNT_FRAGMENTS_ITEM:
|
||||
case GlobalItemType.TRUMP_CHIP:
|
||||
case GlobalItemType.TRANSFORMATION_CARD:
|
||||
case GlobalItemType.HOOK_PROP:
|
||||
itemType = GlobalItemType.ITEM;
|
||||
break;
|
||||
default:
|
||||
|
|
Loading…
Reference in New Issue