Merge branch 'master_test_gn' into 开发/dev_dh
# Conflicts: # serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java # serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java # serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.javaback_recharge
commit
1dc148d469
|
@ -2,7 +2,7 @@ package com.ljsd.jieling.core;
|
|||
|
||||
public interface GlobalsDef {
|
||||
String DEFAULT_NAME = "无名妖灵师";
|
||||
int VERSION_CODE=2;//后端兼容版本号
|
||||
int VERSION_CODE=3;//后端兼容版本号
|
||||
int MAP_MISSION_RETURN = -9999;
|
||||
int MAP_MISSION_FAILURE = -10000;
|
||||
|
||||
|
|
|
@ -370,6 +370,8 @@ public interface BIReason {
|
|||
|
||||
int FABAO_SOUL_UP_COST =1223;//法宝之魂升级消耗
|
||||
|
||||
int TRANSFORMATION_CARD_COST = 1224;//变身卡激活消耗
|
||||
|
||||
int BUY_GOOD_ITEM_COST =1225;//妖晶购买道具消耗
|
||||
int BUY_GOOD_ITEM_GET =1226;//妖晶购买道具获得
|
||||
}
|
|
@ -168,6 +168,10 @@ public class GetPlayerInfoHandler extends BaseHandler{
|
|||
if (playerInfoManager.getVersionCode()<2){
|
||||
calHeroHandBookData(user);
|
||||
}
|
||||
// 重置天宫商店
|
||||
if (playerInfoManager.getVersionCode()<3){
|
||||
user.getStoreManager().removeStoreInfo(17);
|
||||
}
|
||||
playerInfoManager.setVersionCode(GlobalsDef.VERSION_CODE);
|
||||
}
|
||||
// 处理玩家旧头像框,兼容,一个玩家只执行一次
|
||||
|
|
|
@ -42,7 +42,7 @@ public class TrumpGachaSelectItemRequestHandler extends BaseHandler<ActivityProt
|
|||
int itemId=proto.getSelectIdsList().get(i);
|
||||
if (STrump.upItemIdByConfig.get(itemId)==0) {
|
||||
LOGGER.error("选择up道具数据异常,请检查Trump表CanUp字段");
|
||||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
||||
throw new ErrorCodeException(ErrorCode.HANDLE_FAILED);
|
||||
}
|
||||
map.put(i+1,itemId);
|
||||
}
|
||||
|
|
|
@ -2,12 +2,14 @@ package com.ljsd.jieling.handler.transformation;
|
|||
|
||||
import com.ljsd.jieling.exception.ErrorCode;
|
||||
import com.ljsd.jieling.exception.ErrorCodeException;
|
||||
import com.ljsd.jieling.globals.BIReason;
|
||||
import com.ljsd.jieling.handler.BaseHandler;
|
||||
import com.ljsd.jieling.logic.dao.TransformationInfo;
|
||||
import com.ljsd.jieling.logic.dao.UserManager;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import com.ljsd.jieling.network.session.ISession;
|
||||
import com.ljsd.jieling.util.CBean2Proto;
|
||||
import com.ljsd.jieling.util.ItemUtil;
|
||||
import com.ljsd.jieling.util.MessageUtil;
|
||||
import config.SChangingCard;
|
||||
import manager.STableManager;
|
||||
|
@ -59,6 +61,11 @@ public class UpOrDownTransformationHandler extends BaseHandler<HeroInfoProto.UpO
|
|||
info = new TransformationInfo(id, index, 1);
|
||||
}
|
||||
else {
|
||||
// 激活变身卡需要消耗道具
|
||||
if (info == null){
|
||||
int[][] costItem = {{changingCard.getCardId(),1}};
|
||||
ItemUtil.itemCost(user,costItem, BIReason.TRANSFORMATION_CARD_COST,1);
|
||||
}
|
||||
// 激活或者卸下变身卡
|
||||
info = new TransformationInfo(id, 0, 0);
|
||||
}
|
||||
|
|
|
@ -1455,11 +1455,13 @@ public class ActivityLogic implements IEventHandler{
|
|||
public static boolean checkActivityOpen(User user, int activityType) {
|
||||
ActivityManager activityManager = user.getActivityManager();
|
||||
Map<Integer, ActivityMission> activityMissionMap = activityManager.getActivityMissionMap();
|
||||
Map<Integer, SGlobalActivity> activityMap = SGlobalActivity.getsGlobalActivityMap();
|
||||
for (Map.Entry<Integer, ActivityMission> item : activityMissionMap.entrySet()) {
|
||||
if (item.getKey() == activityType) {
|
||||
if (item.getKey() == activityType && activityMap.get(activityType) != null) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
LOGGER.debug("未开启或者活动表已删除的活动id:{}",activityType);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -100,6 +100,7 @@ public interface ActivityType {
|
|||
int SEVEN_WORLD_TREASURE = 83;//七界秘宝
|
||||
int RIDING_SWARD = 84;//御剑飞行
|
||||
int CONTINUOUS_GIFT = 85;//连续礼包
|
||||
int TRANSFORMATION_DRAW_CARD = 86;//方寸寻宝
|
||||
int CONTINUOUS_GIFT_NEW = 87;//新连续礼包
|
||||
int SPECIAL_MONSTER_RANDOM_ACTIVITY = 100;//灵兽宝阁活动
|
||||
int SPECIAL_MONSTER_GIFT_ACTIVITY = 101;//灵兽礼包
|
||||
|
|
|
@ -91,6 +91,7 @@ public enum ActivityTypeEnum {
|
|||
ITEMS_STORE_NEW(ActivityType.ITEMS_STORE_NEW,SuperBoxActivity::new),
|
||||
TRUMP_GACHA_ACTIVITY(ActivityType.TRUMP_GACHA_ACTIVITY,LimitRandomCardActivity::new),
|
||||
CONTINUOUS_GIFT(ActivityType.CONTINUOUS_GIFT,SuperBoxActivity::new),//连续礼包
|
||||
TRANSFORMATION_DRAW_CARD(ActivityType.TRANSFORMATION_DRAW_CARD,DefaultEmptyActivity::new),//方寸寻宝
|
||||
CONTINUOUS_GIFT_NEW(ActivityType.CONTINUOUS_GIFT_NEW,ContinuousGiftActivity::new),//新连续礼包
|
||||
;
|
||||
|
||||
|
|
|
@ -2340,18 +2340,23 @@ public class HeroLogic {
|
|||
long maxForce,int sex,int userLv,List<Integer> tfInfoList) {
|
||||
StringBuilder skillStr = new StringBuilder();
|
||||
// 修行技能
|
||||
for (Map.Entry<Integer, Integer> entry : practiceSkillMap.entrySet()) {
|
||||
SPlayerSkill playerSkill = SPlayerSkill.GetSPlayerSkill(entry.getKey(), entry.getValue());
|
||||
if (playerSkill != null){
|
||||
skillStr.append(playerSkill.getId()).append("#");
|
||||
if (practiceSkillMap != null){
|
||||
for (Map.Entry<Integer, Integer> entry : practiceSkillMap.entrySet()) {
|
||||
SPlayerSkill playerSkill = SPlayerSkill.GetSPlayerSkill(entry.getKey(), entry.getValue());
|
||||
if (playerSkill != null){
|
||||
skillStr.append(playerSkill.getId()).append("#");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 身外化身技能
|
||||
Map<Integer, SChangingCard> cardMap = STableManager.getConfig(SChangingCard.class);
|
||||
for (int cardId : tfInfoList) {
|
||||
SChangingCard card = cardMap.get(cardId);
|
||||
if (card != null){
|
||||
skillStr.append(card.getSkill()).append("#");
|
||||
if (tfInfoList != null){
|
||||
Map<Integer, SChangingCard> cardMap = STableManager.getConfig(SChangingCard.class);
|
||||
for (int cardId : tfInfoList) {
|
||||
SChangingCard card = cardMap.get(cardId);
|
||||
if (card != null){
|
||||
skillStr.append(card.getSkill()).append("#");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue