注释错误代码
parent
676f4c9c17
commit
0188b69fb5
|
|
@ -623,12 +623,12 @@ public class GuildLogic {
|
||||||
RedisUtil.getInstence().putMapEntry(RedisKey.PLAYER_INFO_CACHE,"",String.valueOf(applyId),cache);
|
RedisUtil.getInstence().putMapEntry(RedisKey.PLAYER_INFO_CACHE,"",String.valueOf(applyId),cache);
|
||||||
int serverId = AreaManager.getInstance().getServerIdByUid(applyId, GameApplication.serverId);
|
int serverId = AreaManager.getInstance().getServerIdByUid(applyId, GameApplication.serverId);
|
||||||
AyyncWorker ayyncWorker = new AyyncWorker(targetUser, true, new AynMissionWorker(GameEvent.JOIN_FAMILY));
|
AyyncWorker ayyncWorker = new AyyncWorker(targetUser, true, new AynMissionWorker(GameEvent.JOIN_FAMILY));
|
||||||
if (serverId == GameApplication.serverId) {
|
// if (serverId == GameApplication.serverId) {
|
||||||
ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker);
|
// ProtocolsManager.getInstance().updateAyncWorker(ayyncWorker);
|
||||||
} else {
|
// } else {
|
||||||
String s = RedisUtil.getInstence().getGson().toJson(ayyncWorker);
|
// String s = RedisUtil.getInstence().getGson().toJson(ayyncWorker);
|
||||||
PlayerLogic.getInstance().updateUserInfo(serverId, applyId, s);
|
// PlayerLogic.getInstance().updateUserInfo(serverId, applyId, s);
|
||||||
}
|
// }
|
||||||
Poster.getPoster().dispatchEvent(new GuildForceChangeEvent(targetUser.getId(),targetUser.getPlayerInfoManager().getGuildId(),1,targetUser.getPlayerInfoManager().getMaxForce()));
|
Poster.getPoster().dispatchEvent(new GuildForceChangeEvent(targetUser.getId(),targetUser.getPlayerInfoManager().getGuildId(),1,targetUser.getPlayerInfoManager().getMaxForce()));
|
||||||
Family.GuildHelpInfoIndication.Builder builder = Family.GuildHelpInfoIndication.newBuilder();
|
Family.GuildHelpInfoIndication.Builder builder = Family.GuildHelpInfoIndication.newBuilder();
|
||||||
for (Map.Entry<Integer, Integer> entry : targetUser.getGuildMyInfo().getGuidHelpInfo().entrySet()) {
|
for (Map.Entry<Integer, Integer> entry : targetUser.getGuildMyInfo().getGuidHelpInfo().entrySet()) {
|
||||||
|
|
@ -703,20 +703,20 @@ public class GuildLogic {
|
||||||
targetUser.getGuildMyInfo().clearOfLevelGuild();
|
targetUser.getGuildMyInfo().clearOfLevelGuild();
|
||||||
addGuildLog(guildInfo.getId(),GuildDef.Log.KICK,targetUser.getPlayerInfoManager().getNickName());
|
addGuildLog(guildInfo.getId(),GuildDef.Log.KICK,targetUser.getPlayerInfoManager().getNickName());
|
||||||
|
|
||||||
int serverId = AreaManager.getInstance().getServerIdByUid(targetUid, GameApplication.serverId);
|
// int serverId = AreaManager.getInstance().getServerIdByUid(targetUid, GameApplication.serverId);
|
||||||
if (serverId != GameApplication.serverId) {
|
// if (serverId != GameApplication.serverId) {
|
||||||
AyyncWorker ayyncWorker = new AyyncWorker(targetUser, true, new AyncWorkerRunnable(){
|
// AyyncWorker ayyncWorker = new AyyncWorker(targetUser, true, new AyncWorkerRunnable(){
|
||||||
@Override
|
// @Override
|
||||||
public void work(User user) throws Exception {
|
// public void work(User user) throws Exception {
|
||||||
user.getPlayerInfoManager().setGuildId(0);
|
// user.getPlayerInfoManager().setGuildId(0);
|
||||||
user.getPlayerInfoManager().setWelfareRedPackets(clearRedPacketMap(user));
|
// user.getPlayerInfoManager().setWelfareRedPackets(clearRedPacketMap(user));
|
||||||
user.getGuildMyInfo().clearOfLevelGuild();
|
// user.getGuildMyInfo().clearOfLevelGuild();
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
String s = RedisUtil.getInstence().getGson().toJson(ayyncWorker);
|
// String s = RedisUtil.getInstence().getGson().toJson(ayyncWorker);
|
||||||
PlayerLogic.getInstance().updateUserInfo(serverId, targetUid, s);
|
// PlayerLogic.getInstance().updateUserInfo(serverId, targetUid, s);
|
||||||
return;
|
// return;
|
||||||
}
|
// }
|
||||||
String title = SErrorCodeEerverConfig.getI18NMessage("family_kick_title");
|
String title = SErrorCodeEerverConfig.getI18NMessage("family_kick_title");
|
||||||
String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("family_kick_txt",new Object[]{guildInfo.getName()},new int[]{0},"#");
|
String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("family_kick_txt",new Object[]{guildInfo.getName()},new int[]{0},"#");
|
||||||
MailLogic.getInstance().sendMail(targetUid,title,content,"",(int) (TimeUtils.now()/1000), Global.MAIL_EFFECTIVE_TIME);
|
MailLogic.getInstance().sendMail(targetUid,title,content,"",(int) (TimeUtils.now()/1000), Global.MAIL_EFFECTIVE_TIME);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue