Merge branch 'master_ob2' into master_dev

master_ob2
PC-202302260912\Administrator 2023-08-25 17:28:30 +08:00
commit 0ec3fe16b6
5 changed files with 16 additions and 8 deletions

View File

@ -1,5 +1,9 @@
{ {
"version":"5", "version":"6",
"classes":[ "classes":[
{"name":"GuildLogic.class","fullName":"com.ljsd.jieling.logic.family.GuildLogic"},
{"name":"GuilidManager.class","fullName":"com.ljsd.jieling.logic.dao.GuilidManager"},
{"name":"PlayerLogic.class","fullName":"com.ljsd.jieling.logic.player.PlayerLogic"},
{"name":"HeroLogic.class","fullName":"com.ljsd.jieling.logic.hero.HeroLogic"}
] ]
} }

View File

@ -155,12 +155,13 @@ public class GuilidManager {
needContinue=false; needContinue=false;
break; break;
} }
GuildInfo guildInfo = RedisUtil.getInstence().getMapValue2(getFamilyKey(), value, GuildInfo.class);
// redis清理key // redis清理key
AbstractRank guildRank = RankContext.getRankEnum(RankEnum.CAR_DEALY_GUILD_RANK.getType()); AbstractRank guildRank = RankContext.getRankEnum(RankEnum.CAR_DEALY_GUILD_RANK.getType());
RedisUtil.getInstence().zsetRemoveOne(RedisUtil.getInstence().getKey(guildRank.getRedisKey(),""),value); RedisUtil.getInstence().zsetRemoveOne(RedisUtil.getInstence().getKey(guildRank.getRedisKey(),""),value);
RedisUtil.getInstence().zsetRemoveOne(RedisUtil.getInstence().getKey2(guildRank.getCrossRedisKey(),""),value); RedisUtil.getInstence().zsetRemoveOne(RedisUtil.getInstence().getKey2(guildRank.getCrossRedisKey(),""),value);
GuildInfo guildInfo = RedisUtil.getInstence().getMapValue2(getFamilyKey(), value, GuildInfo.class);
if(guildInfo != null){ if(guildInfo != null){
// 公会存在 // 公会存在
String delKey = RedisUtil.getInstence().getKey(RedisKey.GUILD_SERVERID, String.valueOf(guildInfo.getId())); String delKey = RedisUtil.getInstence().getKey(RedisKey.GUILD_SERVERID, String.valueOf(guildInfo.getId()));

View File

@ -847,8 +847,11 @@ public class GuildLogic {
String title = SErrorCodeEerverConfig.getI18NMessage("guild_breakup_title"); String title = SErrorCodeEerverConfig.getI18NMessage("guild_breakup_title");
Set<Integer> chairmans = guildInfo.getMembers().get(GlobalsDef.CHAIRMAN); Set<Integer> chairmans = guildInfo.getMembers().get(GlobalsDef.CHAIRMAN);
Integer chairmanUid = chairmans.iterator().next(); Integer chairmanUid = chairmans.iterator().next();
User chairmanUser = UserManager.getUser(chairmanUid); CSPlayer player = CrossServiceLogic.getPlayerByRedis(chairmanUid);
String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("guild_breakup_txt",new String[]{guildInfo.getName(),chairmanUser.getPlayerInfoManager().getNickName()},new int[]{0,0},"#"); if (player == null){
return;
}
String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("guild_breakup_txt",new String[]{guildInfo.getName(),player.getName()},new int[]{0,0},"#");
for(Set<Integer> items : members.values()){ for(Set<Integer> items : members.values()){
for(Integer sendUid : items){ for(Integer sendUid : items){
try { try {

View File

@ -3408,7 +3408,7 @@ public class HeroLogic {
public int calForce(Map<Integer, Long> heroAllAttribute) { public int calForce(Map<Integer, Long> heroAllAttribute) {
float forceNum = 0;//基础值 float forceNum = 0;//基础值
float forceAdd = 0;//加成值 float forceAdd = 0;//加成值
LOGGER.info("战力基础属性=================={}",heroAllAttribute); // LOGGER.info("战力基础属性=================={}",heroAllAttribute);
//战力计算 //战力计算
for(Map.Entry<Integer, Long> item : heroAllAttribute.entrySet()){ for(Map.Entry<Integer, Long> item : heroAllAttribute.entrySet()){
Integer propertyId = item.getKey(); Integer propertyId = item.getKey();
@ -3423,7 +3423,7 @@ public class HeroLogic {
} }
if(sPropertyConfig.getStyle() == GlobalsDef.PERCENT_TYPE){ if(sPropertyConfig.getStyle() == GlobalsDef.PERCENT_TYPE){
forceAdd += propertyValue * sPropertyConfig.getScore() / 10000; forceAdd += propertyValue * sPropertyConfig.getScore() / 10000;
LOGGER.info("战力加成值 ================> {},{}" , propertyId, propertyValue * sPropertyConfig.getScore() / 10000); // LOGGER.info("战力加成值 ================> {},{}" , propertyId, propertyValue * sPropertyConfig.getScore() / 10000);
}else{ }else{
forceNum += propertyValue * sPropertyConfig.getScore(); forceNum += propertyValue * sPropertyConfig.getScore();
} }
@ -3431,7 +3431,7 @@ public class HeroLogic {
// BigDecimal bg = new BigDecimal(forceAdd).setScale(4, RoundingMode.UP); // BigDecimal bg = new BigDecimal(forceAdd).setScale(4, RoundingMode.UP);
// float v = bg.floatValue(); // float v = bg.floatValue();
float result = (forceAdd + 1) * forceNum; float result = (forceAdd + 1) * forceNum;
LOGGER.info("战力总结果==============={}{}{}",forceNum,forceAdd,result); // LOGGER.info("战力总结果==============={}{}{}",forceNum,forceAdd,result);
return (int)result; return (int)result;
} }

View File

@ -1764,7 +1764,7 @@ public class PlayerLogic {
} }
// JSONObject jsonObject = JSONObject.parseObject(userStr); // JSONObject jsonObject = JSONObject.parseObject(userStr);
// jsonObject.remove("activityManager"); // jsonObject.remove("activityManager");
LOGGER.info("callback=> rPCClient is =>{}",userStr); // LOGGER.info("callback=> rPCClient is =>{}",userStr);
return gson.fromJson(userStr, User.class); return gson.fromJson(userStr, User.class);
} }