root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

助阵修改

master_dev
grimm 2024-04-15 17:54:38 +08:00
parent 15646fb602
commit 667fd6c85a
6 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
View File

@ -79,6 +79,7 @@ public enum FunctionIdEnum {
ThereTowerChallenge(140,null),//三队塔
GemNew(144, null),//命格新
GemNewAdvanced(145, null),//命格新-高级
Assist(152,null),//助阵
WeekGood(9091,null),
;

4
serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
View File

@ -453,8 +453,8 @@ public interface BIReason {
int TRAINING_ARCH_UP_QUICK_COST = 1339;//特训建筑快速升级消耗
int TRAINING_UP_LV_COST = 1340;//特训进阶消耗
int TRAINING_UNLOCK_SKILL_COST = 1341;//特训解锁技能消耗
int GIFT_UP_STAR_COST = 1342;//礼物装备升星
int GIFT_UP_STAR_GET = 1343;//礼物装备获得
int GIFT_UP_STAR_COST = 1342;//礼物升星消耗
int GIFT_UP_STAR_GET = 1343;//礼物升星获得
int ARENA_UP_LV_REWARD = 1344;//竞技场段位升级奖励
int SOLDIER_UP_LV = 1345;//兵力升级
int SOLDIER_SPEED_UP_LV = 1346;//兵力加速升级

14
serverlogic/src/main/java/com/ljsd/jieling/jbean/ActivityMission.java
View File

@ -1,16 +1,12 @@
package com.ljsd.jieling.jbean;
import com.ljsd.common.mogodb.MongoBase;
import java.util.Map;
import java.util.HashMap;
import java.util.Set;
import java.util.HashSet;
import java.util.List;
import java.util.LinkedList;
import com.ljsd.common.mogodb.dblog.LogHashMap;
import config.SWishActivityUp;
import org.springframework.data.annotation.Transient;
import com.ljsd.common.mogodb.dblog.*;
import java.util.HashMap;
import java.util.Map;
public final class ActivityMission extends MongoBase {
private HashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo> activityMissionMap = new HashMap<Integer, com.ljsd.jieling.jbean.ActivityProgressInfo>();
@ -72,8 +68,8 @@ public final class ActivityMission extends MongoBase {
}
public void setV(int v) {
updateString("v",v);
this.v = v;
updateString("v",v);
}
public long getCreatTime() {

2
serverlogic/src/main/java/com/ljsd/jieling/logic/equip/EquipLogic.java
View File

@ -638,7 +638,7 @@ public class EquipLogic {
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
}
CommonProto.Drop.Builder drop = ItemUtil.drop(user, new int[][]{{giftId, 1}}, BIReason.GIFT_UP_STAR_GET);
ItemUtil.itemCost(user, costList, BIReason.GIFT_EQUIP_UP_COST, 0);
ItemUtil.itemCost(user, costList, BIReason.GIFT_UP_STAR_COST, 0);
HeroInfoProto.GiftEquipUpStarResponse.Builder builder = HeroInfoProto.GiftEquipUpStarResponse.newBuilder().setDrop(drop);
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GiftEquipUpStarResponse_VALUE, builder.build(), true);
}

3
serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
View File

@ -3416,7 +3416,7 @@ public class HeroLogic {
* @param heroAllAttribute 属性
* @param user 用户
*/
private void applyAssistAttribute(Map<Integer, Long> heroAllAttribute, User user) {
public int applyAssistAttribute(Map<Integer, Long> heroAllAttribute, User user) {
// ... 助阵 ...
HeroManager heroManager = user.getHeroManager();
Map<Integer, AssistBox> assistBoxMap = heroManager.getAssistBoxMap();
@ -3452,6 +3452,7 @@ public class HeroLogic {
}
LOGGER.info("===助阵属性：{}",attribute);
combinedAttribute(attribute, heroAllAttribute);
return totalAdd;
}
/**

15
serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
View File

@ -691,13 +691,20 @@ public class PlayerLogic {
teamInfo.addMagicSoldier(CBean2Proto.getSimpleTeamInfoByMagicSoldier(soldier));
}
}
// 助阵
HashMap<Integer, Long> assistAttr = new HashMap<>();
int assistAdd = HeroLogic.getInstance().applyAssistAttribute(assistAttr, user);
for(Map.Entry<Integer,Long> item : assistAttr.entrySet()){
teamInfo.addAssistAttribute(CommonProto.SpecialEffects.newBuilder().setPropertyId(item.getKey()).setPropertyValue(item.getValue().intValue()).build());
}
teamInfo.setAssistAdd(assistAdd);
//身外化身变身卡
teamInfo.addAllTransformationCardInfo(CBean2Proto.getTransformationInfoList2(user));
//四象心法
teamInfo.addAllSixiangxinfaInfo(GetPlayerInfoHandler.getSixiangxinfaInfos(user.getHeroManager()));
//坐骑
teamInfo.addAllUserMountInfo(CBean2Proto.getUserMountList(user));
// 主角礼物id
//主角礼物id
teamInfo.addAllGiftEquipIds(user.getPlayerInfoManager().getPlayerGiftEquipList());
// 命格新
teamInfo.addAllGemNews(CBean2Proto.toBeanGemNew(user));
@ -708,7 +715,6 @@ public class PlayerLogic {
String name = guildInfo.getName();
oneInfo.setGuildName(name);
}
}
oneInfo.setTeam(teamInfo);
if(user.getFriendManager().getMyApplyFriends().contains(uid)){
@ -1038,10 +1044,13 @@ public class PlayerLogic {
if (baubles != null){
builder.addEquip(CBean2Proto.getBaublesProto(userInMem, baubles));
}
// 总战力
builder.setForce(HeroLogic.getInstance().calForce(heroNotBufferAttribute));
// 英雄
builder.setHero(CBean2Proto.getHongmengHero(userInMem, hero));
// 礼物等级
builder.setPlayerGiftLv(HeroLogic.getInstance().getGiftPotentialLv(userInMem, hero) + HeroLogic.getInstance().getBookPotentialLv(userInMem));
// 公会技能
Map<Integer, Integer> guildSkill = userInMem.getGuildMyInfo().getGuildSkill();
int profession = SCHero.getsCHero().get(hero.getTemplateId()).getProfession();
Integer skill = guildSkill.getOrDefault(profession, 0);