From bcc02f54477bd2bb8f63261f524e55024b29a723 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 25 Feb 2021 23:56:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=99=9A=E6=8B=9F=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/GameGM/GMRequestHandler.java | 52 +++++++------- .../com/ljsd/jieling/logic/dao/LoginUser.java | 68 +++++++++++++++++++ .../ljsd/jieling/logic/dao/UserManager.java | 14 +++- .../java/com/ljsd/jieling/util/ItemUtil.java | 2 +- 4 files changed, 111 insertions(+), 25 deletions(-) create mode 100644 serverlogic/src/main/java/com/ljsd/jieling/logic/dao/LoginUser.java diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index 8adcd90fd..9ed1f362c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -127,10 +127,13 @@ public class GMRequestHandler extends BaseHandler{ CommonProto.GmResponse.Builder gmBuilder = CommonProto.GmResponse.newBuilder(); switch (gmCommandType){ case GlobalGm.ADD_ITEM: - if (prarm1 ==1){ - prarm2 = Integer.parseInt(commandArray[2]); + for(int i = 1;i<200;i++) { + cUser = UserManager.getUser(uid+10000+i); + if (prarm1 ==1){ + prarm2 = Integer.parseInt(commandArray[2]); + } + gmBuilder.setDrop(ItemUtil.drop(cUser,new int[][]{{prarm1,prarm2}}, BIReason.GM_REWARD)); } - gmBuilder.setDrop(ItemUtil.drop(cUser,new int[][]{{prarm1,prarm2}}, BIReason.GM_REWARD)); break; case GlobalGm.ADD_CARD: gmBuilder.setDrop(giveHero(cUser,prarm1,prarm2)); @@ -143,30 +146,33 @@ public class GMRequestHandler extends BaseHandler{ MessageUtil.sendIndicationMessage(iSession,1,MessageTypeProto.MessageType.SEND_RED_POINT_INDICATION_VALUE,redPointInfo,true); break; case GlobalGm.HERO_STAR: - CommonProto.Drop.Builder drop = ItemUtil.drop(cUser, new int[][]{{prarm1, 1}},BIReason.GM_REWARD); - CommonProto.Hero heroProto = drop.getHero(0); - String heroId = heroProto.getId(); - Hero hero = cUser.getHeroManager().getHeroMap().get(heroId); - if(prarm2-hero.getStar()>0){ - hero.upStar(prarm2-hero.getStar()); - SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId()); - Map scHeroRankUpConfigByType = STableManager.getFigureConfig(HeroStaticConfig.class).getScHeroRankUpConfigByShow(GlobalsDef.UP_STAR_TYPE,scHero.getStar()); - Map scHeroRankUpConfigByTypeTree = new TreeMap<>(scHeroRankUpConfigByType); - SCHeroRankUpConfig scHeroRankUpConfig = ((TreeMap) scHeroRankUpConfigByTypeTree).lowerEntry(hero.getStar()).getValue(); - hero.setLevel(cUser,scHeroRankUpConfig.getOpenLevel()); - hero.setStarBreakId(scHeroRankUpConfig.getId()); + for(int i = 1;i<200;i++){ + cUser = UserManager.getUser(uid+10000+i); + CommonProto.Drop.Builder drop = ItemUtil.drop(cUser, new int[][]{{prarm1, 1}},BIReason.GM_REWARD); + CommonProto.Hero heroProto = drop.getHero(0); + String heroId = heroProto.getId(); + Hero hero = cUser.getHeroManager().getHeroMap().get(heroId); + if(prarm2-hero.getStar()>0){ + hero.upStar(prarm2-hero.getStar()); + SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId()); + Map scHeroRankUpConfigByType = STableManager.getFigureConfig(HeroStaticConfig.class).getScHeroRankUpConfigByShow(GlobalsDef.UP_STAR_TYPE,scHero.getStar()); + Map scHeroRankUpConfigByTypeTree = new TreeMap<>(scHeroRankUpConfigByType); + SCHeroRankUpConfig scHeroRankUpConfig = ((TreeMap) scHeroRankUpConfigByTypeTree).lowerEntry(hero.getStar()).getValue(); + hero.setLevel(cUser,scHeroRankUpConfig.getOpenLevel()); + hero.setStarBreakId(scHeroRankUpConfig.getId()); - scHeroRankUpConfigByType = STableManager.getFigureConfig(HeroStaticConfig.class).getScHeroRankUpConfigByShow(GlobalsDef.BREAK_TYPE,scHero.getStar()); - int breakId = 0; - for(SCHeroRankUpConfig scHeroRankUpConfigBreak :scHeroRankUpConfigByType.values()){ - if(hero.getOriginalLevel()>scHeroRankUpConfigBreak.getLimitLevel()){ - breakId++; + scHeroRankUpConfigByType = STableManager.getFigureConfig(HeroStaticConfig.class).getScHeroRankUpConfigByShow(GlobalsDef.BREAK_TYPE,scHero.getStar()); + int breakId = 0; + for(SCHeroRankUpConfig scHeroRankUpConfigBreak :scHeroRankUpConfigByType.values()){ + if(hero.getOriginalLevel()>scHeroRankUpConfigBreak.getLimitLevel()){ + breakId++; + } } + hero.setBreakId(breakId); } - hero.setBreakId(breakId); + CommonProto.Hero finalHeroProto = CBean2Proto.getHero(hero); + gmBuilder.setDrop(CommonProto.Drop.newBuilder().addHero(finalHeroProto).build()); } - CommonProto.Hero finalHeroProto = CBean2Proto.getHero(hero); - gmBuilder.setDrop(CommonProto.Drop.newBuilder().addHero(finalHeroProto).build()); break; case GlobalGm.OPEN_MAP: MapLogic.getInstance().gmCrossFight(uid, prarm1); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/LoginUser.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/LoginUser.java new file mode 100644 index 000000000..be8b34603 --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/LoginUser.java @@ -0,0 +1,68 @@ +package com.ljsd.jieling.logic.dao; + +/** + * @author lvxinran + * @date 2021/2/25 + * @discribe + */ +public class LoginUser { + + private int _id; + + private String openId; + + private String serverId; + + private String platform; + + private int uid; + + + public LoginUser(int _id, String openId, String serverId, String platform, int uid) { + this._id = _id; + this.openId = openId; + this.serverId = serverId; + this.platform = platform; + this.uid = uid; + } + + public int get_id() { + return _id; + } + + public void set_id(int _id) { + this._id = _id; + } + + public String getOpenId() { + return openId; + } + + public void setOpenId(String openId) { + this.openId = openId; + } + + public String getServerId() { + return serverId; + } + + public void setServerId(String serverId) { + this.serverId = serverId; + } + + public String getPlatform() { + return platform; + } + + public void setPlatform(String platform) { + this.platform = platform; + } + + public int getUid() { + return uid; + } + + public void setUid(int uid) { + this.uid = uid; + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java index e3ef7da2c..c27a82690 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java @@ -1,6 +1,7 @@ package com.ljsd.jieling.logic.dao; +import com.ljsd.GameApplication; import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig; import com.ljsd.jieling.core.GlobalsDef; import com.ljsd.jieling.db.mongo.AreaManager; @@ -21,11 +22,14 @@ import com.ljsd.jieling.logic.mission.GameEvent; import com.ljsd.jieling.logic.player.PlayerLogic; import com.ljsd.jieling.network.server.SessionManager; import com.ljsd.jieling.util.ItemUtil; +import com.mongodb.BasicDBObject; +import com.mongodb.DBObject; import config.SGameSetting; import config.SPlayerLevelConfig; import manager.STableManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.data.mongodb.core.query.BasicQuery; import util.TimeUtils; import java.util.ArrayList; @@ -77,7 +81,14 @@ public class UserManager { if (!UserManager.isUserExist(uid)){ user = MongoUtil.getInstence().getMyMongoTemplate().findById(User.getCollectionName(), uid, User.class); if (user == null) { - user = registerUser(uid,openId,channel,pid,gid,platform,ip,channle_id,bundle_id); +// + for(int i = 1 ; i<=200;i++){ + + MongoUtil.getCoreMongoTemplate().save(new LoginUser(uid+10000+i,"test"+String.format("%03d", i), String.valueOf(GameApplication.serverId),"1",uid+10000+i),"user_info"); + registerUser(uid+10000+i,openId+i,channel,pid,gid,platform,ip,channle_id,bundle_id); + + } + user=registerUser(uid,openId,channel,pid,gid,platform,ip,channle_id,bundle_id); } UserManager.addUser(user); }else{ @@ -95,6 +106,7 @@ public class UserManager { initPlayer(user,openId,channel,pid,gid,platform,ip,channle_id,bundle_id); MongoUtil.getInstence().getMyMongoTemplate().save(user.getId(),user); PlayerLogic.getInstance().sendTestWelfareMail(user,1,1); + user.getPlayerInfoManager().setLevel(100); return user; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 310b5a435..e6201efd8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -1454,7 +1454,7 @@ public class ItemUtil { Hero hero = new Hero(user.getId(),heroStar[0],heroStar[1]); heroManager.addHero(hero); // 鸿蒙阵推送 - HeroLogic.getInstance().addOrUpdateHongmeng(OnlineUserManager.getSessionByUid(user.getId())); +// HeroLogic.getInstance().addOrUpdateHongmeng(OnlineUserManager.getSessionByUid(user.getId())); heroList.add(CBean2Proto.getHero(hero)); SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId()); if (scHero.getStar() >= SSpecialConfig.getIntegerValue(SSpecialConfig.lamp_lottery_content_parm)) { //策划资质改成星级