回滚临时代码
parent
976e8bcafd
commit
4a09b99d48
|
@ -127,13 +127,10 @@ public class GMRequestHandler extends BaseHandler{
|
|||
CommonProto.GmResponse.Builder gmBuilder = CommonProto.GmResponse.newBuilder();
|
||||
switch (gmCommandType){
|
||||
case GlobalGm.ADD_ITEM:
|
||||
for(int i = 100;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));
|
||||
if (prarm1 ==1){
|
||||
prarm2 = Integer.parseInt(commandArray[2]);
|
||||
}
|
||||
gmBuilder.setDrop(ItemUtil.drop(cUser,new int[][]{{prarm1,prarm2}}, BIReason.GM_REWARD));
|
||||
break;
|
||||
case GlobalGm.ADD_CARD:
|
||||
gmBuilder.setDrop(giveHero(cUser,prarm1,prarm2));
|
||||
|
@ -146,33 +143,31 @@ public class GMRequestHandler extends BaseHandler{
|
|||
MessageUtil.sendIndicationMessage(iSession,1,MessageTypeProto.MessageType.SEND_RED_POINT_INDICATION_VALUE,redPointInfo,true);
|
||||
break;
|
||||
case GlobalGm.HERO_STAR:
|
||||
for(int i = 100;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<Integer, SCHeroRankUpConfig> scHeroRankUpConfigByType = STableManager.getFigureConfig(HeroStaticConfig.class).getScHeroRankUpConfigByShow(GlobalsDef.UP_STAR_TYPE,scHero.getStar());
|
||||
Map<Integer, SCHeroRankUpConfig> scHeroRankUpConfigByTypeTree = new TreeMap<>(scHeroRankUpConfigByType);
|
||||
SCHeroRankUpConfig scHeroRankUpConfig = ((TreeMap<Integer, SCHeroRankUpConfig>) scHeroRankUpConfigByTypeTree).lowerEntry(hero.getStar()).getValue();
|
||||
hero.setLevel(cUser,scHeroRankUpConfig.getOpenLevel());
|
||||
hero.setStarBreakId(scHeroRankUpConfig.getId());
|
||||
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<Integer, SCHeroRankUpConfig> scHeroRankUpConfigByType = STableManager.getFigureConfig(HeroStaticConfig.class).getScHeroRankUpConfigByShow(GlobalsDef.UP_STAR_TYPE,scHero.getStar());
|
||||
Map<Integer, SCHeroRankUpConfig> scHeroRankUpConfigByTypeTree = new TreeMap<>(scHeroRankUpConfigByType);
|
||||
SCHeroRankUpConfig scHeroRankUpConfig = ((TreeMap<Integer, SCHeroRankUpConfig>) 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);
|
||||
}
|
||||
CommonProto.Hero finalHeroProto = CBean2Proto.getHero(hero);
|
||||
gmBuilder.setDrop(CommonProto.Drop.newBuilder().addHero(finalHeroProto).build());
|
||||
hero.setBreakId(breakId);
|
||||
}
|
||||
CommonProto.Hero finalHeroProto = CBean2Proto.getHero(hero);
|
||||
gmBuilder.setDrop(CommonProto.Drop.newBuilder().addHero(finalHeroProto).build());
|
||||
|
||||
break;
|
||||
case GlobalGm.OPEN_MAP:
|
||||
MapLogic.getInstance().gmCrossFight(uid, prarm1);
|
||||
|
|
|
@ -1,68 +0,0 @@
|
|||
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;
|
||||
}
|
||||
}
|
|
@ -1,16 +1,12 @@
|
|||
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;
|
||||
import com.ljsd.jieling.db.mongo.MongoUtil;
|
||||
import com.ljsd.jieling.globals.BIReason;
|
||||
import com.ljsd.jieling.ktbeans.KtEventUtils;
|
||||
import com.ljsd.jieling.ktbeans.ReportEventEnum;
|
||||
import com.ljsd.jieling.ktbeans.ReportUtil;
|
||||
import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean;
|
||||
import com.ljsd.jieling.logic.OnlineUserManager;
|
||||
import com.ljsd.jieling.logic.activity.ActivityLogic;
|
||||
import com.ljsd.jieling.logic.activity.event.NewWelfareEvent;
|
||||
|
@ -20,16 +16,12 @@ import com.ljsd.jieling.logic.dao.root.User;
|
|||
import com.ljsd.jieling.logic.hero.HeroLogic;
|
||||
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;
|
||||
|
@ -81,14 +73,7 @@ public class UserManager {
|
|||
if (!UserManager.isUserExist(uid)){
|
||||
user = MongoUtil.getInstence().getMyMongoTemplate().findById(User.getCollectionName(), uid, User.class);
|
||||
if (user == null) {
|
||||
//
|
||||
for(int i = 100 ; i<=200;i++){
|
||||
|
||||
MongoUtil.getCoreMongoTemplate().save(new LoginUser(uid+10000+i,"test"+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);
|
||||
user = registerUser(uid,openId,channel,pid,gid,platform,ip,channle_id,bundle_id);
|
||||
}
|
||||
UserManager.addUser(user);
|
||||
}else{
|
||||
|
@ -106,7 +91,6 @@ 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(200);
|
||||
return user;
|
||||
}
|
||||
|
||||
|
|
|
@ -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)) { //策划资质改成星级
|
||||
|
|
Loading…
Reference in New Issue