Merge branch 'master_test_gn' into master_test_gn_xxp

xuexinpeng 2021-11-18 17:58:34 +08:00
commit 79b1ac3759
19 changed files with 141 additions and 72 deletions

View File

@ -253,6 +253,7 @@ public class GetPlayerInfoHandler extends BaseHandler{
Poster.getPoster().dispatchEvent(new HeroUpStarEvent(user.getId(),10023,0));
// 无尽秘宝处理
endLessTreasureHandler(user);
expeditionTreasureHandler(user);
user.getUserMissionManager().onGameEvent(user,GameEvent.DAILY_TASK_TYPE,0,user);
MessageUtil.sendIndicationMessage(iSession, 1, MessageTypeProto.MessageType.WorldLevelIndication_VALUE, PlayerInfoProto.WorldLevelIndication.newBuilder().setWorldLeve(GlobleSystemLogic.getGlobalWorldLevelCache()).build(), true);
MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GET_PLAYERINFO_RESPONSE_VALUE, getPlayerInfoResponse, true);
@ -283,6 +284,22 @@ public class GetPlayerInfoHandler extends BaseHandler{
}
}
/**
*
* @param user
*/
private void expeditionTreasureHandler(User user){
// 天宫秘宝礼包获取
ReceiveWelfareBag bagInfo = (ReceiveWelfareBag) user.getPlayerInfoManager().getNewRechargeInfo().getReceiveMap().get(106);
if (bagInfo == null){
return;
}
// 刷新礼包
if (user.getExpeditionManager().getWorldTreasureReward().getIsBuy() == 0 && bagInfo.isBought()){
bagInfo.refresh();
}
}
///登录获取四象心法数据
private List<CommonProto.SixiangxinfaInfo> getSixiangxinfaInfos(HeroManager heroManager) {
Map<Integer,SixiangProfessionInfo> sixiangDataMap = heroManager.getSixiangDataMap();

View File

@ -152,6 +152,13 @@ public class GetWorldArenaChallengeRequestHandler extends BaseHandler<WorldProto
}
teamInfo = FightUtil.makeCrossPersonData(csPlayer, proto.getTeamId(), null, crossArenaManager);
arenaEnemys = ArenaLogic.getInstance().getUserCrossArenaEnemy(csPlayer,proto.getChallengeRank(),false).build();
// 旧数据兼容
if (csPlayer.getLuoFuForce() == 0){
CSPlayer redis = CrossServiceLogic.getPlayerByRedis(csPlayer.getUserId(), false);
if (redis != null){
csPlayer = redis;
}
}
defendForce = csPlayer.getLuoFuForce();
} else {
//机器人

View File

@ -26,7 +26,7 @@ public interface ActivityType {
// int RechargeTotal = 5; //累计充值
int GrowthFund = 6; //成长基金
int BLESSACTIVITY = 7;//云梦祈福
int TREASURE = 8; //戒灵秘宝(孙龙的宝藏)
int TREASURE = 8; //青龙秘宝(孙龙的宝藏)
int LUCKYCAT = 9;//招財貓
int SERVERHAPPY = 10; //七日狂欢
int FORCERANK = 11; //战力排行

View File

@ -44,19 +44,13 @@ class ExpectRankActivity extends AbstractActivity {
MapManager mapManager = user.getMapManager();
TrialInfo trialInfo = mapManager.getTrialInfo();
//排除神秘关卡
activityMission.setV(count + activityMission.getV());
int rankFloor = 0;
if(trialInfo.getFloor()<10000 && trialInfo.getFloor() > activityMission.getV()){
activityMission.setV(trialInfo.getFloor());
rankFloor = trialInfo.getFloor();
}else if(trialInfo.getFloor()>10000){
activityMission.setV(trialInfo.getFloor()-10000);
rankFloor = trialInfo.getFloor()-10000;
}
if( rankFloor!=0 ){
RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()).addRank(user.getId(),String.valueOf(id),rankFloor);
}
}
RankContext.getRankEnum(RankEnum.EXPERT_RANK.getType()).addRank(user.getId(),String.valueOf(id),activityMission.getV());
}else{
activityMission.setV(count + activityMission.getV());
}

View File

