充值上报设备id,公会副本第二天首次不嫩挑战

lvxinran 2020-11-30 08:09:14 +08:00
parent d2b35e4d32
commit 850ff06022
6 changed files with 39 additions and 22 deletions

View File

@ -134,6 +134,7 @@ public class LoginRequestHandler extends BaseHandler<PlayerInfoProto.LoginReques
}
user = UserManager.userLogin(userId,openIdFront,"",pid,gid,loginRequest.getPlatformS(),loginRequest.getIpS(),channle_id,bundle_id);
user.getPlayerInfoManager().setLastDeviceId(loginRequest.getDeviceIdS());
// String newToken = UserManager.getNewToken(userId);
UserRecentLoginInfo userRecentLoginInfo = new UserRecentLoginInfo(System.currentTimeMillis()/1000,user.getPlayerInfoManager().getLevel()

View File

@ -39,7 +39,7 @@ public enum ReportEventEnum {
JOIN_GUILD(25,"join_guild", new CommonEventHandler(),new String[]{"guild_id","guild_name","guild_level","guild_people_num","guild_fighting_capacity","guild_create_time"}),
QUIT_GUILD(26,"quit_guild", new CommonEventHandler(),new String[]{"guild_id","guild_name","guild_level","guild_people_num","guild_fighting_capacity","guild_create_time"}),
CREATE_ORDER(27,"create_order", new CommonEventHandler(),new String[]{"order_id","order_money_amount","Bundle_id","entrance","item_id","item_name","goods_id","item_list"}),
ORDER_COMPLETE(28,"order_complete", new ChargeAmountEventHandler(),new String[]{"order_id","order_money_amount","Bundle_id","channel_id","server_id","goods_id","goods_name","rewards_id_list","rewards_num_list","charge_time"}),
ORDER_COMPLETE(28,"order_complete", new ChargeAmountEventHandler(),new String[]{"order_id","order_money_amount","Bundle_id","channel_id","server_id","goods_id","goods_name","rewards_id_list","rewards_num_list","charge_time","device_id"}),
CHECK_RANKING(29,"check_ranking", new CommonEventHandler(),new String[]{"ranking_type"}),
ASK_FOR_BEING_FRIENDS(30,"ask_for_being_friends", new CommonEventHandler(),new String[]{"target_id","target_name","target_level","entrance"}),
ALLOW_FRIENDS_ASK(31,"allow_friends_ask", new CommonEventHandler(),new String[]{"target_id","target_name","target_level","entrance"}),

View File

@ -29,6 +29,8 @@ public class PlayerManager extends MongoBase {
private String bundle_id;
private String lastDeviceId;
private String nickName;
private int sex;
@ -810,4 +812,13 @@ public class PlayerManager extends MongoBase {
updateString("sheJiOpenTime",sheJiOpenTime);
this.sheJiOpenTime = sheJiOpenTime;
}
public String getLastDeviceId() {
return lastDeviceId;
}
public void setLastDeviceId(String lastDeviceId) {
this.lastDeviceId = lastDeviceId;
updateString("lastDeviceId",lastDeviceId);
}
}

View File

@ -233,30 +233,34 @@ public class GuildChallengeLogic {
//记录血量
damage = damageInt;
}else{
//扫荡
if(guildInfo.getBossHpRemain()!=-1){
int remain = guildInfo.getBossHpRemain() - guildMyInfo.getGuildChallengeDamage();
if(remain>=0){
guildInfo.setBossHpRemain(remain);
}else{
Map<Integer, SGuildLevelConfig> levelConfigMap = STableManager.getConfig(SGuildLevelConfig.class);
if (guildInfo.getExp() + config.getLegionExp() >= levelConfigMap.get(guildInfo.getLevel()).getExp()) {
guildInfo.updateExp(guildInfo.getExp() + config.getLegionExp() - levelConfigMap.get(guildInfo.getLevel()).getExp());
guildInfo.updateLevel(guildInfo.getLevel() + 1);
RedisUtil.getInstence().putMapEntry(RedisKey.FAMILY_INFO, "", String.valueOf(guildInfo.getId()), new GuildCache(GameApplication.serverId, guildInfo.getIcon(), guildInfo.getLevel(), guildInfo.getName()));
} else {
guildInfo.updateExp(guildInfo.getExp() + config.getLegionExp());
}
if(guildInfo.getCurrBossId()!=configMap.size()){
guildInfo.setCurrBossId(guildInfo.getCurrBossId() + 1);
guildInfo.setBossHpRemain(0);
if(guildMyInfo.getGuildChallengeDamage()==0){
error = "今天没有挑战过,无法扫荡";
}else{
//扫荡
if(guildInfo.getBossHpRemain()!=-1){
int remain = guildInfo.getBossHpRemain() - guildMyInfo.getGuildChallengeDamage();
if(remain>=0){
guildInfo.setBossHpRemain(remain);
}else{
guildInfo.setBossHpRemain(-1);
Map<Integer, SGuildLevelConfig> levelConfigMap = STableManager.getConfig(SGuildLevelConfig.class);
if (guildInfo.getExp() + config.getLegionExp() >= levelConfigMap.get(guildInfo.getLevel()).getExp()) {
guildInfo.updateExp(guildInfo.getExp() + config.getLegionExp() - levelConfigMap.get(guildInfo.getLevel()).getExp());
guildInfo.updateLevel(guildInfo.getLevel() + 1);
RedisUtil.getInstence().putMapEntry(RedisKey.FAMILY_INFO, "", String.valueOf(guildInfo.getId()), new GuildCache(GameApplication.serverId, guildInfo.getIcon(), guildInfo.getLevel(), guildInfo.getName()));
} else {
guildInfo.updateExp(guildInfo.getExp() + config.getLegionExp());
}
if(guildInfo.getCurrBossId()!=configMap.size()){
guildInfo.setCurrBossId(guildInfo.getCurrBossId() + 1);
guildInfo.setBossHpRemain(0);
}else{
guildInfo.setBossHpRemain(-1);
}
kill=1;
}
kill=1;
}
damage = guildMyInfo.getGuildChallengeDamage();
}
damage = guildMyInfo.getGuildChallengeDamage();
}
}
}

View File

@ -58,6 +58,7 @@ public class GuildLogic {
user.getGuildMyInfo().setFetetype(0);
user.getGuildMyInfo().clearHadTakeReward();
user.getGuildMyInfo().setGuildChallengeDamage(0);
if(null!=fBuilder){
fBuilder.setLastFeteType(user.getGuildMyInfo().getFetetype());

View File

@ -449,7 +449,7 @@ public class BuyGoodsLogic {
onChargeSuccess(uid,price,0,orderId,cfgType);//充值成功上报
Map<Integer, Integer> mapReward = ItemUtil.arrayToMap(baseReward);
if(price>0){
ReportUtil.onReportEvent(user, ReportEventEnum.ORDER_COMPLETE.getType(),orderId,price,user.getPlayerInfoManager().getBundle_id(),user.getPlayerInfoManager().getChannel_id(),String.valueOf(GameApplication.serverId),String.valueOf(goodsId),sRechargeCommodityConfig.getName(),new ArrayList<>(mapReward.keySet()),new ArrayList<>(mapReward.values()),new Date());
ReportUtil.onReportEvent(user, ReportEventEnum.ORDER_COMPLETE.getType(),orderId,price,user.getPlayerInfoManager().getBundle_id(),user.getPlayerInfoManager().getChannel_id(),String.valueOf(GameApplication.serverId),String.valueOf(goodsId),sRechargeCommodityConfig.getName(),new ArrayList<>(mapReward.keySet()),new ArrayList<>(mapReward.values()),new Date(),user.getPlayerInfoManager().getLastDeviceId()==null?"DEFAULT_DEVICE":user.getPlayerInfoManager().getLastDeviceId());
}
return resultRes;