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

热更bug修复

back_recharge
duhui 2023-01-27 00:06:48 +08:00
parent dc11a8943e
commit ba78a6c201
4 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serverlogic/src/main/java/com/ljsd/jieling/handler/equip/ComplexJewelEquipRequestHandler.java
View File

@ -104,7 +104,6 @@ public class ComplexJewelEquipRequestHandler extends BaseHandler<HeroInfoProto.C
dropItems[0] = new int[2];
dropItems[0][0] = sTargetEquipStarsConfig.getId();
dropItems[0][1] = proto.getNum();
CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropItems, BIReason.COMPLEX_EQUIP);
HeroInfoProto.ComplexJewelEquipResponse.Builder response = HeroInfoProto.ComplexJewelEquipResponse.newBuilder();
//remove old 宝器
@ -120,6 +119,7 @@ public class ComplexJewelEquipRequestHandler extends BaseHandler<HeroInfoProto.C
equipManager.remove(id);
i++;
}
CommonProto.Drop.Builder drop = ItemUtil.drop(user, dropItems, BIReason.COMPLEX_EQUIP);
response.setDrop(drop);
MessageUtil.sendIndicationMessage(user.getId(), response.build());
ReportUtil.onReportEvent(user, ReportEventEnum.TREASURE_SYNTHESIS.getType(),targetEquip+"-"+proto.getNum(),new ArrayList<>(consumeMap.keySet()),new ArrayList<>(consumeMap.values()));

3
serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java
View File

@ -104,6 +104,9 @@ public class GuildLogic {
//take rewards checkAndUpdate
GuildInfo guildInfo = GuilidManager.getGuildInfo(guildId);
if (guildInfo == null){
continue;
}
int fete = guildInfo.getFete();
if(sGuildSacrificeRewardConfig.getScore()>fete){
continue;

51
serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java
View File

@ -1351,27 +1351,27 @@ public class CBean2Proto {
* @param crossSeals
* @return
*/
public static Map<Integer, PurpleMansionSeal> sealOfCross(Map<Integer, com.ljsd.jieling.thrift.idl.PurpleMansionSeal> crossSeals){
HashMap<Integer, PurpleMansionSeal> result = new HashMap<>();
for (Map.Entry<Integer, com.ljsd.jieling.thrift.idl.PurpleMansionSeal> entry : crossSeals.entrySet()) {
PurpleMansionSeal seal = PurpleMansionSeal.createCrossSeal(entry.getValue());
result.put(entry.getKey(),seal);
}
return result;
}
/**
* 跨服，转换魂宝对象
* @return
*/
public static Map<String, Jewel> jewelOfCross(CrossArenaManager arena, ArenaOfHero hero){
HashMap<String, Jewel> result = new HashMap<>();
for (String id : hero.getJewelInfo()) {
Jewel jewel = new Jewel(arena.getJewels().get(id));
result.put(id,jewel);
}
return result;
}
// public static Map<Integer, PurpleMansionSeal> sealOfCross(Map<Integer, com.ljsd.jieling.thrift.idl.PurpleMansionSeal> crossSeals){
// HashMap<Integer, PurpleMansionSeal> result = new HashMap<>();
// for (Map.Entry<Integer, com.ljsd.jieling.thrift.idl.PurpleMansionSeal> entry : crossSeals.entrySet()) {
// PurpleMansionSeal seal = PurpleMansionSeal.createCrossSeal(entry.getValue());
// result.put(entry.getKey(),seal);
// }
// return result;
// }
//
// /**
// * 跨服，转换魂宝对象
// * @return
// */
// public static Map<String, Jewel> jewelOfCross(CrossArenaManager arena, ArenaOfHero hero){
// HashMap<String, Jewel> result = new HashMap<>();
// for (String id : hero.getJewelInfo()) {
// Jewel jewel = new Jewel(arena.getJewels().get(id));
// result.put(id,jewel);
// }
// return result;
// }
/**
* 本服，转换魂宝对象
@ -1381,11 +1381,14 @@ public class CBean2Proto {
HashMap<String, Jewel> result = new HashMap<>();
Map<String, PropertyItem> itemMap = user.getEquipManager().getEquipMap();
for (String id : hero.getJewelInfo()) {
Jewel jewel = (Jewel) itemMap.get(id);
if (jewel == null){
PropertyItem item = itemMap.get(id);
if (item == null){
continue;
}
result.put(id,jewel);
if (item instanceof Jewel){
Jewel jewel = (Jewel) item;
result.put(id,jewel);
}
}
return result;
}

17
serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
View File

@ -1337,12 +1337,17 @@ public class ItemUtil {
jewels.put(item.getQuantity(), jewels.get(item.getQuantity()) + 1);
}
if (item.getQuantity() >= SSpecialConfig.getIntegerValue(msgTem+"_parm")) {
String nickName = user.getPlayerInfoManager().getNickName();
String nameColor = user.getPlayerInfoManager().getNameColor();
String message = SErrorCodeEerverConfig.getI18NMessageNeedConvert(msgTem,
new Object[]{nameColor, nickName, equipQulityNameMap.get(item.getQuantity()), item.getName()},
new int[]{0,0,1,1});
ChatLogic.getInstance().sendSysChatMessage(message,Global.LUCKY_LUCK,String.valueOf(equipId),0,0,0,0,0);
try {
String nickName = user.getPlayerInfoManager().getNickName();
String nameColor = user.getPlayerInfoManager().getNameColor();
String message = SErrorCodeEerverConfig.getI18NMessageNeedConvert(msgTem,
new Object[]{nameColor, nickName, equipQulityNameMap.get(item.getQuantity()), item.getName()},
new int[]{0,0,1,1});
ChatLogic.getInstance().sendSysChatMessage(message,Global.LUCKY_LUCK,String.valueOf(equipId),0,0,0,0,0);
}catch (Exception e){
LOGGER.error("发送通知报错：{}",e.getMessage());
e.printStackTrace();
}
}
}