@ -25,9 +25,8 @@ class GrowthFundActivity extends AbstractActivity {
int[][] values = sActivityRewardConfig.getValues();
User user = UserManager.getUser(session.getUid());
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
AbstractWelfareBag bag = user.getPlayerInfoManager().getNewRechargeInfo().getReceiveMap().get(sGlobalActivity.getCanBuyRechargeId()[0]);
int buyTimes = bag.getBuyTimes();
if(buyTimes == 0){
ReceiveWelfareBag bag = (ReceiveWelfareBag)user.getPlayerInfoManager().getNewRechargeInfo().getReceiveMap().get(sGlobalActivity.getCanBuyRechargeId()[0]);
if (!bag.isBought()){
return false;
}
int type = values[0][0];
@ -43,14 +42,6 @@ class GrowthFundActivity extends AbstractActivity {
return true;
}
@Override
public void onActivityEndOnMySelf(User user) throws Exception {
// SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
// if(sGlobalActivity.getCanBuyRechargeId()!=null&&sGlobalActivity.getCanBuyRechargeId().length>0){
// Arrays.stream(sGlobalActivity.getCanBuyRechargeId()).forEach(n->user.getPlayerInfoManager().getRechargeInfo().updateBuyGoodsTimes(n,0));
// }
}
@Override
void updateProgress(ActivityMission activityMission, int count) {
activityMission.setV(count);

View File

@ -133,22 +133,16 @@ public class CrossServiceLogic {
csPlayer.setGuildId(p.getGuildId());
csPlayer.setCrossYxldMaxLevel(crossYxldMaxLevel);
//玉虚三个队伍总战力
if (csPlayer.getMaxFore() == 0) {
int force1 = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.CROSS_YU_XU_LUN_DAO_ONE.getTeamId(), false);
int force2 = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.CROSS_YU_XU_LUN_DAO_TWO.getTeamId(), false);
int force3 = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.CROSS_YU_XU_LUN_DAO_THREE.getTeamId(), false);
csPlayer.setMaxFore(force1+force2+force3);
}
int force1 = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.CROSS_YU_XU_LUN_DAO_ONE.getTeamId(), false);
int force2 = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.CROSS_YU_XU_LUN_DAO_TWO.getTeamId(), false);
int force3 = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.CROSS_YU_XU_LUN_DAO_THREE.getTeamId(), false);
csPlayer.setMaxFore(force1+force2+force3);
// 主线编队战力
if (csPlayer.getMainLineForce() == 0) {
int mainLine = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.FORMATION_NORMAL.getTeamId(), false);
csPlayer.setMainLineForce(mainLine);
}
int mainLine = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.FORMATION_NORMAL.getTeamId(), false);
csPlayer.setMainLineForce(mainLine);
// 罗浮编队战力
if (csPlayer.getLuoFuForce() == 0) {
int luoFu = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.FORMATION_NORMAL.getTeamId(), false);
csPlayer.setLuoFuForce(luoFu);
}
int luoFu = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.FORMATION_NORMAL.getTeamId(), false);
csPlayer.setLuoFuForce(luoFu);
return csPlayer;
}

View File

