Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
3d769948ad
|
@ -26,6 +26,7 @@ public class SSpecialConfig implements BaseConfig {
|
||||||
public static final String ADVENTURE_RANKINGSHOWNUM = "Adventure_RankingShowNum";//外敌入侵排行榜上榜显示排名
|
public static final String ADVENTURE_RANKINGSHOWNUM = "Adventure_RankingShowNum";//外敌入侵排行榜上榜显示排名
|
||||||
public static final String COMBAT_RANKINGSHOWNUM = "Combat_RankingShowNum";//战力排行榜上榜显示排名
|
public static final String COMBAT_RANKINGSHOWNUM = "Combat_RankingShowNum";//战力排行榜上榜显示排名
|
||||||
public static final String EQUIPSIGN_LIMIT = "EquipSign_limit";//仓库中的魂印上限
|
public static final String EQUIPSIGN_LIMIT = "EquipSign_limit";//仓库中的魂印上限
|
||||||
|
public static final String EquipTalismana_limit = "EquipTalismana_limit";//仓库中的法宝上限
|
||||||
public static final String FRIENDAMOUNT_LIMIT = "FriendAmount_limit";//好友上限
|
public static final String FRIENDAMOUNT_LIMIT = "FriendAmount_limit";//好友上限
|
||||||
public static final String FRIENDAPPLYAMOUNT_LIMIT = "FriendApplyAmount_limit";//好友申请上限
|
public static final String FRIENDAPPLYAMOUNT_LIMIT = "FriendApplyAmount_limit";//好友申请上限
|
||||||
public static final String Friend_Gift = "Friend_Gift";//好友赠送友情点
|
public static final String Friend_Gift = "Friend_Gift";//好友赠送友情点
|
||||||
|
|
|
@ -86,11 +86,11 @@ public interface BIReason {
|
||||||
|
|
||||||
int MAIN_LEVEL_STATE_REWARD = 53; // 关卡挂机奖励
|
int MAIN_LEVEL_STATE_REWARD = 53; // 关卡挂机奖励
|
||||||
|
|
||||||
int LUCK_WHEEl_REWARD = 53; //幸运转盘
|
int LUCK_WHEEl_REWARD = 54; //幸运转盘
|
||||||
int LUCK_WHEEl_ADVANCE_REWARD = 54; //高级幸运转盘
|
int LUCK_WHEEl_ADVANCE_REWARD = 55; //高级幸运转盘
|
||||||
int SYSTERM_OPEN_REWARD = 54; //系统开放奖励
|
int SYSTERM_OPEN_REWARD = 56; //系统开放奖励
|
||||||
|
|
||||||
int HERO_BACK_REWARD = 55; // 英雄回溯返回东西
|
int HERO_BACK_REWARD = 57; // 英雄回溯返回东西
|
||||||
|
|
||||||
//道具消耗原因 1000开头
|
//道具消耗原因 1000开头
|
||||||
int ADVENTURE_UPLEVEL_CONSUME = 1000; //秘境升级
|
int ADVENTURE_UPLEVEL_CONSUME = 1000; //秘境升级
|
||||||
|
@ -158,11 +158,11 @@ public interface BIReason {
|
||||||
|
|
||||||
int FAMILY_SET_ICON = 1037;//工会修改图腾
|
int FAMILY_SET_ICON = 1037;//工会修改图腾
|
||||||
|
|
||||||
int EXCHANGE_ACTIVITY_CLOSE = 1038;
|
int EXCHANGE_ACTIVITY_CLOSE = 1038;//限时兑换删除道具
|
||||||
int LUCK_WHEEL = 1038; //幸运转盘消耗
|
int LUCK_WHEEL = 1039; //幸运转盘消耗
|
||||||
int LUCK_WHEEL_ADVANCE = 1039; //高级幸运转盘消耗
|
int LUCK_WHEEL_ADVANCE = 1040; //高级幸运转盘消耗
|
||||||
|
|
||||||
int HERO_BACK_CONSUME = 1040; // 英雄回溯消耗
|
int HERO_BACK_CONSUME = 1041; // 英雄回溯消耗
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
|
@ -21,7 +21,7 @@ public interface GlobalItemType {
|
||||||
int SecretBox=10; // 宝箱
|
int SecretBox=10; // 宝箱
|
||||||
int HEAD_FRAME = 11;//头像框
|
int HEAD_FRAME = 11;//头像框
|
||||||
int CHANGE_NAME_CARD = 12;//改名道具卡
|
int CHANGE_NAME_CARD = 12;//改名道具卡
|
||||||
int SOUL_MARK =13;//
|
int SOUL_MARK =13;// 魂印
|
||||||
int ESPECIAL_EQUIP = 14;//法宝
|
int ESPECIAL_EQUIP = 14;//法宝
|
||||||
|
|
||||||
int EXP = 17;//经验
|
int EXP = 17;//经验
|
||||||
|
|
|
@ -1295,6 +1295,16 @@ public class ItemUtil {
|
||||||
if (hasEquipNum >= gameSetting.getEquipNumlimit()){
|
if (hasEquipNum >= gameSetting.getEquipNumlimit()){
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
}else if(itemType == GlobalItemType.SOUL_MARK){
|
||||||
|
int limit = SSpecialConfig.getIntegerValue(SSpecialConfig.EQUIPSIGN_LIMIT);
|
||||||
|
if (user.getEquipManager().getSoulEquipMap().size() >=limit){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}else if(itemType == GlobalItemType.ESPECIAL_EQUIP){
|
||||||
|
int limit = SSpecialConfig.getIntegerValue(SSpecialConfig.EquipTalismana_limit);
|
||||||
|
if (user.getEquipManager().getEspecialEquipMap().size() >=limit){
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue