Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
906253e35b
|
|
@ -5,7 +5,6 @@ import com.ljsd.jieling.network.session.ISession;
|
|||
import com.ljsd.jieling.protocols.CommonProto;
|
||||
import com.ljsd.jieling.protocols.HeroInfoProto;
|
||||
import com.ljsd.jieling.protocols.MessageTypeProto;
|
||||
import com.ljsd.jieling.protocols.PlayerInfoProto;
|
||||
import com.ljsd.jieling.util.MessageUtil;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
|
@ -42,7 +41,6 @@ public class DrawHeroHandler extends BaseHandler {
|
|||
.setHeroId(1)
|
||||
.setAttack(2)
|
||||
.setStar(2)
|
||||
.setHeroType(1)
|
||||
.setLevel(1)
|
||||
.setHp(1000)
|
||||
.setMDefence(2000)
|
||||
|
|
@ -55,7 +53,6 @@ public class DrawHeroHandler extends BaseHandler {
|
|||
.setHeroId(2)
|
||||
.setAttack(2)
|
||||
.setStar(2)
|
||||
.setHeroType(1)
|
||||
.setLevel(1)
|
||||
.setHp(1000)
|
||||
.setMDefence(2000)
|
||||
|
|
@ -68,7 +65,6 @@ public class DrawHeroHandler extends BaseHandler {
|
|||
.setHeroId(3)
|
||||
.setAttack(2)
|
||||
.setStar(2)
|
||||
.setHeroType(1)
|
||||
.setLevel(1)
|
||||
.setHp(1000)
|
||||
.setMDefence(2000)
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@ public class GetAllHerosHandler extends BaseHandler{
|
|||
.setHeroId(1)
|
||||
.setAttack(2)
|
||||
.setStar(2)
|
||||
.setHeroType(1)
|
||||
.setLevel(1)
|
||||
.setHp(1000)
|
||||
.setMDefence(2000)
|
||||
|
|
@ -56,7 +55,6 @@ public class GetAllHerosHandler extends BaseHandler{
|
|||
.setHeroId(2)
|
||||
.setAttack(2)
|
||||
.setStar(2)
|
||||
.setHeroType(1)
|
||||
.setLevel(1)
|
||||
.setHp(1000)
|
||||
.setMDefence(2000)
|
||||
|
|
@ -69,7 +67,6 @@ public class GetAllHerosHandler extends BaseHandler{
|
|||
.setHeroId(3)
|
||||
.setAttack(2)
|
||||
.setStar(2)
|
||||
.setHeroType(1)
|
||||
.setLevel(1)
|
||||
.setHp(1000)
|
||||
.setMDefence(2000)
|
||||
|
|
|
|||
|
|
@ -41,17 +41,15 @@ public class CBean2Proto {
|
|||
.newBuilder()
|
||||
.setId(hero.getId())
|
||||
.setHeroId(hero.getTemplateId())
|
||||
.setHeroType(hero.getHeroType())
|
||||
.setLevel(hero.getLevel())
|
||||
.setStar(hero.getStar())
|
||||
.setQuality(1)
|
||||
.setHp(hero.getHp())
|
||||
.setAttack(hero.getAttack())
|
||||
.setPDefence(hero.getpDefence())
|
||||
.setMDefence(hero.getmDefence())
|
||||
.setSpeed(hero.getSpeed())
|
||||
.addAllSkillList(getHeroSkill(hero.getSkillList()))
|
||||
.addAllEquipList(getHeroEquip(hero.getEquipList()))
|
||||
.addAllEquipIdList(getHeroEquip(hero.getEquipList()))
|
||||
.build();
|
||||
return heroProto;
|
||||
}
|
||||
|
|
@ -63,18 +61,15 @@ public class CBean2Proto {
|
|||
CommonProto.Skill skill1 = CommonProto.Skill
|
||||
.newBuilder()
|
||||
.setSkillId(skill.getSkillId())
|
||||
.setSkillType(skill.getSkillType())
|
||||
.setLevel(skill.getLevel())
|
||||
.setStar(skill.getStar())
|
||||
.addAllEffectId(skill.getEffectIdList())
|
||||
.build();
|
||||
skills.add(skill1);
|
||||
}
|
||||
return skills;
|
||||
}
|
||||
|
||||
private static List<CommonProto.Equip> getHeroEquip(List<Equip> equipList) {
|
||||
List<CommonProto.Equip> equips = new ArrayList<>();
|
||||
private static List<String> getHeroEquip(List<Equip> equipList) {
|
||||
List<String> equips = new ArrayList<>();
|
||||
return equips;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ public class MessageUtil {
|
|||
public static void sendMessage(ISession session, int result, int msgId, GeneratedMessage generatedMessage, boolean flush) throws Exception {
|
||||
byte[] byteBuf = wrappedBuffer(session.getUid(), session.getToken(), session.getIndex(), result, msgId, generatedMessage);
|
||||
UserManager.ljsdMongoTemplate.lastUpdate();
|
||||
System.out.println("-----> msgId : "+ msgId+"; length : "+byteBuf.length+"; content : "+byteBuf);
|
||||
if (flush) {
|
||||
session.writeAndFlush(byteBuf);
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Reference in New Issue