@ -1010,6 +1010,13 @@ public class ArenaLogic {
Object get = RedisUtil.getInstence().hget(RedisKey.ARENA_PROUD_COUNT, String.valueOf(csPlayer.getUserId()));
int proudTime = get==null?1:Integer.parseInt((String)get);
String serverName = CrossServiceLogic.simplifyServerName(csPlayer.getServerId());
// 旧数据兼容
if (csPlayer.getLuoFuForce() == 0){
CSPlayer redis = CrossServiceLogic.getPlayerByRedis(csPlayer.getUserId(), false);
if (redis != null){
csPlayer = redis;
}
}
CommonProto.ArenaPersonInfo personInfoBuild = CommonProto.ArenaPersonInfo.newBuilder()
.setUid(csPlayer.getUserId())
.setLevel(csPlayer.getLevel())

View File

@ -36,7 +36,6 @@ public class WorldTreasureReward extends MongoBase {
score = 0;
setRewardStatusMap(new HashMap<>());
setIsBuy(0);
// updateRound(round+1);
}
@Override

View File

@ -1,5 +1,8 @@
package com.ljsd.jieling.logic.dao.cross;
import com.ljsd.GameApplication;
import com.ljsd.jieling.db.mongo.AreaManager;
/**
* @Author hj
* @Date 2021/8/31 15:30:04
@ -189,6 +192,7 @@ public class CSPlayer {
}
public int getServerId() {
int serverId = AreaManager.getInstance().getServerIdByUid(userId, GameApplication.serverId);
return serverId;
}

View File

@ -23,6 +23,7 @@ import com.ljsd.jieling.logic.mail.MailLogic;
import com.ljsd.jieling.logic.mission.GameEvent;
import com.ljsd.jieling.logic.store.BuyGoodsNewLogic;
import com.ljsd.jieling.logic.store.StoreLogic;
import com.ljsd.jieling.logic.store.newRechargeInfo.bean.ReceiveWelfareBag;
import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.util.ItemUtil;
import com.ljsd.jieling.util.MessageUtil;
@ -550,6 +551,12 @@ public class ExpeditionLogic {
//重置
if(TimeUtils.nowInt()>=createTime){
user.getExpeditionManager().resetTreasureReward();
// 天宫秘宝礼包刷新
ReceiveWelfareBag bagInfo = (ReceiveWelfareBag) user.getPlayerInfoManager().getNewRechargeInfo().getReceiveMap().get(106);
if (bagInfo == null){
return;
}
bagInfo.refresh();
sendAllTreasureInfo(user);
BuyGoodsNewLogic.sendGiftGooodsIndication(user.getId());
}

View File

@ -330,13 +330,16 @@ public class FriendLogic {
public void sendAgree(ISession iSession, int type, int friendId ) throws Exception {
int msgId = MessageTypeProto.MessageType.FRIEND_INVITE_OPERATION_RESPONSE_VALUE;
int uid = iSession.getUid();
// 自己的信息
User user = UserManager.getUser(uid);
FriendManager friendManager = user.getFriendManager();
User friendUser = UserManager.getUserNotCache(friendId);
if (friendId == 0 || friendUser == null){
return;
// 好友的信息
User friendUser = null;
FriendManager friendManager1 = null;
if(friendId!=0){
friendUser = UserManager.getUserNotCache(friendId);
friendManager1 = friendUser.getFriendManager();
}
FriendManager friendManager1 = friendUser.getFriendManager();
List<Integer> friends = friendManager.getFriends();
List<Integer> applyFriends = friendManager.getApplyFriends();
int maxFriends = SSpecialConfig.getIntegerValue(SSpecialConfig.FRIENDAMOUNT_LIMIT);

View File

@ -1,5 +1,7 @@
package com.ljsd.jieling.logic.hero;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
import com.ljsd.GameApplication;
import com.ljsd.fight.FamilyHeroInfo;
import com.ljsd.jieling.chat.logic.ChatLogic;
@ -1222,7 +1224,7 @@ public class HeroLogic {
if (teamId == TeamEnum.FORMATION_NORMAL.getTeamId()) {
Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(iSession.getUid()));
}
//跨服 玉虚论道
//跨服编队
if (TeamEnum.isCrossTeam(teamId)) {
CrossServiceLogic.getInstance().saveBasicPlayerToRedis(user);
}
@ -2685,7 +2687,16 @@ public class HeroLogic {
if (propertyItem == null) {
continue;
}
Jewel j = (Jewel) propertyItem;
Jewel j = null;
if (propertyItem instanceof Jewel){
j = (Jewel) propertyItem;
}else {
j = new Jewel();
j.setHeroId(propertyItem.getHeroId());
j.setLevel(propertyItem.getLevel());
j.setEquipId(propertyItem.getEquipId());
j.setBuildLevel(1);
}
SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(j.getEquipId());
// 进阶
Map<Integer, Map<Integer, SJewelRankupConfig>> rankPoolMap = SJewelRankupConfig.rankupMap.get(config.getRankupPool());
@ -3257,7 +3268,6 @@ public class HeroLogic {
if (heroManager.getHero(equip.getHeroId()) == null) {
equip.setHeroId("");
}
return;
}
String remove = "";

View File

@ -336,8 +336,11 @@ public class ItemLogic {
throw new ErrorCodeException(ErrorCode.ITEM_DECOMPOSE_NO_EQUIP);
}
PropertyItem propertyItem = equipMap.get(jewelId);
if (!StringUtil.isEmpty(propertyItem.getHeroId())&&user.getHeroManager().getHero(propertyItem.getHeroId())!=null) {
throw new ErrorCodeException(ErrorCode.ITEM_DECOMPOSE_SOULE_CANT);
if (!StringUtil.isEmpty(propertyItem.getHeroId())) {
Hero hero = user.getHeroManager().getHero(propertyItem.getHeroId());
if (hero != null && hero.getJewelInfo().contains(jewelId)) {
throw new ErrorCodeException(ErrorCode.ITEM_DECOMPOSE_SOULE_CANT);
}
}
Jewel jewel = (Jewel) propertyItem;
SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(propertyItem.getEquipId());
@ -781,18 +784,27 @@ public class ItemLogic {
}
public static TreeSet<String> getJewelEquipWithLeve(User user, int type, int rance, int leve) {
return user.getEquipManager().getEquipMap().entrySet().stream().filter(stringEquipEntry ->
StringUtil.isEmpty(stringEquipEntry.getValue().getHeroId())
).filter(stringPropertyItemEntry -> stringPropertyItemEntry.getValue() instanceof Jewel).filter(stringPropertyItemEntry -> {
if (((Jewel) stringPropertyItemEntry.getValue()).getBuildLevel() != 0 || stringPropertyItemEntry.getValue().getLevel() != 0) {
return false;
}
TreeSet<String> strings = new TreeSet<>();
for (Map.Entry<String, PropertyItem> stringPropertyItemEntry : user.getEquipManager().getEquipMap().entrySet()) {
SJewelConfig config = STableManager.getConfig(SJewelConfig.class).get(stringPropertyItemEntry.getValue().getEquipId());
if (config == null) {
return false;
continue;
}
return config.getLocation() == type && config.getRace() == rance && config.getLevel() == leve;
}).map(Map.Entry::getKey).collect(Collectors.toCollection(TreeSet::new));
if (config.getLocation() != type || config.getRace() != rance || config.getLevel() != leve) {
continue;
}
if (!StringUtil.isEmpty(stringPropertyItemEntry.getValue().getHeroId())) {
Hero hero = user.getHeroManager().getHero(stringPropertyItemEntry.getValue().getHeroId());
if (hero != null && hero.getJewelInfo().contains(stringPropertyItemEntry.getKey())) {
continue;
}
}
if (((Jewel) stringPropertyItemEntry.getValue()).getBuildLevel() != 0 || stringPropertyItemEntry.getValue().getLevel() != 0) {
continue;
}
strings.add(stringPropertyItemEntry.getValue().getId());
}
return strings;
}
/**

View File

@ -1739,7 +1739,8 @@ public class PlayerLogic {
return null;
}
}
if (userStr == null) {
if (userStr == null || userStr.isEmpty()) {
LOGGER.error("getUserByRpc userStr == null uid={}", uid);
return null;
}
Gson gson = RedisUtil.getInstence().getGson();

View File

@ -267,6 +267,13 @@ public abstract class AbstractRank implements IRank {
public CommonProto.UserRank.Builder getCrossOneUserRank(CSPlayer csPlayer, CommonProto.RankInfo.Builder everyRankInfo){
String serverName = CrossServiceLogic.simplifyServerName(csPlayer.getServerId());
GuildCache mapEntry = CrossDeathPathLogic.getCrossGuild(csPlayer.getGuildId());
// 兼容
if (csPlayer.getMainLineForce() == 0){
CSPlayer redis = CrossServiceLogic.getPlayerByRedis(csPlayer.getUserId(), false);
if (redis != null){
csPlayer = redis;
}
}
return CommonProto.UserRank.newBuilder()
.setUid(csPlayer.getUserId())
.setLevel(csPlayer.getLevel())

View File

@ -76,6 +76,13 @@ public class CrossArenaRank extends AbstractRank {
if (query == null){
return;
}
// 旧数据兼容
if (query.getLuoFuForce() == 0){
CSPlayer redis = CrossServiceLogic.getPlayerByRedis(query.getUserId(), false);
if (redis != null){
query = redis;
}
}
CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder()
.setRank(index)
.setParam1(query.getLuoFuForce())
@ -89,6 +96,13 @@ public class CrossArenaRank extends AbstractRank {
@Override
public CommonProto.UserRank.Builder getCrossOneUserRank(CSPlayer csPlayer, CommonProto.RankInfo.Builder everyRankInfo){
CommonProto.UserRank.Builder oneUserRank = super.getCrossOneUserRank(csPlayer, everyRankInfo);
// 旧数据兼容
if (csPlayer.getLuoFuForce() == 0){
CSPlayer redis = CrossServiceLogic.getPlayerByRedis(csPlayer.getUserId(), false);
if (redis != null){
csPlayer = redis;
}
}
oneUserRank.setForce(csPlayer.getLuoFuForce());
return oneUserRank;
}

View File

@ -389,7 +389,7 @@ public class BuyGoodsNewLogic {
ExpeditionLogic.sendTreasureRewardUpdate(session,user.getExpeditionManager().getWorldTreasureReward().getScore(),
rewardStatusMap,user.getExpeditionManager().getWorldTreasureReward().getCreateTime(),1);
}
if(type == GiftGoodsType.SUN_LONG){
if(type == GiftGoodsType.SUN_LONG){
PlayerManager playerManager = user.getPlayerInfoManager();
playerManager.setHadBuyTreasure(1);
playerManager.setTreasureLevel(playerManager.getTreasureLevel()+15);
@ -786,7 +786,12 @@ public class BuyGoodsNewLogic {
}else{
builder.setDynamicBuyTimes(bag.getLimit() - bag.getBuyTimes());
}
// 礼包类型特殊处理使用bought字段验证是否购买
if(bag.getType() == RechargeType.receive.getType()){
ReceiveWelfareBag receiveBag = (ReceiveWelfareBag) bag;
int bought = receiveBag.isBought()?1:0;
builder.setIsBought(bought);
}
return builder.build();
}

View File

@ -58,23 +58,20 @@ public class ReceiveWelfareBag extends AbstractWelfareBag {
@Override
public boolean buy() {
if(super.buy()){
if(bought){
LOGGER.error("礼包:{}已经购买",getModId());
return false;
}else {
setBought(true);
setStartTime(TimeUtils.getTodayZero());
if(getDailyUpdate()>0){
setRefreshTime(getStartTime() + getDailyUpdate() * TimeUtils.DAY);
}
if(getEndTime()!=0){
setEndTime(TimeUtils.getTodayZero() + getContinueDays() * TimeUtils.DAY);
}
return true;
if (bought) {
LOGGER.error("礼包:{}已经购买", getModId());
return false;
} else {
setBought(true);
setStartTime(TimeUtils.getTodayZero());
if (getDailyUpdate() > 0) {
setRefreshTime(getStartTime() + getDailyUpdate() * TimeUtils.DAY);
}
if (getEndTime() != 0) {
setEndTime(TimeUtils.getTodayZero() + getContinueDays() * TimeUtils.DAY);
}
return true;
}
return false;
}
@Override

View File

@ -113,7 +113,7 @@ public class ThreadManager implements IManager {
LOGGER.info("delayForMinute---->>>>{}" ,delayForMinute);
scheduledFutureSets.add( scheduledExecutor.scheduleAtFixedRate(new MinuteTask(), delayForMinute, 60, TimeUnit.SECONDS));
scheduledFutureSets.add( scheduledExecutor.scheduleAtFixedRate(new SecondsTask(), 0, 1, TimeUnit.SECONDS));
scheduledFutureSets.add( scheduledExecutor.scheduleAtFixedRate(new SecondsTask(), delayForMinute + 10, 1, TimeUnit.SECONDS));
// scheduledFutureSets.add( scheduledExecutor.scheduleAtFixedRate(new FetchBloodyEndDataThread(), 0, 1, TimeUnit.SECONDS));
scheduledFutureSets.add( scheduledExecutor.scheduleAtFixedRate(new Thread(){
public void run () {