back_recharge
wangyuan 2019-12-12 13:45:09 +08:00
parent 4b2d619df6
commit 2efcce2614
9 changed files with 2372 additions and 1467 deletions

View File

@ -43462,7 +43462,7 @@ public final class CommonProto {
* <code>optional int32 hadTakeLevelBox = 2;</code> * <code>optional int32 hadTakeLevelBox = 2;</code>
* *
* <pre> * <pre>
* 1 0 * 1 0
* </pre> * </pre>
*/ */
boolean hasHadTakeLevelBox(); boolean hasHadTakeLevelBox();
@ -43470,28 +43470,10 @@ public final class CommonProto {
* <code>optional int32 hadTakeLevelBox = 2;</code> * <code>optional int32 hadTakeLevelBox = 2;</code>
* *
* <pre> * <pre>
* 1 0 * 1 0
* </pre> * </pre>
*/ */
int getHadTakeLevelBox(); int getHadTakeLevelBox();
// optional int32 hadTakeDailyBox = 3;
/**
* <code>optional int32 hadTakeDailyBox = 3;</code>
*
* <pre>
* 1vip -1
* </pre>
*/
boolean hasHadTakeDailyBox();
/**
* <code>optional int32 hadTakeDailyBox = 3;</code>
*
* <pre>
* 1vip -1
* </pre>
*/
int getHadTakeDailyBox();
} }
/** /**
* Protobuf type {@code com.ljsd.jieling.protocols.VipBaseInfo} * Protobuf type {@code com.ljsd.jieling.protocols.VipBaseInfo}
@ -43554,11 +43536,6 @@ public final class CommonProto {
hadTakeLevelBox_ = input.readInt32(); hadTakeLevelBox_ = input.readInt32();
break; break;
} }
case 24: {
bitField0_ |= 0x00000004;
hadTakeDailyBox_ = input.readInt32();
break;
}
} }
} }
} catch (com.google.protobuf.InvalidProtocolBufferException e) { } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -43630,7 +43607,7 @@ public final class CommonProto {
* <code>optional int32 hadTakeLevelBox = 2;</code> * <code>optional int32 hadTakeLevelBox = 2;</code>
* *
* <pre> * <pre>
* 1 0 * 1 0
* </pre> * </pre>
*/ */
public boolean hasHadTakeLevelBox() { public boolean hasHadTakeLevelBox() {
@ -43640,41 +43617,16 @@ public final class CommonProto {
* <code>optional int32 hadTakeLevelBox = 2;</code> * <code>optional int32 hadTakeLevelBox = 2;</code>
* *
* <pre> * <pre>
* 1 0 * 1 0
* </pre> * </pre>
*/ */
public int getHadTakeLevelBox() { public int getHadTakeLevelBox() {
return hadTakeLevelBox_; return hadTakeLevelBox_;
} }
// optional int32 hadTakeDailyBox = 3;
public static final int HADTAKEDAILYBOX_FIELD_NUMBER = 3;
private int hadTakeDailyBox_;
/**
* <code>optional int32 hadTakeDailyBox = 3;</code>
*
* <pre>
* 1vip -1
* </pre>
*/
public boolean hasHadTakeDailyBox() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* <code>optional int32 hadTakeDailyBox = 3;</code>
*
* <pre>
* 1vip -1
* </pre>
*/
public int getHadTakeDailyBox() {
return hadTakeDailyBox_;
}
private void initFields() { private void initFields() {
vipLevel_ = 0; vipLevel_ = 0;
hadTakeLevelBox_ = 0; hadTakeLevelBox_ = 0;
hadTakeDailyBox_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@ -43694,9 +43646,6 @@ public final class CommonProto {
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeInt32(2, hadTakeLevelBox_); output.writeInt32(2, hadTakeLevelBox_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeInt32(3, hadTakeDailyBox_);
}
getUnknownFields().writeTo(output); getUnknownFields().writeTo(output);
} }
@ -43714,10 +43663,6 @@ public final class CommonProto {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeInt32Size(2, hadTakeLevelBox_); .computeInt32Size(2, hadTakeLevelBox_);
} }
if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(3, hadTakeDailyBox_);
}
size += getUnknownFields().getSerializedSize(); size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size; memoizedSerializedSize = size;
return size; return size;
@ -43838,8 +43783,6 @@ public final class CommonProto {
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
hadTakeLevelBox_ = 0; hadTakeLevelBox_ = 0;
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
hadTakeDailyBox_ = 0;
bitField0_ = (bitField0_ & ~0x00000004);
return this; return this;
} }
@ -43876,10 +43819,6 @@ public final class CommonProto {
to_bitField0_ |= 0x00000002; to_bitField0_ |= 0x00000002;
} }
result.hadTakeLevelBox_ = hadTakeLevelBox_; result.hadTakeLevelBox_ = hadTakeLevelBox_;
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004;
}
result.hadTakeDailyBox_ = hadTakeDailyBox_;
result.bitField0_ = to_bitField0_; result.bitField0_ = to_bitField0_;
onBuilt(); onBuilt();
return result; return result;
@ -43902,9 +43841,6 @@ public final class CommonProto {
if (other.hasHadTakeLevelBox()) { if (other.hasHadTakeLevelBox()) {
setHadTakeLevelBox(other.getHadTakeLevelBox()); setHadTakeLevelBox(other.getHadTakeLevelBox());
} }
if (other.hasHadTakeDailyBox()) {
setHadTakeDailyBox(other.getHadTakeDailyBox());
}
this.mergeUnknownFields(other.getUnknownFields()); this.mergeUnknownFields(other.getUnknownFields());
return this; return this;
} }
@ -43987,7 +43923,7 @@ public final class CommonProto {
* <code>optional int32 hadTakeLevelBox = 2;</code> * <code>optional int32 hadTakeLevelBox = 2;</code>
* *
* <pre> * <pre>
* 1 0 * 1 0
* </pre> * </pre>
*/ */
public boolean hasHadTakeLevelBox() { public boolean hasHadTakeLevelBox() {
@ -43997,7 +43933,7 @@ public final class CommonProto {
* <code>optional int32 hadTakeLevelBox = 2;</code> * <code>optional int32 hadTakeLevelBox = 2;</code>
* *
* <pre> * <pre>
* 1 0 * 1 0
* </pre> * </pre>
*/ */
public int getHadTakeLevelBox() { public int getHadTakeLevelBox() {
@ -44007,7 +43943,7 @@ public final class CommonProto {
* <code>optional int32 hadTakeLevelBox = 2;</code> * <code>optional int32 hadTakeLevelBox = 2;</code>
* *
* <pre> * <pre>
* 1 0 * 1 0
* </pre> * </pre>
*/ */
public Builder setHadTakeLevelBox(int value) { public Builder setHadTakeLevelBox(int value) {
@ -44020,7 +43956,7 @@ public final class CommonProto {
* <code>optional int32 hadTakeLevelBox = 2;</code> * <code>optional int32 hadTakeLevelBox = 2;</code>
* *
* <pre> * <pre>
* 1 0 * 1 0
* </pre> * </pre>
*/ */
public Builder clearHadTakeLevelBox() { public Builder clearHadTakeLevelBox() {
@ -44030,55 +43966,6 @@ public final class CommonProto {
return this; return this;
} }
// optional int32 hadTakeDailyBox = 3;
private int hadTakeDailyBox_ ;
/**
* <code>optional int32 hadTakeDailyBox = 3;</code>
*
* <pre>
* 1vip -1
* </pre>
*/
public boolean hasHadTakeDailyBox() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* <code>optional int32 hadTakeDailyBox = 3;</code>
*
* <pre>
* 1vip -1
* </pre>
*/
public int getHadTakeDailyBox() {
return hadTakeDailyBox_;
}
/**
* <code>optional int32 hadTakeDailyBox = 3;</code>
*
* <pre>
* 1vip -1
* </pre>
*/
public Builder setHadTakeDailyBox(int value) {
bitField0_ |= 0x00000004;
hadTakeDailyBox_ = value;
onChanged();
return this;
}
/**
* <code>optional int32 hadTakeDailyBox = 3;</code>
*
* <pre>
* 1vip -1
* </pre>
*/
public Builder clearHadTakeDailyBox() {
bitField0_ = (bitField0_ & ~0x00000004);
hadTakeDailyBox_ = 0;
onChanged();
return this;
}
// @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.VipBaseInfo) // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.VipBaseInfo)
} }
@ -81654,116 +81541,115 @@ public final class CommonProto {
"\t \001(\005\022\022\n\narenaLevel\030\n \001(\005\"f\n\017UserMission" + "\t \001(\005\022\022\n\narenaLevel\030\n \001(\005\"f\n\017UserMission" +
"Info\022\021\n\tmissionId\030\001 \001(\005\022\020\n\010progress\030\002 \001(" + "Info\022\021\n\tmissionId\030\001 \001(\005\022\020\n\010progress\030\002 \001(" +
"\005\022\r\n\005state\030\003 \001(\005\022\014\n\004type\030\004 \001(\005\022\021\n\ttakeTi" + "\005\022\r\n\005state\030\003 \001(\005\022\014\n\004type\030\004 \001(\005\022\021\n\ttakeTi" +
"mes\030\005 \001(\005\"Q\n\013VipBaseInfo\022\020\n\010vipLevel\030\001 \001", "mes\030\005 \001(\005\"8\n\013VipBaseInfo\022\020\n\010vipLevel\030\001 \001",
"(\005\022\027\n\017hadTakeLevelBox\030\002 \001(\005\022\027\n\017hadTakeDa" + "(\005\022\027\n\017hadTakeLevelBox\030\002 \001(\005\"\250\001\n\006Friend\022\n" +
"ilyBox\030\003 \001(\005\"\250\001\n\006Friend\022\n\n\002id\030\001 \001(\005\022\014\n\004n" + "\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\n\n\002lv\030\003 \001(\005\022\023\n\013" +
"ame\030\002 \001(\t\022\n\n\002lv\030\003 \001(\005\022\023\n\013offLineTime\030\004 \001" + "offLineTime\030\004 \001(\004\022\022\n\nhaveReward\030\005 \001(\005\022\016\n" +
"(\004\022\022\n\nhaveReward\030\005 \001(\005\022\016\n\006isGive\030\006 \001(\005\022\021" + "\006isGive\030\006 \001(\005\022\021\n\tisApplyed\030\007 \001(\005\022\014\n\004head" +
"\n\tisApplyed\030\007 \001(\005\022\014\n\004head\030\014 \001(\005\022\r\n\005frame" + "\030\014 \001(\005\022\r\n\005frame\030\r \001(\005\022\017\n\007soulVal\030\016 \001(\005\"V" +
"\030\r \001(\005\022\017\n\007soulVal\030\016 \001(\005\"V\n\rGiftGoodsInfo" + "\n\rGiftGoodsInfo\022\017\n\007goodsId\030\001 \001(\005\022\020\n\010buyT" +
"\022\017\n\007goodsId\030\001 \001(\005\022\020\n\010buyTimes\030\002 \001(\005\022\021\n\ts" + "imes\030\002 \001(\005\022\021\n\tstartTime\030\003 \001(\005\022\017\n\007endTime" +
"tartTime\030\003 \001(\005\022\017\n\007endTime\030\004 \001(\005\"7\n\021Goods" + "\030\004 \001(\005\"7\n\021GoodsTypeDuration\022\021\n\tgoodsType" +
"TypeDuration\022\021\n\tgoodsType\030\001 \001(\005\022\017\n\007endTi" + "\030\001 \001(\005\022\017\n\007endTime\030\002 \001(\005\"/\n\016TechnologyInf" +
"me\030\002 \001(\005\"/\n\016TechnologyInfo\022\016\n\006techId\030\001 \001", "o\022\016\n\006techId\030\001 \001(\005\022\r\n\005levle\030\002 \001(\005\"J\n\020Sudd",
"(\005\022\r\n\005levle\030\002 \001(\005\"J\n\020SuddenlyBossInfo\022\022\n" + "enlyBossInfo\022\022\n\nsuddBossId\030\006 \001(\005\022\017\n\007endT" +
"\nsuddBossId\030\006 \001(\005\022\017\n\007endTime\030\007 \001(\005\022\021\n\tfi" + "ime\030\007 \001(\005\022\021\n\tfindMapId\030\010 \001(\005\"H\n\010ItemInfo" +
"ndMapId\030\010 \001(\005\"H\n\010ItemInfo\022\022\n\ntemplateId\030" + "\022\022\n\ntemplateId\030\001 \001(\005\022\017\n\007overlap\030\002 \001(\005\022\027\n" +
"\001 \001(\005\022\017\n\007overlap\030\002 \001(\005\022\027\n\017nextRefreshTim" + "\017nextRefreshTime\030\003 \001(\005\"H\n\010RankInfo\022\014\n\004ra" +
"e\030\003 \001(\005\"H\n\010RankInfo\022\014\n\004rank\030\001 \001(\005\022\016\n\006par" + "nk\030\001 \001(\005\022\016\n\006param1\030\002 \001(\005\022\016\n\006param2\030\003 \001(\005" +
"am1\030\002 \001(\005\022\016\n\006param2\030\003 \001(\005\022\016\n\006param3\030\004 \001(" + "\022\016\n\006param3\030\004 \001(\005\"\244\001\n\010UserRank\022\013\n\003uid\030\001 \001" +
"\005\"\244\001\n\010UserRank\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 \001" + "(\005\022\r\n\005level\030\002 \001(\005\022\014\n\004head\030\003 \001(\005\022\020\n\010userN" +
"(\005\022\014\n\004head\030\003 \001(\005\022\020\n\010userName\030\004 \001(\t\0226\n\010ra" + "ame\030\004 \001(\t\0226\n\010rankInfo\030\005 \001(\0132$.com.ljsd.j" +
"nkInfo\030\005 \001(\0132$.com.ljsd.jieling.protocol" + "ieling.protocols.RankInfo\022\021\n\theadFrame\030\006" +
"s.RankInfo\022\021\n\theadFrame\030\006 \001(\005\022\021\n\tguildNa", " \001(\005\022\021\n\tguildName\030\007 \001(\t\"\204\001\n\025ActorEffectB",
"me\030\007 \001(\t\"\204\001\n\025ActorEffectBufferInfo\022\n\n\002id" + "ufferInfo\022\n\n\002id\030\001 \001(\005\022\014\n\004type\030\002 \001(\005\022\021\n\ts" +
"\030\001 \001(\005\022\014\n\004type\030\002 \001(\005\022\021\n\tstartTime\030\003 \001(\005\022" + "tartTime\030\003 \001(\005\022\017\n\007endTime\030\004 \001(\005\022\016\n\006targe" +
"\017\n\007endTime\030\004 \001(\005\022\016\n\006target\030\005 \001(\005\022\016\n\006cast" + "t\030\005 \001(\005\022\016\n\006caster\030\006 \001(\005\022\r\n\005value\030\007 \003(\005\"T" +
"er\030\006 \001(\005\022\r\n\005value\030\007 \003(\005\"T\n\016BloodyHeroInf" + "\n\016BloodyHeroInfo\022\016\n\006heroId\030\001 \001(\t\022\016\n\006hero" +
"o\022\016\n\006heroId\030\001 \001(\t\022\016\n\006heroHp\030\002 \001(\005\022\021\n\ther" + "Hp\030\002 \001(\005\022\021\n\theroMaxHp\030\003 \001(\005\022\017\n\007heroTid\030\004" +
"oMaxHp\030\003 \001(\005\022\017\n\007heroTid\030\004 \001(\005\"%\n\010SceneMs" + " \001(\005\"%\n\010SceneMsg\022\014\n\004time\030\001 \001(\005\022\013\n\003msg\030\002 " +
"g\022\014\n\004time\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\"\'\n\nPosMiner" + "\001(\t\"\'\n\nPosMineral\022\013\n\003pos\030\001 \001(\005\022\014\n\004nums\030\002" +
"al\022\013\n\003pos\030\001 \001(\005\022\014\n\004nums\030\002 \001(\005\"\264\001\n\010Creatu" + " \001(\005\"\264\001\n\010Creature\022\014\n\004path\030\001 \003(\005\022\r\n\005speed" +
"re\022\014\n\004path\030\001 \003(\005\022\r\n\005speed\030\002 \001(\005\022\r\n\005maxHp" + "\030\002 \001(\005\022\r\n\005maxHp\030\003 \001(\005\022\r\n\005curHp\030\004 \001(\005\022\017\n\007" +
"\030\003 \001(\005\022\r\n\005curHp\030\004 \001(\005\022\017\n\007mineral\030\005 \001(\005\022\014", "mineral\030\005 \001(\005\022\014\n\004camp\030\006 \001(\005\022<\n\010heroInfo\030",
"\n\004camp\030\006 \001(\005\022<\n\010heroInfo\030\007 \003(\0132*.com.ljs" + "\007 \003(\0132*.com.ljsd.jieling.protocols.Blood" +
"d.jieling.protocols.BloodyHeroInfo\022\020\n\010ki" + "yHeroInfo\022\020\n\010killNums\030\010 \001(\005\"\217\001\n\nSceneAct" +
"llNums\030\010 \001(\005\"\217\001\n\nSceneActor\022\n\n\002id\030\001 \001(\005\022" + "or\022\n\n\002id\030\001 \001(\005\022\016\n\006curPos\030\002 \001(\005\022\r\n\005state\030" +
"\016\n\006curPos\030\002 \001(\005\022\r\n\005state\030\003 \001(\005\022\014\n\004type\030\004" + "\003 \001(\005\022\014\n\004type\030\004 \001(\005\0226\n\010Creature\030\006 \001(\0132$." +
" \001(\005\0226\n\010Creature\030\006 \001(\0132$.com.ljsd.jielin" + "com.ljsd.jieling.protocols.Creature\022\020\n\010u" +
"g.protocols.Creature\022\020\n\010userName\030\007 \001(\t\"\236" + "serName\030\007 \001(\t\"\236\002\n\tSceneInfo\022\016\n\006roomId\030\001 " +
"\002\n\tSceneInfo\022\016\n\006roomId\030\001 \001(\005\022\r\n\005mapId\030\002 " + "\001(\005\022\r\n\005mapId\030\002 \001(\005\022:\n\nSceneActor\030\003 \003(\0132&" +
"\001(\005\022:\n\nSceneActor\030\003 \003(\0132&.com.ljsd.jieli" + ".com.ljsd.jieling.protocols.SceneActor\022P" +
"ng.protocols.SceneActor\022P\n\025actorEffectBu" + "\n\025actorEffectBufferInfo\030\004 \003(\01321.com.ljsd" +
"fferInfo\030\004 \003(\01321.com.ljsd.jieling.protoc", ".jieling.protocols.ActorEffectBufferInfo",
"ols.ActorEffectBufferInfo\022\024\n\014barrierPoin" + "\022\024\n\014barrierPoint\030\005 \003(\005\022:\n\nposMineral\030\006 \003" +
"t\030\005 \003(\005\022:\n\nposMineral\030\006 \003(\0132&.com.ljsd.j" + "(\0132&.com.ljsd.jieling.protocols.PosMiner" +
"ieling.protocols.PosMineral\022\022\n\nremainTim" + "al\022\022\n\nremainTime\030\007 \001(\005\"S\n\027SceneGetFullMs" +
"e\030\007 \001(\005\"S\n\027SceneGetFullMsgResponse\0228\n\tsc" + "gResponse\0228\n\tsceneInfo\030\001 \001(\0132%.com.ljsd." +
"eneInfo\030\001 \001(\0132%.com.ljsd.jieling.protoco" + "jieling.protocols.SceneInfo\"B\n\013blessRewa" +
"ls.SceneInfo\"B\n\013blessReward\022\022\n\nlocationI" + "rd\022\022\n\nlocationId\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\022\020\n" +
"d\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\022\020\n\010rewardId\030\003 \001(\005" + "\010rewardId\030\003 \001(\005\"5\n\022fiveResetTowerInfo\022\r\n" +
"\"5\n\022fiveResetTowerInfo\022\r\n\005tower\030\001 \001(\005\022\020\n" + "\005tower\030\001 \001(\005\022\020\n\010intoType\030\002 \001(\005\";\n\020Family" +
"\010intoType\030\002 \001(\005\";\n\020FamilyContribute\022\013\n\003w" + "Contribute\022\013\n\003win\030\001 \001(\005\022\014\n\004draw\030\002 \001(\005\022\014\n" +
"in\030\001 \001(\005\022\014\n\004draw\030\002 \001(\005\022\014\n\004fail\030\003 \001(\005\"\210\002\n", "\004fail\030\003 \001(\005\"\210\002\n\016FamilyBaseInfo\022\n\n\002id\030\001 \001",
"\016FamilyBaseInfo\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(" + "(\005\022\014\n\004name\030\002 \001(\t\022\017\n\007annouce\030\003 \001(\t\022\r\n\005lev" +
"\t\022\017\n\007annouce\030\003 \001(\t\022\r\n\005levle\030\004 \001(\005\022\013\n\003exp" + "le\030\004 \001(\005\022\013\n\003exp\030\005 \001(\005\022\020\n\010totalNum\030\006 \001(\005\022" +
"\030\005 \001(\005\022\020\n\010totalNum\030\006 \001(\005\022\016\n\006maxNum\030\007 \001(\005" + "\016\n\006maxNum\030\007 \001(\005\022\020\n\010joinType\030\010 \001(\005\022\014\n\004ico" +
"\022\020\n\010joinType\030\010 \001(\005\022\014\n\004icon\030\t \001(\005\022\021\n\tleve" + "n\030\t \001(\005\022\021\n\tlevelTime\030\n \001(\005\022A\n\013fightResul" +
"lTime\030\n \001(\005\022A\n\013fightResult\030\013 \001(\0132,.com.l" + "t\030\013 \001(\0132,.com.ljsd.jieling.protocols.Fam" +
"jsd.jieling.protocols.FamilyContribute\022\027" + "ilyContribute\022\027\n\017playerIntoLevel\030\014 \001(\005\")" +
"\n\017playerIntoLevel\030\014 \001(\005\")\n\013endlessHero\022\016" + "\n\013endlessHero\022\016\n\006heroId\030\001 \001(\t\022\n\n\002hp\030\002 \001(" +
"\n\006heroId\030\001 \001(\t\022\n\n\002hp\030\002 \001(\005\"2\n\022EndlessRef" + "\005\"2\n\022EndlessRefreshInfo\022\016\n\006cellId\030\001 \001(\005\022" +
"reshInfo\022\016\n\006cellId\030\001 \001(\005\022\014\n\004time\030\002 \001(\005\"u" + "\014\n\004time\030\002 \001(\005\"u\n\014UseForceInfo\022\014\n\004name\030\001 " +
"\n\014UseForceInfo\022\014\n\004name\030\001 \001(\t\022\014\n\004leve\030\002 \001", "\001(\t\022\014\n\004leve\030\002 \001(\005\022\r\n\005force\030\003 \001(\005\022\014\n\004rank",
"(\005\022\r\n\005force\030\003 \001(\005\022\014\n\004rank\030\004 \001(\005\022\014\n\004head\030" + "\030\004 \001(\005\022\014\n\004head\030\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005\022" +
"\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005\022\013\n\003uid\030\007 \001(\005\"H\n" + "\013\n\003uid\030\007 \001(\005\"H\n\013endlessSign\022\r\n\005mapId\030\001 \001" +
"\013endlessSign\022\r\n\005mapId\030\001 \001(\005\022\016\n\006cellId\030\002 " + "(\005\022\016\n\006cellId\030\002 \001(\005\022\014\n\004info\030\003 \001(\t\022\014\n\004type" +
"\001(\005\022\014\n\004info\030\003 \001(\t\022\014\n\004type\030\004 \001(\005\"g\n\nExper" + "\030\004 \001(\005\"g\n\nExpertInfo\022\014\n\004name\030\001 \001(\t\022\r\n\005sc" +
"tInfo\022\014\n\004name\030\001 \001(\t\022\r\n\005score\030\002 \001(\005\022\014\n\004ra" + "ore\030\002 \001(\005\022\014\n\004rank\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\022\014" +
"nk\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\022\014\n\004head\030\005 \001(\005\022\021\n" + "\n\004head\030\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005\")\n\nSignI" +
"\theadFrame\030\006 \001(\005\")\n\nSignInInfo\022\014\n\004days\030\001" + "nInfo\022\014\n\004days\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\"N\n\016Te" +
" \001(\005\022\r\n\005state\030\002 \001(\005\"N\n\016TeamSimpleInfo\022\016\n" + "amSimpleInfo\022\016\n\006heroid\030\001 \001(\t\022\017\n\007heroTid\030" +
"\006heroid\030\001 \001(\t\022\017\n\007heroTid\030\002 \001(\005\022\014\n\004star\030\003" + "\002 \001(\005\022\014\n\004star\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\"\207\001\n\017T" +
" \001(\005\022\r\n\005level\030\004 \001(\005\"\207\001\n\017TeamOneTeamInfo\022", "eamOneTeamInfo\0228\n\004team\030\001 \003(\0132*.com.ljsd.",
"8\n\004team\030\001 \003(\0132*.com.ljsd.jieling.protoco" + "jieling.protocols.TeamSimpleInfo\022\024\n\014Poke" +
"ls.TeamSimpleInfo\022\024\n\014PokemonInfos\030\002 \003(\005\022" + "monInfos\030\002 \003(\005\022\022\n\ntotalForce\030\003 \001(\005\022\020\n\010re" +
"\022\n\ntotalForce\030\003 \001(\005\022\020\n\010remainHp\030\004 \003(\005\"\271\001" + "mainHp\030\004 \003(\005\"\271\001\n\013TeamOneInfo\022\013\n\003uid\030\001 \001(" +
"\n\013TeamOneInfo\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 \001(" + "\005\022\r\n\005level\030\002 \001(\005\022\014\n\004name\030\003 \001(\t\022\014\n\004head\030\004" +
"\005\022\014\n\004name\030\003 \001(\t\022\014\n\004head\030\004 \001(\005\022\021\n\theadFra" + " \001(\005\022\021\n\theadFrame\030\005 \001(\005\022\021\n\tguildName\030\007 \001" +
"me\030\005 \001(\005\022\021\n\tguildName\030\007 \001(\t\0229\n\004team\030\006 \001(" + "(\t\0229\n\004team\030\006 \001(\0132+.com.ljsd.jieling.prot" +
"\0132+.com.ljsd.jieling.protocols.TeamOneTe" + "ocols.TeamOneTeamInfo\022\021\n\tisApplyed\030\010 \001(\005" +
"amInfo\022\021\n\tisApplyed\030\010 \001(\005\"y\n\017MonsterRank" + "\"y\n\017MonsterRankInfo\022\014\n\004name\030\001 \001(\t\022\r\n\005sco" +
"Info\022\014\n\004name\030\001 \001(\t\022\r\n\005score\030\002 \001(\005\022\014\n\004ran" + "re\030\002 \001(\005\022\014\n\004rank\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\022\014\n" +
"k\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\022\014\n\004head\030\005 \001(\005\022\021\n\t", "\004head\030\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005\022\013\n\003uid\030\007 ",
"headFrame\030\006 \001(\005\022\013\n\003uid\030\007 \001(\005\"2\n\rHeroBloo" + "\001(\005\"2\n\rHeroBloodInfo\022\016\n\006heroId\030\001 \001(\t\022\021\n\t" +
"dInfo\022\016\n\006heroId\030\001 \001(\t\022\021\n\tlostBlood\030\002 \001(\005" + "lostBlood\030\002 \001(\005\"D\n\013EndlessInfo\022\r\n\005mapId\030" +
"\"D\n\013EndlessInfo\022\r\n\005mapId\030\001 \001(\005\022\022\n\nworldL" + "\001 \001(\005\022\022\n\nworldLevel\030\002 \001(\005\022\022\n\nbloodScore\030" +
"evel\030\002 \001(\005\022\022\n\nbloodScore\030\003 \001(\005\"2\n\017Player" + "\003 \001(\005\"2\n\017PlayerBindPhone\022\020\n\010phoneNum\030\001 \001" +
"BindPhone\022\020\n\010phoneNum\030\001 \001(\t\022\r\n\005state\030\002 \001" + "(\t\022\r\n\005state\030\002 \001(\005\"3\n\014EndlessPoint\022\020\n\010loc" +
"(\005\"3\n\014EndlessPoint\022\020\n\010location\030\001 \001(\005\022\021\n\t" + "ation\030\001 \001(\005\022\021\n\tmonsterId\030\002 \001(\005\"2\n\014Strong" +
"monsterId\030\002 \001(\005\"2\n\014StrongerInfo\022\020\n\010curSc" + "erInfo\022\020\n\010curScore\030\001 \001(\005\022\020\n\010maxScore\030\002 \001" +
"ore\030\001 \001(\005\022\020\n\010maxScore\030\002 \001(\005\"U\n\017QuestionO" + "(\005\"U\n\017QuestionOptions\022\017\n\007content\030\001 \001(\t\022\014" +
"ptions\022\017\n\007content\030\001 \001(\t\022\014\n\004type\030\002 \001(\005\022\017\n" + "\n\004type\030\002 \001(\005\022\017\n\007options\030\003 \003(\t\022\022\n\nanswerT" +
"\007options\030\003 \003(\t\022\022\n\nanswerType\030\004 \001(\005\"\212\001\n\017B", "ype\030\004 \001(\005\"\212\001\n\017BloodPersonInfo\022\n\n\002id\030\001 \001(",
"loodPersonInfo\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t" + "\005\022\014\n\004name\030\002 \001(\t\022\021\n\theadFrame\030\003 \001(\005\022\014\n\004he" +
"\022\021\n\theadFrame\030\003 \001(\005\022\014\n\004head\030\004 \001(\005\022\020\n\010ser" + "ad\030\004 \001(\005\022\020\n\010serverId\030\005 \001(\005\022\r\n\005level\030\006 \001(" +
"verId\030\005 \001(\005\022\r\n\005level\030\006 \001(\005\022\014\n\004rank\030\007 \001(\005" + "\005\022\014\n\004rank\030\007 \001(\005\022\r\n\005score\030\010 \001(\005\"H\n\026LuckWh" +
"\022\r\n\005score\030\010 \001(\005\"H\n\026LuckWheelRewardPosInf" + "eelRewardPosInfo\022\013\n\003pos\030\001 \001(\005\022\016\n\006luckId\030" +
"o\022\013\n\003pos\030\001 \001(\005\022\016\n\006luckId\030\002 \001(\005\022\021\n\tluckTi" + "\002 \001(\005\022\021\n\tluckTimes\030\003 \001(\005\"W\n\013RefreshTask\022" +
"mes\030\003 \001(\005\"W\n\013RefreshTask\022\014\n\004type\030\001 \001(\005\022:" + "\014\n\004type\030\001 \001(\005\022:\n\005tasks\030\002 \003(\0132+.com.ljsd." +
"\n\005tasks\030\002 \003(\0132+.com.ljsd.jieling.protoco" + "jieling.protocols.UserMissionInfo\"\221\001\n\021Ma" +
"ls.UserMissionInfo\"\221\001\n\021MainLevelRankInfo" + "inLevelRankInfo\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 " +
"\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 \001(\005\022\014\n\004name\030\003 \001" + "\001(\005\022\014\n\004name\030\003 \001(\t\022\017\n\007fightId\030\004 \001(\005\022\014\n\004he" +
"(\t\022\017\n\007fightId\030\004 \001(\005\022\014\n\004head\030\005 \001(\005\022\014\n\004ran", "ad\030\005 \001(\005\022\014\n\004rank\030\006 \001(\005\022\022\n\ntotalForce\030\007 \001",
"k\030\006 \001(\005\022\022\n\ntotalForce\030\007 \001(\005\022\021\n\theadFrame" + "(\005\022\021\n\theadFrame\030\010 \001(\005\"B\n\017ChampionBetInfo" +
"\030\010 \001(\005\"B\n\017ChampionBetInfo\022\n\n\002id\030\001 \001(\t\022\020\n" + "\022\n\n\002id\030\001 \001(\t\022\020\n\010redCoins\030\002 \001(\005\022\021\n\tblueCo" +
"\010redCoins\030\002 \001(\005\022\021\n\tblueCoins\030\003 \001(\005\"B\n\026Ch" + "ins\030\003 \001(\005\"B\n\026ChampionTeamPersonInfo\022\013\n\003u" +
"ampionTeamPersonInfo\022\013\n\003uid\030\001 \001(\005\022\014\n\004nam" + "id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\r\n\005score\030\003 \001(\005\"\231\001" +
"e\030\002 \001(\t\022\r\n\005score\030\003 \001(\005\"\231\001\n\022ChampionBattl" + "\n\022ChampionBattleInfo\0227\n\006myInfo\030\001 \001(\0132\'.c" +
"eInfo\0227\n\006myInfo\030\001 \001(\0132\'.com.ljsd.jieling" + "om.ljsd.jieling.protocols.TeamOneInfo\022:\n" +
".protocols.TeamOneInfo\022:\n\tenemyInfo\030\002 \001(" + "\tenemyInfo\030\002 \001(\0132\'.com.ljsd.jieling.prot" +
"\0132\'.com.ljsd.jieling.protocols.TeamOneIn" + "ocols.TeamOneInfo\022\016\n\006result\030\003 \001(\005B\002H\001"
"fo\022\016\n\006result\030\003 \001(\005B\002H\001"
}; };
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -82051,7 +81937,7 @@ public final class CommonProto {
internal_static_com_ljsd_jieling_protocols_VipBaseInfo_fieldAccessorTable = new internal_static_com_ljsd_jieling_protocols_VipBaseInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable( com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_ljsd_jieling_protocols_VipBaseInfo_descriptor, internal_static_com_ljsd_jieling_protocols_VipBaseInfo_descriptor,
new java.lang.String[] { "VipLevel", "HadTakeLevelBox", "HadTakeDailyBox", }); new java.lang.String[] { "VipLevel", "HadTakeLevelBox", });
internal_static_com_ljsd_jieling_protocols_Friend_descriptor = internal_static_com_ljsd_jieling_protocols_Friend_descriptor =
getDescriptor().getMessageTypes().get(46); getDescriptor().getMessageTypes().get(46);
internal_static_com_ljsd_jieling_protocols_Friend_fieldAccessorTable = new internal_static_com_ljsd_jieling_protocols_Friend_fieldAccessorTable = new

View File

@ -1017,7 +1017,7 @@ public class RedisUtil {
String rkey = getKey(type, key); String rkey = getKey(type, key);
for (int i = 0; i < MAX_TRY_TIMES; i++) { for (int i = 0; i < MAX_TRY_TIMES; i++) {
try { try {
String valueStr = (String) redisTemplate.opsForHash().get(type + RedisKey.Delimiter_colon + key, mapKey); String valueStr = (String) redisTemplate.opsForHash().get(rkey, mapKey);
if (valueStr != null) if (valueStr != null)
return gson.fromJson(valueStr, clazz); return gson.fromJson(valueStr, clazz);
} catch (Exception e) { } catch (Exception e) {

View File

@ -9,7 +9,7 @@ import com.ljsd.jieling.protocols.MessageTypeProto;
public class ChampionBetHandler extends BaseHandler<ArenaInfoProto.ChampionBetReqeust> { public class ChampionBetHandler extends BaseHandler<ArenaInfoProto.ChampionBetReqeust> {
@Override @Override
public MessageTypeProto.MessageType getMessageCode() { public MessageTypeProto.MessageType getMessageCode() {
return MessageTypeProto.MessageType.CHAMPION_BET_REQUEST; return MessageTypeProto.MessageType.CHAMPION_BET_GUESS_REQUEST;
} }
@Override @Override

View File

@ -245,7 +245,7 @@ public class GlobalDataManaager implements IManager {
new UserLevelEventHandler(); new UserLevelEventHandler();
new RemoveEventHeroHandler(); new RemoveEventHeroHandler();
new FightMainEventHandler(); new FightMainEventHandler();
// ChampionshipLogic.whenStart(); ChampionshipLogic.whenStart();
} catch (Exception e) { } catch (Exception e) {
LOGGER.error("e",e); LOGGER.error("e",e);
} }

View File

@ -20,6 +20,7 @@ import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.fight.*; import com.ljsd.jieling.logic.fight.*;
import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.logic.hero.HeroLogic;
import com.ljsd.jieling.logic.mission.event.MissionEventDistributor; import com.ljsd.jieling.logic.mission.event.MissionEventDistributor;
import com.ljsd.jieling.logic.player.PlayerLogic;
import com.ljsd.jieling.network.server.ProtocolsManager; import com.ljsd.jieling.network.server.ProtocolsManager;
import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.protocols.ArenaInfoProto; import com.ljsd.jieling.protocols.ArenaInfoProto;
@ -250,10 +251,7 @@ public class ChampionshipLogic {
String key = RedisUtil.getInstence().getKey(RedisKey.CHAMPION_JOIN, ""); String key = RedisUtil.getInstence().getKey(RedisKey.CHAMPION_JOIN, "");
RedisUtil.getInstence().del(key, RedisUtil.getInstence().getKey(RedisKey.CHAMPION_RANK, "")); RedisUtil.getInstence().del(key, RedisUtil.getInstence().getKey(RedisKey.CHAMPION_RANK, ""));
RedisUtil.getInstence().updateZsetScores(RedisKey.CHAMPION_RANK,"",arenaRankInfoForChampion); RedisUtil.getInstence().updateZsetScores(RedisKey.CHAMPION_RANK,"",arenaRankInfoForChampion);
RedisUtil.getInstence().set(key, gson.toJson(joinMembers));
joinMembers.forEach(memberInfo->{
updateJoinMemberInfo(memberInfo);
});
for(int i=0;i<memberOfTeamOfGroup.size();i++){ for(int i=0;i<memberOfTeamOfGroup.size();i++){
RedisUtil.getInstence().putMapEntry(RedisKey.CHAMPION_CHOSE_TEAM_INFO, "",Integer.toString(i),memberOfTeamOfGroup.get(i)); RedisUtil.getInstence().putMapEntry(RedisKey.CHAMPION_CHOSE_TEAM_INFO, "",Integer.toString(i),memberOfTeamOfGroup.get(i));
} }
@ -271,7 +269,7 @@ public class ChampionshipLogic {
* 2. * 2.
*/ */
public static void whenStart() throws Exception { public static void whenStart() throws Exception {
TimeControllerOfFunction timeControllerOfFunction = GlobalDataManaager.getInstance().getTimeControllerOfFunctionByFunctinoType(FunctionIdEnum.TopBattle); /* TimeControllerOfFunction timeControllerOfFunction = GlobalDataManaager.getInstance().getTimeControllerOfFunctionByFunctinoType(FunctionIdEnum.TopBattle);
if( null == timeControllerOfFunction){ if( null == timeControllerOfFunction){
progress = -1; progress = -1;
return; return;
@ -279,7 +277,12 @@ public class ChampionshipLogic {
String key = RedisUtil.getInstence().getKey(RedisKey.CHAMPION_JOIN, ""); String key = RedisUtil.getInstence().getKey(RedisKey.CHAMPION_JOIN, "");
Type type = new TypeToken<Map<Integer, byte[]>>() { Type type = new TypeToken<Map<Integer, byte[]>>() {
}.getType(); }.getType();
Object championJoins = RedisUtil.getInstence().get(key); Object championJoins = RedisUtil.getInstence().get(key);*/
/* start();
List<Integer> memberIds = RedisUtil.getInstence().getMapValue(RedisKey.CHAMPION_CHOSE_TEAM_INFO, "", Integer.toString(1), List.class);
System.out.println();*/
} }
@ -337,8 +340,8 @@ public class ChampionshipLogic {
fightResult =-1; fightResult =-1;
} }
builder.setChampionBattleInfo(CommonProto.ChampionBattleInfo.newBuilder() builder.setChampionBattleInfo(CommonProto.ChampionBattleInfo.newBuilder()
/* .setMyInfo(getEnemyInfo(uid,0)) .setMyInfo(getChampionBattleInfo(uid))
.setEnemyInfo(getEnemyInfo(enemyId,0))*/ .setEnemyInfo(getChampionBattleInfo(enemyId))
.setResult(fightResult) .setResult(fightResult)
.build()); .build());
@ -346,6 +349,45 @@ public class ChampionshipLogic {
MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.CHAMPION_GET_RESPONSE_VALUE,builder.build(),true); MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.CHAMPION_GET_RESPONSE_VALUE,builder.build(),true);
} }
private static CommonProto.TeamOneInfo.Builder getChampionBattleInfo(int uid) throws Exception {
SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(uid);
if(sArenaRobotConfig!=null){
return PlayerLogic.getInstance().getRobotTeamInfo(sArenaRobotConfig);
}
MemberInfo memberInfo = RedisUtil.getInstence().getMapEntry(RedisKey.CHAMPION_JOIN, "", Integer.toString(uid), MemberInfo.class);
FamilyFightInfo fightInfo = memberInfo.getFightInfo();
User user = UserManager.getUser(uid);
PlayerManager playerManager = user.getPlayerInfoManager();
CommonProto.TeamOneInfo.Builder oneInfo = CommonProto.TeamOneInfo.newBuilder()
.setHead(playerManager.getHead())
.setHeadFrame(playerManager.getHeadFrame())
.setLevel(playerManager.getLevel())
.setName(playerManager.getNickName()).setUid(uid);
TeamPosManager teamPosManager = user.getTeamPosManager();
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
teamInfo.setTotalForce(fightInfo.getForce());
// teamInfo.addPokemonInfos(fightInfo.getPokenmonIds());
/* if(teamPosManager.getTeamPosForHero().containsKey(teamId)){
for (TeamPosHeroInfo heroInfo:teamPosManager.getTeamPosForHero().get(teamId)) {
Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId());
teamInfo.addTeam(CBean2Proto.getSimpleTeamInfoByHero(hero));
}
}*/
int guildId = user.getPlayerInfoManager().getGuildId();
if(guildId!=0){
if(GuilidManager.guildInfoMap.containsKey(guildId)){
String name = GuilidManager.guildInfoMap.get(guildId).getName();
oneInfo.setGuildName(name);
}
}
oneInfo.setTeam(teamInfo);
return oneInfo;
}
private static String getMyCurJoinBattleId(int uid){ private static String getMyCurJoinBattleId(int uid){
List<ArenaRecord> curArenaRecordList = getCurArenaRecordList(); List<ArenaRecord> curArenaRecordList = getCurArenaRecordList();
for(ArenaRecord arenaRecord :curArenaRecordList){ for(ArenaRecord arenaRecord :curArenaRecordList){
@ -558,7 +600,7 @@ public class ChampionshipLogic {
RedisUtil.getInstence().incrementZsetScore(RedisKey.CHAMPION_BET_ALL,"",selectUid +":" + winUid,chip); RedisUtil.getInstence().incrementZsetScore(RedisKey.CHAMPION_BET_ALL,"",selectUid +":" + winUid,chip);
RedisUtil.getInstence().putMapEntry(RedisKey.CHAMPION_BET_MINE,selectUid +":" + winUid,Integer.toString(uid),chip); RedisUtil.getInstence().putMapEntry(RedisKey.CHAMPION_BET_MINE,selectUid +":" + winUid,Integer.toString(uid),chip);
MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.CHAMPION_BET_RESPONSE_VALUE,null,true); // MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.CHAMPION_BET_RESPONSE_VALUE,null,true);
} }

View File

@ -1,6 +1,8 @@
package com.ljsd.jieling.logic.dao; package com.ljsd.jieling.logic.dao;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
public class FamilyFightInfo { public class FamilyFightInfo {
@ -12,8 +14,7 @@ public class FamilyFightInfo {
private int force; private int force;
private Map<String, String> heroSkills = new HashMap<>(); private Map<String, String> heroSkills = new HashMap<>();
private String pokenmonSkills; private String pokenmonSkills;
private List<Integer> pokenmonIds = new ArrayList<>();
public Map<String, FamilyHeroInfo> getHeroAttribute() { public Map<String, FamilyHeroInfo> getHeroAttribute() {
return heroAttribute; return heroAttribute;
} }
@ -80,4 +81,12 @@ public class FamilyFightInfo {
public void setPokenmonSkills(String pokenmonSkills) { public void setPokenmonSkills(String pokenmonSkills) {
this.pokenmonSkills = pokenmonSkills; this.pokenmonSkills = pokenmonSkills;
} }
public List<Integer> getPokenmonIds() {
return pokenmonIds;
}
public void setPokenmonIds(List<Integer> pokenmonIds) {
this.pokenmonIds = pokenmonIds;
}
} }

View File

@ -2,7 +2,6 @@ package com.ljsd.jieling.logic.player;
import com.ljsd.GameApplication; import com.ljsd.GameApplication;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig; import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.SArenaRobotStaticConfig;
import com.ljsd.jieling.config.clazzStaticCfg.TaskStaticConfig; import com.ljsd.jieling.config.clazzStaticCfg.TaskStaticConfig;
import com.ljsd.jieling.core.VipPrivilegeType; import com.ljsd.jieling.core.VipPrivilegeType;
import com.ljsd.jieling.dataReport.reportBeans_37.ChatContentType; import com.ljsd.jieling.dataReport.reportBeans_37.ChatContentType;
@ -16,10 +15,8 @@ import com.ljsd.jieling.globals.Global;
import com.ljsd.jieling.logic.activity.ActivityLogic; import com.ljsd.jieling.logic.activity.ActivityLogic;
import com.ljsd.jieling.logic.activity.ActivityType; import com.ljsd.jieling.logic.activity.ActivityType;
import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.*;
import com.ljsd.jieling.logic.dao.root.GuildInfo;
import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.family.GuildLogic; import com.ljsd.jieling.logic.family.GuildLogic;
import com.ljsd.jieling.logic.fight.CombatLogic;
import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.logic.hero.HeroLogic;
import com.ljsd.jieling.logic.mail.MailLogic; import com.ljsd.jieling.logic.mail.MailLogic;
import com.ljsd.jieling.logic.mission.GameEvent; import com.ljsd.jieling.logic.mission.GameEvent;
@ -46,7 +43,6 @@ import util.StringUtil;
import util.TimeUtils; import util.TimeUtils;
import java.util.*; import java.util.*;
import java.util.concurrent.ExecutionException;
public class PlayerLogic { public class PlayerLogic {
private static final Logger LOGGER = LoggerFactory.getLogger(MailLogic.class); private static final Logger LOGGER = LoggerFactory.getLogger(MailLogic.class);
@ -448,7 +444,7 @@ public class PlayerLogic {
} }
public void getRobotTeamInfo(ISession session, SArenaRobotConfig sArenaRobotConfig, MessageTypeProto.MessageType messageType){ public CommonProto.TeamOneInfo.Builder getRobotTeamInfo(SArenaRobotConfig sArenaRobotConfig){
CommonProto.TeamOneInfo.Builder oneInfo = CommonProto.TeamOneInfo.newBuilder() CommonProto.TeamOneInfo.Builder oneInfo = CommonProto.TeamOneInfo.newBuilder()
.setLevel(sArenaRobotConfig.getRobotLevel()) .setLevel(sArenaRobotConfig.getRobotLevel())
.setName(sArenaRobotConfig.getRobotName()) .setName(sArenaRobotConfig.getRobotName())
@ -467,10 +463,7 @@ public class PlayerLogic {
teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder().setHeroid(String.valueOf(heroTid)).setHeroTid(heroTid).setLevel(sArenaRobotConfig.getRoleLv()).setStar(heroStar).build()); teamInfo.addTeam(CommonProto.TeamSimpleInfo.newBuilder().setHeroid(String.valueOf(heroTid)).setHeroTid(heroTid).setLevel(sArenaRobotConfig.getRoleLv()).setStar(heroStar).build());
} }
oneInfo.setTeam(teamInfo); oneInfo.setTeam(teamInfo);
return oneInfo;
PlayerInfoProto.GetPlayerOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerOneTeamInfoResponse.newBuilder().setTeamInfo(oneInfo);
MessageUtil.sendMessage(session,1,messageType.getNumber(),playerTeamInfo.build(),true);
} }
@ -479,13 +472,13 @@ public class PlayerLogic {
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
} }
SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(id); SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(id);
CommonProto.TeamOneInfo.Builder oneInfo=null;
if(sArenaRobotConfig!=null){ if(sArenaRobotConfig!=null){
getRobotTeamInfo(session,sArenaRobotConfig,messageType); oneInfo=getRobotTeamInfo(sArenaRobotConfig);
return; }else{
}
User user = UserManager.getUser(id); User user = UserManager.getUser(id);
PlayerManager playerManager = user.getPlayerInfoManager(); PlayerManager playerManager = user.getPlayerInfoManager();
CommonProto.TeamOneInfo.Builder oneInfo = CommonProto.TeamOneInfo.newBuilder() oneInfo = CommonProto.TeamOneInfo.newBuilder()
.setHead(playerManager.getHead()) .setHead(playerManager.getHead())
.setHeadFrame(playerManager.getHeadFrame()) .setHeadFrame(playerManager.getHeadFrame())
.setLevel(playerManager.getLevel()) .setLevel(playerManager.getLevel())
@ -516,6 +509,8 @@ public class PlayerLogic {
if(UserManager.getUser(session.getUid()).getFriendManager().getMyApplyFriends().contains(id)){ if(UserManager.getUser(session.getUid()).getFriendManager().getMyApplyFriends().contains(id)){
oneInfo.setIsApplyed(1); oneInfo.setIsApplyed(1);
} }
}
PlayerInfoProto.GetPlayerOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerOneTeamInfoResponse.newBuilder().setTeamInfo(oneInfo); PlayerInfoProto.GetPlayerOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerOneTeamInfoResponse.newBuilder().setTeamInfo(oneInfo);
MessageUtil.sendMessage(session,1,messageType.getNumber(),playerTeamInfo.build(),true); MessageUtil.sendMessage(session,1,messageType.getNumber(),playerTeamInfo.build(),true);