Merge branch 'master_test_gn' into master_prb_gn
commit
e6bafcd98b
|
@ -253,6 +253,7 @@ public class GetPlayerInfoHandler extends BaseHandler{
|
||||||
Poster.getPoster().dispatchEvent(new HeroUpStarEvent(user.getId(),10023,0));
|
Poster.getPoster().dispatchEvent(new HeroUpStarEvent(user.getId(),10023,0));
|
||||||
// 无尽秘宝处理
|
// 无尽秘宝处理
|
||||||
endLessTreasureHandler(user);
|
endLessTreasureHandler(user);
|
||||||
|
expeditionTreasureHandler(user);
|
||||||
user.getUserMissionManager().onGameEvent(user,GameEvent.DAILY_TASK_TYPE,0,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.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);
|
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) {
|
private List<CommonProto.SixiangxinfaInfo> getSixiangxinfaInfos(HeroManager heroManager) {
|
||||||
Map<Integer,SixiangProfessionInfo> sixiangDataMap = heroManager.getSixiangDataMap();
|
Map<Integer,SixiangProfessionInfo> sixiangDataMap = heroManager.getSixiangDataMap();
|
||||||
|
|
|
@ -152,6 +152,13 @@ public class GetWorldArenaChallengeRequestHandler extends BaseHandler<WorldProto
|
||||||
}
|
}
|
||||||
teamInfo = FightUtil.makeCrossPersonData(csPlayer, proto.getTeamId(), null, crossArenaManager);
|
teamInfo = FightUtil.makeCrossPersonData(csPlayer, proto.getTeamId(), null, crossArenaManager);
|
||||||
arenaEnemys = ArenaLogic.getInstance().getUserCrossArenaEnemy(csPlayer,proto.getChallengeRank(),false).build();
|
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();
|
defendForce = csPlayer.getLuoFuForce();
|
||||||
} else {
|
} else {
|
||||||
//机器人
|
//机器人
|
||||||
|
|
|
@ -26,7 +26,7 @@ public interface ActivityType {
|
||||||
// int RechargeTotal = 5; //累计充值
|
// int RechargeTotal = 5; //累计充值
|
||||||
int GrowthFund = 6; //成长基金
|
int GrowthFund = 6; //成长基金
|
||||||
int BLESSACTIVITY = 7;//云梦祈福
|
int BLESSACTIVITY = 7;//云梦祈福
|
||||||
int TREASURE = 8; //戒灵秘宝(孙龙的宝藏)
|
int TREASURE = 8; //青龙秘宝(孙龙的宝藏)
|
||||||
int LUCKYCAT = 9;//招財貓
|
int LUCKYCAT = 9;//招財貓
|
||||||
int SERVERHAPPY = 10; //七日狂欢
|
int SERVERHAPPY = 10; //七日狂欢
|
||||||
int FORCERANK = 11; //战力排行
|
int FORCERANK = 11; //战力排行
|
||||||
|
|
|
@ -25,9 +25,8 @@ class GrowthFundActivity extends AbstractActivity {
|
||||||
int[][] values = sActivityRewardConfig.getValues();
|
int[][] values = sActivityRewardConfig.getValues();
|
||||||
User user = UserManager.getUser(session.getUid());
|
User user = UserManager.getUser(session.getUid());
|
||||||
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
SGlobalActivity sGlobalActivity = SGlobalActivity.getsGlobalActivityMap().get(id);
|
||||||
AbstractWelfareBag bag = user.getPlayerInfoManager().getNewRechargeInfo().getReceiveMap().get(sGlobalActivity.getCanBuyRechargeId()[0]);
|
ReceiveWelfareBag bag = (ReceiveWelfareBag)user.getPlayerInfoManager().getNewRechargeInfo().getReceiveMap().get(sGlobalActivity.getCanBuyRechargeId()[0]);
|
||||||
int buyTimes = bag.getBuyTimes();
|
if (!bag.isBought()){
|
||||||
if(buyTimes == 0){
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
int type = values[0][0];
|
int type = values[0][0];
|
||||||
|
@ -43,14 +42,6 @@ class GrowthFundActivity extends AbstractActivity {
|
||||||
return true;
|
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
|
@Override
|
||||||
void updateProgress(ActivityMission activityMission, int count) {
|
void updateProgress(ActivityMission activityMission, int count) {
|
||||||
activityMission.setV(count);
|
activityMission.setV(count);
|
||||||
|
|
|
@ -133,22 +133,16 @@ public class CrossServiceLogic {
|
||||||
csPlayer.setGuildId(p.getGuildId());
|
csPlayer.setGuildId(p.getGuildId());
|
||||||
csPlayer.setCrossYxldMaxLevel(crossYxldMaxLevel);
|
csPlayer.setCrossYxldMaxLevel(crossYxldMaxLevel);
|
||||||
//玉虚三个队伍总战力
|
//玉虚三个队伍总战力
|
||||||
if (csPlayer.getMaxFore() == 0) {
|
int force1 = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.CROSS_YU_XU_LUN_DAO_ONE.getTeamId(), false);
|
||||||
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 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);
|
||||||
int force3 = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.CROSS_YU_XU_LUN_DAO_THREE.getTeamId(), false);
|
csPlayer.setMaxFore(force1+force2+force3);
|
||||||
csPlayer.setMaxFore(force1+force2+force3);
|
|
||||||
}
|
|
||||||
// 主线编队战力
|
// 主线编队战力
|
||||||
if (csPlayer.getMainLineForce() == 0) {
|
int mainLine = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.FORMATION_NORMAL.getTeamId(), false);
|
||||||
int mainLine = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.FORMATION_NORMAL.getTeamId(), false);
|
csPlayer.setMainLineForce(mainLine);
|
||||||
csPlayer.setMainLineForce(mainLine);
|
|
||||||
}
|
|
||||||
// 罗浮编队战力
|
// 罗浮编队战力
|
||||||
if (csPlayer.getLuoFuForce() == 0) {
|
int luoFu = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.FORMATION_NORMAL.getTeamId(), false);
|
||||||
int luoFu = HeroLogic.getInstance().calTeamTotalForce(user, TeamEnum.FORMATION_NORMAL.getTeamId(), false);
|
csPlayer.setLuoFuForce(luoFu);
|
||||||
csPlayer.setLuoFuForce(luoFu);
|
|
||||||
}
|
|
||||||
return csPlayer;
|
return csPlayer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1010,6 +1010,13 @@ public class ArenaLogic {
|
||||||
Object get = RedisUtil.getInstence().hget(RedisKey.ARENA_PROUD_COUNT, String.valueOf(csPlayer.getUserId()));
|
Object get = RedisUtil.getInstence().hget(RedisKey.ARENA_PROUD_COUNT, String.valueOf(csPlayer.getUserId()));
|
||||||
int proudTime = get==null?1:Integer.parseInt((String)get);
|
int proudTime = get==null?1:Integer.parseInt((String)get);
|
||||||
String serverName = CrossServiceLogic.simplifyServerName(csPlayer.getServerId());
|
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()
|
CommonProto.ArenaPersonInfo personInfoBuild = CommonProto.ArenaPersonInfo.newBuilder()
|
||||||
.setUid(csPlayer.getUserId())
|
.setUid(csPlayer.getUserId())
|
||||||
.setLevel(csPlayer.getLevel())
|
.setLevel(csPlayer.getLevel())
|
||||||
|
|
|
@ -36,7 +36,6 @@ public class WorldTreasureReward extends MongoBase {
|
||||||
score = 0;
|
score = 0;
|
||||||
setRewardStatusMap(new HashMap<>());
|
setRewardStatusMap(new HashMap<>());
|
||||||
setIsBuy(0);
|
setIsBuy(0);
|
||||||
// updateRound(round+1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -23,6 +23,7 @@ import com.ljsd.jieling.logic.mail.MailLogic;
|
||||||
import com.ljsd.jieling.logic.mission.GameEvent;
|
import com.ljsd.jieling.logic.mission.GameEvent;
|
||||||
import com.ljsd.jieling.logic.store.BuyGoodsNewLogic;
|
import com.ljsd.jieling.logic.store.BuyGoodsNewLogic;
|
||||||
import com.ljsd.jieling.logic.store.StoreLogic;
|
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.network.session.ISession;
|
||||||
import com.ljsd.jieling.util.ItemUtil;
|
import com.ljsd.jieling.util.ItemUtil;
|
||||||
import com.ljsd.jieling.util.MessageUtil;
|
import com.ljsd.jieling.util.MessageUtil;
|
||||||
|
@ -550,6 +551,12 @@ public class ExpeditionLogic {
|
||||||
//重置
|
//重置
|
||||||
if(TimeUtils.nowInt()>=createTime){
|
if(TimeUtils.nowInt()>=createTime){
|
||||||
user.getExpeditionManager().resetTreasureReward();
|
user.getExpeditionManager().resetTreasureReward();
|
||||||
|
// 天宫秘宝礼包刷新
|
||||||
|
ReceiveWelfareBag bagInfo = (ReceiveWelfareBag) user.getPlayerInfoManager().getNewRechargeInfo().getReceiveMap().get(106);
|
||||||
|
if (bagInfo == null){
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
bagInfo.refresh();
|
||||||
sendAllTreasureInfo(user);
|
sendAllTreasureInfo(user);
|
||||||
BuyGoodsNewLogic.sendGiftGooodsIndication(user.getId());
|
BuyGoodsNewLogic.sendGiftGooodsIndication(user.getId());
|
||||||
}
|
}
|
||||||
|
|
|
@ -1222,7 +1222,7 @@ public class HeroLogic {
|
||||||
if (teamId == TeamEnum.FORMATION_NORMAL.getTeamId()) {
|
if (teamId == TeamEnum.FORMATION_NORMAL.getTeamId()) {
|
||||||
Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(iSession.getUid()));
|
Poster.getPoster().dispatchEvent(new UserMainTeamForceEvent(iSession.getUid()));
|
||||||
}
|
}
|
||||||
//跨服 玉虚论道
|
//跨服编队
|
||||||
if (TeamEnum.isCrossTeam(teamId)) {
|
if (TeamEnum.isCrossTeam(teamId)) {
|
||||||
CrossServiceLogic.getInstance().saveBasicPlayerToRedis(user);
|
CrossServiceLogic.getInstance().saveBasicPlayerToRedis(user);
|
||||||
}
|
}
|
||||||
|
|
|
@ -267,6 +267,13 @@ public abstract class AbstractRank implements IRank {
|
||||||
public CommonProto.UserRank.Builder getCrossOneUserRank(CSPlayer csPlayer, CommonProto.RankInfo.Builder everyRankInfo){
|
public CommonProto.UserRank.Builder getCrossOneUserRank(CSPlayer csPlayer, CommonProto.RankInfo.Builder everyRankInfo){
|
||||||
String serverName = CrossServiceLogic.simplifyServerName(csPlayer.getServerId());
|
String serverName = CrossServiceLogic.simplifyServerName(csPlayer.getServerId());
|
||||||
GuildCache mapEntry = CrossDeathPathLogic.getCrossGuild(csPlayer.getGuildId());
|
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()
|
return CommonProto.UserRank.newBuilder()
|
||||||
.setUid(csPlayer.getUserId())
|
.setUid(csPlayer.getUserId())
|
||||||
.setLevel(csPlayer.getLevel())
|
.setLevel(csPlayer.getLevel())
|
||||||
|
|
|
@ -76,6 +76,13 @@ public class CrossArenaRank extends AbstractRank {
|
||||||
if (query == null){
|
if (query == null){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
// 旧数据兼容
|
||||||
|
if (query.getLuoFuForce() == 0){
|
||||||
|
CSPlayer redis = CrossServiceLogic.getPlayerByRedis(query.getUserId(), false);
|
||||||
|
if (redis != null){
|
||||||
|
query = redis;
|
||||||
|
}
|
||||||
|
}
|
||||||
CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder()
|
CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder()
|
||||||
.setRank(index)
|
.setRank(index)
|
||||||
.setParam1(query.getLuoFuForce())
|
.setParam1(query.getLuoFuForce())
|
||||||
|
@ -89,6 +96,13 @@ public class CrossArenaRank extends AbstractRank {
|
||||||
@Override
|
@Override
|
||||||
public CommonProto.UserRank.Builder getCrossOneUserRank(CSPlayer csPlayer, CommonProto.RankInfo.Builder everyRankInfo){
|
public CommonProto.UserRank.Builder getCrossOneUserRank(CSPlayer csPlayer, CommonProto.RankInfo.Builder everyRankInfo){
|
||||||
CommonProto.UserRank.Builder oneUserRank = super.getCrossOneUserRank(csPlayer, 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());
|
oneUserRank.setForce(csPlayer.getLuoFuForce());
|
||||||
return oneUserRank;
|
return oneUserRank;
|
||||||
}
|
}
|
||||||
|
|
|
@ -389,7 +389,7 @@ public class BuyGoodsNewLogic {
|
||||||
ExpeditionLogic.sendTreasureRewardUpdate(session,user.getExpeditionManager().getWorldTreasureReward().getScore(),
|
ExpeditionLogic.sendTreasureRewardUpdate(session,user.getExpeditionManager().getWorldTreasureReward().getScore(),
|
||||||
rewardStatusMap,user.getExpeditionManager().getWorldTreasureReward().getCreateTime(),1);
|
rewardStatusMap,user.getExpeditionManager().getWorldTreasureReward().getCreateTime(),1);
|
||||||
}
|
}
|
||||||
if(type == GiftGoodsType.SUN_LONG){
|
if(type == GiftGoodsType.SUN_LONG){
|
||||||
PlayerManager playerManager = user.getPlayerInfoManager();
|
PlayerManager playerManager = user.getPlayerInfoManager();
|
||||||
playerManager.setHadBuyTreasure(1);
|
playerManager.setHadBuyTreasure(1);
|
||||||
playerManager.setTreasureLevel(playerManager.getTreasureLevel()+15);
|
playerManager.setTreasureLevel(playerManager.getTreasureLevel()+15);
|
||||||
|
@ -786,7 +786,12 @@ public class BuyGoodsNewLogic {
|
||||||
}else{
|
}else{
|
||||||
builder.setDynamicBuyTimes(bag.getLimit() - bag.getBuyTimes());
|
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();
|
return builder.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -58,23 +58,20 @@ public class ReceiveWelfareBag extends AbstractWelfareBag {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean buy() {
|
public boolean buy() {
|
||||||
if(super.buy()){
|
if (bought) {
|
||||||
if(bought){
|
LOGGER.error("礼包:{}已经购买", getModId());
|
||||||
LOGGER.error("礼包:{}已经购买",getModId());
|
return false;
|
||||||
return false;
|
} else {
|
||||||
}else {
|
setBought(true);
|
||||||
setBought(true);
|
setStartTime(TimeUtils.getTodayZero());
|
||||||
setStartTime(TimeUtils.getTodayZero());
|
if (getDailyUpdate() > 0) {
|
||||||
if(getDailyUpdate()>0){
|
setRefreshTime(getStartTime() + getDailyUpdate() * TimeUtils.DAY);
|
||||||
setRefreshTime(getStartTime() + getDailyUpdate() * TimeUtils.DAY);
|
|
||||||
}
|
|
||||||
if(getEndTime()!=0){
|
|
||||||
setEndTime(TimeUtils.getTodayZero() + getContinueDays() * TimeUtils.DAY);
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
if (getEndTime() != 0) {
|
||||||
|
setEndTime(TimeUtils.getTodayZero() + getContinueDays() * TimeUtils.DAY);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue