fix bet
parent
4b2d619df6
commit
2efcce2614
|
@ -43462,7 +43462,7 @@ public final class CommonProto {
|
|||
* <code>optional int32 hadTakeLevelBox = 2;</code>
|
||||
*
|
||||
* <pre>
|
||||
*是否领取特权等级礼包 1:已领取 0:未领取
|
||||
*是否购买特权等级礼包 1:已购买 0:未购买
|
||||
* </pre>
|
||||
*/
|
||||
boolean hasHadTakeLevelBox();
|
||||
|
@ -43470,28 +43470,10 @@ public final class CommonProto {
|
|||
* <code>optional int32 hadTakeLevelBox = 2;</code>
|
||||
*
|
||||
* <pre>
|
||||
*是否领取特权等级礼包 1:已领取 0:未领取
|
||||
*是否购买特权等级礼包 1:已购买 0:未购买
|
||||
* </pre>
|
||||
*/
|
||||
int getHadTakeLevelBox();
|
||||
|
||||
// optional int32 hadTakeDailyBox = 3;
|
||||
/**
|
||||
* <code>optional int32 hadTakeDailyBox = 3;</code>
|
||||
*
|
||||
* <pre>
|
||||
*是否领取每日礼包 1:已领取vip等级 -1:未领取
|
||||
* </pre>
|
||||
*/
|
||||
boolean hasHadTakeDailyBox();
|
||||
/**
|
||||
* <code>optional int32 hadTakeDailyBox = 3;</code>
|
||||
*
|
||||
* <pre>
|
||||
*是否领取每日礼包 1:已领取vip等级 -1:未领取
|
||||
* </pre>
|
||||
*/
|
||||
int getHadTakeDailyBox();
|
||||
}
|
||||
/**
|
||||
* Protobuf type {@code com.ljsd.jieling.protocols.VipBaseInfo}
|
||||
|
@ -43554,11 +43536,6 @@ public final class CommonProto {
|
|||
hadTakeLevelBox_ = input.readInt32();
|
||||
break;
|
||||
}
|
||||
case 24: {
|
||||
bitField0_ |= 0x00000004;
|
||||
hadTakeDailyBox_ = input.readInt32();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
|
||||
|
@ -43630,7 +43607,7 @@ public final class CommonProto {
|
|||
* <code>optional int32 hadTakeLevelBox = 2;</code>
|
||||
*
|
||||
* <pre>
|
||||
*是否领取特权等级礼包 1:已领取 0:未领取
|
||||
*是否购买特权等级礼包 1:已购买 0:未购买
|
||||
* </pre>
|
||||
*/
|
||||
public boolean hasHadTakeLevelBox() {
|
||||
|
@ -43640,41 +43617,16 @@ public final class CommonProto {
|
|||
* <code>optional int32 hadTakeLevelBox = 2;</code>
|
||||
*
|
||||
* <pre>
|
||||
*是否领取特权等级礼包 1:已领取 0:未领取
|
||||
*是否购买特权等级礼包 1:已购买 0:未购买
|
||||
* </pre>
|
||||
*/
|
||||
public int getHadTakeLevelBox() {
|
||||
return hadTakeLevelBox_;
|
||||
}
|
||||
|
||||
// optional int32 hadTakeDailyBox = 3;
|
||||
public static final int HADTAKEDAILYBOX_FIELD_NUMBER = 3;
|
||||
private int hadTakeDailyBox_;
|
||||
/**
|
||||
* <code>optional int32 hadTakeDailyBox = 3;</code>
|
||||
*
|
||||
* <pre>
|
||||
*是否领取每日礼包 1:已领取vip等级 -1:未领取
|
||||
* </pre>
|
||||
*/
|
||||
public boolean hasHadTakeDailyBox() {
|
||||
return ((bitField0_ & 0x00000004) == 0x00000004);
|
||||
}
|
||||
/**
|
||||
* <code>optional int32 hadTakeDailyBox = 3;</code>
|
||||
*
|
||||
* <pre>
|
||||
*是否领取每日礼包 1:已领取vip等级 -1:未领取
|
||||
* </pre>
|
||||
*/
|
||||
public int getHadTakeDailyBox() {
|
||||
return hadTakeDailyBox_;
|
||||
}
|
||||
|
||||
private void initFields() {
|
||||
vipLevel_ = 0;
|
||||
hadTakeLevelBox_ = 0;
|
||||
hadTakeDailyBox_ = 0;
|
||||
}
|
||||
private byte memoizedIsInitialized = -1;
|
||||
public final boolean isInitialized() {
|
||||
|
@ -43694,9 +43646,6 @@ public final class CommonProto {
|
|||
if (((bitField0_ & 0x00000002) == 0x00000002)) {
|
||||
output.writeInt32(2, hadTakeLevelBox_);
|
||||
}
|
||||
if (((bitField0_ & 0x00000004) == 0x00000004)) {
|
||||
output.writeInt32(3, hadTakeDailyBox_);
|
||||
}
|
||||
getUnknownFields().writeTo(output);
|
||||
}
|
||||
|
||||
|
@ -43714,10 +43663,6 @@ public final class CommonProto {
|
|||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(2, hadTakeLevelBox_);
|
||||
}
|
||||
if (((bitField0_ & 0x00000004) == 0x00000004)) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(3, hadTakeDailyBox_);
|
||||
}
|
||||
size += getUnknownFields().getSerializedSize();
|
||||
memoizedSerializedSize = size;
|
||||
return size;
|
||||
|
@ -43838,8 +43783,6 @@ public final class CommonProto {
|
|||
bitField0_ = (bitField0_ & ~0x00000001);
|
||||
hadTakeLevelBox_ = 0;
|
||||
bitField0_ = (bitField0_ & ~0x00000002);
|
||||
hadTakeDailyBox_ = 0;
|
||||
bitField0_ = (bitField0_ & ~0x00000004);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -43876,10 +43819,6 @@ public final class CommonProto {
|
|||
to_bitField0_ |= 0x00000002;
|
||||
}
|
||||
result.hadTakeLevelBox_ = hadTakeLevelBox_;
|
||||
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
|
||||
to_bitField0_ |= 0x00000004;
|
||||
}
|
||||
result.hadTakeDailyBox_ = hadTakeDailyBox_;
|
||||
result.bitField0_ = to_bitField0_;
|
||||
onBuilt();
|
||||
return result;
|
||||
|
@ -43902,9 +43841,6 @@ public final class CommonProto {
|
|||
if (other.hasHadTakeLevelBox()) {
|
||||
setHadTakeLevelBox(other.getHadTakeLevelBox());
|
||||
}
|
||||
if (other.hasHadTakeDailyBox()) {
|
||||
setHadTakeDailyBox(other.getHadTakeDailyBox());
|
||||
}
|
||||
this.mergeUnknownFields(other.getUnknownFields());
|
||||
return this;
|
||||
}
|
||||
|
@ -43987,7 +43923,7 @@ public final class CommonProto {
|
|||
* <code>optional int32 hadTakeLevelBox = 2;</code>
|
||||
*
|
||||
* <pre>
|
||||
*是否领取特权等级礼包 1:已领取 0:未领取
|
||||
*是否购买特权等级礼包 1:已购买 0:未购买
|
||||
* </pre>
|
||||
*/
|
||||
public boolean hasHadTakeLevelBox() {
|
||||
|
@ -43997,7 +43933,7 @@ public final class CommonProto {
|
|||
* <code>optional int32 hadTakeLevelBox = 2;</code>
|
||||
*
|
||||
* <pre>
|
||||
*是否领取特权等级礼包 1:已领取 0:未领取
|
||||
*是否购买特权等级礼包 1:已购买 0:未购买
|
||||
* </pre>
|
||||
*/
|
||||
public int getHadTakeLevelBox() {
|
||||
|
@ -44007,7 +43943,7 @@ public final class CommonProto {
|
|||
* <code>optional int32 hadTakeLevelBox = 2;</code>
|
||||
*
|
||||
* <pre>
|
||||
*是否领取特权等级礼包 1:已领取 0:未领取
|
||||
*是否购买特权等级礼包 1:已购买 0:未购买
|
||||
* </pre>
|
||||
*/
|
||||
public Builder setHadTakeLevelBox(int value) {
|
||||
|
@ -44020,7 +43956,7 @@ public final class CommonProto {
|
|||
* <code>optional int32 hadTakeLevelBox = 2;</code>
|
||||
*
|
||||
* <pre>
|
||||
*是否领取特权等级礼包 1:已领取 0:未领取
|
||||
*是否购买特权等级礼包 1:已购买 0:未购买
|
||||
* </pre>
|
||||
*/
|
||||
public Builder clearHadTakeLevelBox() {
|
||||
|
@ -44030,55 +43966,6 @@ public final class CommonProto {
|
|||
return this;
|
||||
}
|
||||
|
||||
// optional int32 hadTakeDailyBox = 3;
|
||||
private int hadTakeDailyBox_ ;
|
||||
/**
|
||||
* <code>optional int32 hadTakeDailyBox = 3;</code>
|
||||
*
|
||||
* <pre>
|
||||
*是否领取每日礼包 1:已领取vip等级 -1:未领取
|
||||
* </pre>
|
||||
*/
|
||||
public boolean hasHadTakeDailyBox() {
|
||||
return ((bitField0_ & 0x00000004) == 0x00000004);
|
||||
}
|
||||
/**
|
||||
* <code>optional int32 hadTakeDailyBox = 3;</code>
|
||||
*
|
||||
* <pre>
|
||||
*是否领取每日礼包 1:已领取vip等级 -1:未领取
|
||||
* </pre>
|
||||
*/
|
||||
public int getHadTakeDailyBox() {
|
||||
return hadTakeDailyBox_;
|
||||
}
|
||||
/**
|
||||
* <code>optional int32 hadTakeDailyBox = 3;</code>
|
||||
*
|
||||
* <pre>
|
||||
*是否领取每日礼包 1:已领取vip等级 -1:未领取
|
||||
* </pre>
|
||||
*/
|
||||
public Builder setHadTakeDailyBox(int value) {
|
||||
bitField0_ |= 0x00000004;
|
||||
hadTakeDailyBox_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>optional int32 hadTakeDailyBox = 3;</code>
|
||||
*
|
||||
* <pre>
|
||||
*是否领取每日礼包 1:已领取vip等级 -1:未领取
|
||||
* </pre>
|
||||
*/
|
||||
public Builder clearHadTakeDailyBox() {
|
||||
bitField0_ = (bitField0_ & ~0x00000004);
|
||||
hadTakeDailyBox_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
// @@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" +
|
||||
"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" +
|
||||
"mes\030\005 \001(\005\"Q\n\013VipBaseInfo\022\020\n\010vipLevel\030\001 \001",
|
||||
"(\005\022\027\n\017hadTakeLevelBox\030\002 \001(\005\022\027\n\017hadTakeDa" +
|
||||
"ilyBox\030\003 \001(\005\"\250\001\n\006Friend\022\n\n\002id\030\001 \001(\005\022\014\n\004n" +
|
||||
"ame\030\002 \001(\t\022\n\n\002lv\030\003 \001(\005\022\023\n\013offLineTime\030\004 \001" +
|
||||
"(\004\022\022\n\nhaveReward\030\005 \001(\005\022\016\n\006isGive\030\006 \001(\005\022\021" +
|
||||
"\n\tisApplyed\030\007 \001(\005\022\014\n\004head\030\014 \001(\005\022\r\n\005frame" +
|
||||
"\030\r \001(\005\022\017\n\007soulVal\030\016 \001(\005\"V\n\rGiftGoodsInfo" +
|
||||
"\022\017\n\007goodsId\030\001 \001(\005\022\020\n\010buyTimes\030\002 \001(\005\022\021\n\ts" +
|
||||
"tartTime\030\003 \001(\005\022\017\n\007endTime\030\004 \001(\005\"7\n\021Goods" +
|
||||
"TypeDuration\022\021\n\tgoodsType\030\001 \001(\005\022\017\n\007endTi" +
|
||||
"me\030\002 \001(\005\"/\n\016TechnologyInfo\022\016\n\006techId\030\001 \001",
|
||||
"(\005\022\r\n\005levle\030\002 \001(\005\"J\n\020SuddenlyBossInfo\022\022\n" +
|
||||
"\nsuddBossId\030\006 \001(\005\022\017\n\007endTime\030\007 \001(\005\022\021\n\tfi" +
|
||||
"ndMapId\030\010 \001(\005\"H\n\010ItemInfo\022\022\n\ntemplateId\030" +
|
||||
"\001 \001(\005\022\017\n\007overlap\030\002 \001(\005\022\027\n\017nextRefreshTim" +
|
||||
"e\030\003 \001(\005\"H\n\010RankInfo\022\014\n\004rank\030\001 \001(\005\022\016\n\006par" +
|
||||
"am1\030\002 \001(\005\022\016\n\006param2\030\003 \001(\005\022\016\n\006param3\030\004 \001(" +
|
||||
"\005\"\244\001\n\010UserRank\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 \001" +
|
||||
"(\005\022\014\n\004head\030\003 \001(\005\022\020\n\010userName\030\004 \001(\t\0226\n\010ra" +
|
||||
"nkInfo\030\005 \001(\0132$.com.ljsd.jieling.protocol" +
|
||||
"s.RankInfo\022\021\n\theadFrame\030\006 \001(\005\022\021\n\tguildNa",
|
||||
"me\030\007 \001(\t\"\204\001\n\025ActorEffectBufferInfo\022\n\n\002id" +
|
||||
"\030\001 \001(\005\022\014\n\004type\030\002 \001(\005\022\021\n\tstartTime\030\003 \001(\005\022" +
|
||||
"\017\n\007endTime\030\004 \001(\005\022\016\n\006target\030\005 \001(\005\022\016\n\006cast" +
|
||||
"er\030\006 \001(\005\022\r\n\005value\030\007 \003(\005\"T\n\016BloodyHeroInf" +
|
||||
"o\022\016\n\006heroId\030\001 \001(\t\022\016\n\006heroHp\030\002 \001(\005\022\021\n\ther" +
|
||||
"oMaxHp\030\003 \001(\005\022\017\n\007heroTid\030\004 \001(\005\"%\n\010SceneMs" +
|
||||
"g\022\014\n\004time\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\"\'\n\nPosMiner" +
|
||||
"al\022\013\n\003pos\030\001 \001(\005\022\014\n\004nums\030\002 \001(\005\"\264\001\n\010Creatu" +
|
||||
"re\022\014\n\004path\030\001 \003(\005\022\r\n\005speed\030\002 \001(\005\022\r\n\005maxHp" +
|
||||
"\030\003 \001(\005\022\r\n\005curHp\030\004 \001(\005\022\017\n\007mineral\030\005 \001(\005\022\014",
|
||||
"\n\004camp\030\006 \001(\005\022<\n\010heroInfo\030\007 \003(\0132*.com.ljs" +
|
||||
"d.jieling.protocols.BloodyHeroInfo\022\020\n\010ki" +
|
||||
"llNums\030\010 \001(\005\"\217\001\n\nSceneActor\022\n\n\002id\030\001 \001(\005\022" +
|
||||
"\016\n\006curPos\030\002 \001(\005\022\r\n\005state\030\003 \001(\005\022\014\n\004type\030\004" +
|
||||
" \001(\005\0226\n\010Creature\030\006 \001(\0132$.com.ljsd.jielin" +
|
||||
"g.protocols.Creature\022\020\n\010userName\030\007 \001(\t\"\236" +
|
||||
"\002\n\tSceneInfo\022\016\n\006roomId\030\001 \001(\005\022\r\n\005mapId\030\002 " +
|
||||
"\001(\005\022:\n\nSceneActor\030\003 \003(\0132&.com.ljsd.jieli" +
|
||||
"ng.protocols.SceneActor\022P\n\025actorEffectBu" +
|
||||
"fferInfo\030\004 \003(\01321.com.ljsd.jieling.protoc",
|
||||
"ols.ActorEffectBufferInfo\022\024\n\014barrierPoin" +
|
||||
"t\030\005 \003(\005\022:\n\nposMineral\030\006 \003(\0132&.com.ljsd.j" +
|
||||
"ieling.protocols.PosMineral\022\022\n\nremainTim" +
|
||||
"e\030\007 \001(\005\"S\n\027SceneGetFullMsgResponse\0228\n\tsc" +
|
||||
"eneInfo\030\001 \001(\0132%.com.ljsd.jieling.protoco" +
|
||||
"ls.SceneInfo\"B\n\013blessReward\022\022\n\nlocationI" +
|
||||
"d\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\022\020\n\010rewardId\030\003 \001(\005" +
|
||||
"\"5\n\022fiveResetTowerInfo\022\r\n\005tower\030\001 \001(\005\022\020\n" +
|
||||
"\010intoType\030\002 \001(\005\";\n\020FamilyContribute\022\013\n\003w" +
|
||||
"in\030\001 \001(\005\022\014\n\004draw\030\002 \001(\005\022\014\n\004fail\030\003 \001(\005\"\210\002\n",
|
||||
"\016FamilyBaseInfo\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(" +
|
||||
"\t\022\017\n\007annouce\030\003 \001(\t\022\r\n\005levle\030\004 \001(\005\022\013\n\003exp" +
|
||||
"\030\005 \001(\005\022\020\n\010totalNum\030\006 \001(\005\022\016\n\006maxNum\030\007 \001(\005" +
|
||||
"\022\020\n\010joinType\030\010 \001(\005\022\014\n\004icon\030\t \001(\005\022\021\n\tleve" +
|
||||
"lTime\030\n \001(\005\022A\n\013fightResult\030\013 \001(\0132,.com.l" +
|
||||
"jsd.jieling.protocols.FamilyContribute\022\027" +
|
||||
"\n\017playerIntoLevel\030\014 \001(\005\")\n\013endlessHero\022\016" +
|
||||
"\n\006heroId\030\001 \001(\t\022\n\n\002hp\030\002 \001(\005\"2\n\022EndlessRef" +
|
||||
"reshInfo\022\016\n\006cellId\030\001 \001(\005\022\014\n\004time\030\002 \001(\005\"u" +
|
||||
"\n\014UseForceInfo\022\014\n\004name\030\001 \001(\t\022\014\n\004leve\030\002 \001",
|
||||
"(\005\022\r\n\005force\030\003 \001(\005\022\014\n\004rank\030\004 \001(\005\022\014\n\004head\030" +
|
||||
"\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005\022\013\n\003uid\030\007 \001(\005\"H\n" +
|
||||
"\013endlessSign\022\r\n\005mapId\030\001 \001(\005\022\016\n\006cellId\030\002 " +
|
||||
"\001(\005\022\014\n\004info\030\003 \001(\t\022\014\n\004type\030\004 \001(\005\"g\n\nExper" +
|
||||
"tInfo\022\014\n\004name\030\001 \001(\t\022\r\n\005score\030\002 \001(\005\022\014\n\004ra" +
|
||||
"nk\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\022\014\n\004head\030\005 \001(\005\022\021\n" +
|
||||
"\theadFrame\030\006 \001(\005\")\n\nSignInInfo\022\014\n\004days\030\001" +
|
||||
" \001(\005\022\r\n\005state\030\002 \001(\005\"N\n\016TeamSimpleInfo\022\016\n" +
|
||||
"\006heroid\030\001 \001(\t\022\017\n\007heroTid\030\002 \001(\005\022\014\n\004star\030\003" +
|
||||
" \001(\005\022\r\n\005level\030\004 \001(\005\"\207\001\n\017TeamOneTeamInfo\022",
|
||||
"8\n\004team\030\001 \003(\0132*.com.ljsd.jieling.protoco" +
|
||||
"ls.TeamSimpleInfo\022\024\n\014PokemonInfos\030\002 \003(\005\022" +
|
||||
"\022\n\ntotalForce\030\003 \001(\005\022\020\n\010remainHp\030\004 \003(\005\"\271\001" +
|
||||
"\n\013TeamOneInfo\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 \001(" +
|
||||
"\005\022\014\n\004name\030\003 \001(\t\022\014\n\004head\030\004 \001(\005\022\021\n\theadFra" +
|
||||
"me\030\005 \001(\005\022\021\n\tguildName\030\007 \001(\t\0229\n\004team\030\006 \001(" +
|
||||
"\0132+.com.ljsd.jieling.protocols.TeamOneTe" +
|
||||
"amInfo\022\021\n\tisApplyed\030\010 \001(\005\"y\n\017MonsterRank" +
|
||||
"Info\022\014\n\004name\030\001 \001(\t\022\r\n\005score\030\002 \001(\005\022\014\n\004ran" +
|
||||
"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",
|
||||
"headFrame\030\006 \001(\005\022\013\n\003uid\030\007 \001(\005\"2\n\rHeroBloo" +
|
||||
"dInfo\022\016\n\006heroId\030\001 \001(\t\022\021\n\tlostBlood\030\002 \001(\005" +
|
||||
"\"D\n\013EndlessInfo\022\r\n\005mapId\030\001 \001(\005\022\022\n\nworldL" +
|
||||
"evel\030\002 \001(\005\022\022\n\nbloodScore\030\003 \001(\005\"2\n\017Player" +
|
||||
"BindPhone\022\020\n\010phoneNum\030\001 \001(\t\022\r\n\005state\030\002 \001" +
|
||||
"(\005\"3\n\014EndlessPoint\022\020\n\010location\030\001 \001(\005\022\021\n\t" +
|
||||
"monsterId\030\002 \001(\005\"2\n\014StrongerInfo\022\020\n\010curSc" +
|
||||
"ore\030\001 \001(\005\022\020\n\010maxScore\030\002 \001(\005\"U\n\017QuestionO" +
|
||||
"ptions\022\017\n\007content\030\001 \001(\t\022\014\n\004type\030\002 \001(\005\022\017\n" +
|
||||
"\007options\030\003 \003(\t\022\022\n\nanswerType\030\004 \001(\005\"\212\001\n\017B",
|
||||
"loodPersonInfo\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t" +
|
||||
"\022\021\n\theadFrame\030\003 \001(\005\022\014\n\004head\030\004 \001(\005\022\020\n\010ser" +
|
||||
"verId\030\005 \001(\005\022\r\n\005level\030\006 \001(\005\022\014\n\004rank\030\007 \001(\005" +
|
||||
"\022\r\n\005score\030\010 \001(\005\"H\n\026LuckWheelRewardPosInf" +
|
||||
"o\022\013\n\003pos\030\001 \001(\005\022\016\n\006luckId\030\002 \001(\005\022\021\n\tluckTi" +
|
||||
"mes\030\003 \001(\005\"W\n\013RefreshTask\022\014\n\004type\030\001 \001(\005\022:" +
|
||||
"\n\005tasks\030\002 \003(\0132+.com.ljsd.jieling.protoco" +
|
||||
"ls.UserMissionInfo\"\221\001\n\021MainLevelRankInfo" +
|
||||
"\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 \001(\005\022\014\n\004name\030\003 \001" +
|
||||
"(\t\022\017\n\007fightId\030\004 \001(\005\022\014\n\004head\030\005 \001(\005\022\014\n\004ran",
|
||||
"k\030\006 \001(\005\022\022\n\ntotalForce\030\007 \001(\005\022\021\n\theadFrame" +
|
||||
"\030\010 \001(\005\"B\n\017ChampionBetInfo\022\n\n\002id\030\001 \001(\t\022\020\n" +
|
||||
"\010redCoins\030\002 \001(\005\022\021\n\tblueCoins\030\003 \001(\005\"B\n\026Ch" +
|
||||
"ampionTeamPersonInfo\022\013\n\003uid\030\001 \001(\005\022\014\n\004nam" +
|
||||
"e\030\002 \001(\t\022\r\n\005score\030\003 \001(\005\"\231\001\n\022ChampionBattl" +
|
||||
"eInfo\0227\n\006myInfo\030\001 \001(\0132\'.com.ljsd.jieling" +
|
||||
".protocols.TeamOneInfo\022:\n\tenemyInfo\030\002 \001(" +
|
||||
"\0132\'.com.ljsd.jieling.protocols.TeamOneIn" +
|
||||
"fo\022\016\n\006result\030\003 \001(\005B\002H\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\"\250\001\n\006Friend\022\n" +
|
||||
"\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" +
|
||||
"offLineTime\030\004 \001(\004\022\022\n\nhaveReward\030\005 \001(\005\022\016\n" +
|
||||
"\006isGive\030\006 \001(\005\022\021\n\tisApplyed\030\007 \001(\005\022\014\n\004head" +
|
||||
"\030\014 \001(\005\022\r\n\005frame\030\r \001(\005\022\017\n\007soulVal\030\016 \001(\005\"V" +
|
||||
"\n\rGiftGoodsInfo\022\017\n\007goodsId\030\001 \001(\005\022\020\n\010buyT" +
|
||||
"imes\030\002 \001(\005\022\021\n\tstartTime\030\003 \001(\005\022\017\n\007endTime" +
|
||||
"\030\004 \001(\005\"7\n\021GoodsTypeDuration\022\021\n\tgoodsType" +
|
||||
"\030\001 \001(\005\022\017\n\007endTime\030\002 \001(\005\"/\n\016TechnologyInf" +
|
||||
"o\022\016\n\006techId\030\001 \001(\005\022\r\n\005levle\030\002 \001(\005\"J\n\020Sudd",
|
||||
"enlyBossInfo\022\022\n\nsuddBossId\030\006 \001(\005\022\017\n\007endT" +
|
||||
"ime\030\007 \001(\005\022\021\n\tfindMapId\030\010 \001(\005\"H\n\010ItemInfo" +
|
||||
"\022\022\n\ntemplateId\030\001 \001(\005\022\017\n\007overlap\030\002 \001(\005\022\027\n" +
|
||||
"\017nextRefreshTime\030\003 \001(\005\"H\n\010RankInfo\022\014\n\004ra" +
|
||||
"nk\030\001 \001(\005\022\016\n\006param1\030\002 \001(\005\022\016\n\006param2\030\003 \001(\005" +
|
||||
"\022\016\n\006param3\030\004 \001(\005\"\244\001\n\010UserRank\022\013\n\003uid\030\001 \001" +
|
||||
"(\005\022\r\n\005level\030\002 \001(\005\022\014\n\004head\030\003 \001(\005\022\020\n\010userN" +
|
||||
"ame\030\004 \001(\t\0226\n\010rankInfo\030\005 \001(\0132$.com.ljsd.j" +
|
||||
"ieling.protocols.RankInfo\022\021\n\theadFrame\030\006" +
|
||||
" \001(\005\022\021\n\tguildName\030\007 \001(\t\"\204\001\n\025ActorEffectB",
|
||||
"ufferInfo\022\n\n\002id\030\001 \001(\005\022\014\n\004type\030\002 \001(\005\022\021\n\ts" +
|
||||
"tartTime\030\003 \001(\005\022\017\n\007endTime\030\004 \001(\005\022\016\n\006targe" +
|
||||
"t\030\005 \001(\005\022\016\n\006caster\030\006 \001(\005\022\r\n\005value\030\007 \003(\005\"T" +
|
||||
"\n\016BloodyHeroInfo\022\016\n\006heroId\030\001 \001(\t\022\016\n\006hero" +
|
||||
"Hp\030\002 \001(\005\022\021\n\theroMaxHp\030\003 \001(\005\022\017\n\007heroTid\030\004" +
|
||||
" \001(\005\"%\n\010SceneMsg\022\014\n\004time\030\001 \001(\005\022\013\n\003msg\030\002 " +
|
||||
"\001(\t\"\'\n\nPosMineral\022\013\n\003pos\030\001 \001(\005\022\014\n\004nums\030\002" +
|
||||
" \001(\005\"\264\001\n\010Creature\022\014\n\004path\030\001 \003(\005\022\r\n\005speed" +
|
||||
"\030\002 \001(\005\022\r\n\005maxHp\030\003 \001(\005\022\r\n\005curHp\030\004 \001(\005\022\017\n\007" +
|
||||
"mineral\030\005 \001(\005\022\014\n\004camp\030\006 \001(\005\022<\n\010heroInfo\030",
|
||||
"\007 \003(\0132*.com.ljsd.jieling.protocols.Blood" +
|
||||
"yHeroInfo\022\020\n\010killNums\030\010 \001(\005\"\217\001\n\nSceneAct" +
|
||||
"or\022\n\n\002id\030\001 \001(\005\022\016\n\006curPos\030\002 \001(\005\022\r\n\005state\030" +
|
||||
"\003 \001(\005\022\014\n\004type\030\004 \001(\005\0226\n\010Creature\030\006 \001(\0132$." +
|
||||
"com.ljsd.jieling.protocols.Creature\022\020\n\010u" +
|
||||
"serName\030\007 \001(\t\"\236\002\n\tSceneInfo\022\016\n\006roomId\030\001 " +
|
||||
"\001(\005\022\r\n\005mapId\030\002 \001(\005\022:\n\nSceneActor\030\003 \003(\0132&" +
|
||||
".com.ljsd.jieling.protocols.SceneActor\022P" +
|
||||
"\n\025actorEffectBufferInfo\030\004 \003(\01321.com.ljsd" +
|
||||
".jieling.protocols.ActorEffectBufferInfo",
|
||||
"\022\024\n\014barrierPoint\030\005 \003(\005\022:\n\nposMineral\030\006 \003" +
|
||||
"(\0132&.com.ljsd.jieling.protocols.PosMiner" +
|
||||
"al\022\022\n\nremainTime\030\007 \001(\005\"S\n\027SceneGetFullMs" +
|
||||
"gResponse\0228\n\tsceneInfo\030\001 \001(\0132%.com.ljsd." +
|
||||
"jieling.protocols.SceneInfo\"B\n\013blessRewa" +
|
||||
"rd\022\022\n\nlocationId\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\022\020\n" +
|
||||
"\010rewardId\030\003 \001(\005\"5\n\022fiveResetTowerInfo\022\r\n" +
|
||||
"\005tower\030\001 \001(\005\022\020\n\010intoType\030\002 \001(\005\";\n\020Family" +
|
||||
"Contribute\022\013\n\003win\030\001 \001(\005\022\014\n\004draw\030\002 \001(\005\022\014\n" +
|
||||
"\004fail\030\003 \001(\005\"\210\002\n\016FamilyBaseInfo\022\n\n\002id\030\001 \001",
|
||||
"(\005\022\014\n\004name\030\002 \001(\t\022\017\n\007annouce\030\003 \001(\t\022\r\n\005lev" +
|
||||
"le\030\004 \001(\005\022\013\n\003exp\030\005 \001(\005\022\020\n\010totalNum\030\006 \001(\005\022" +
|
||||
"\016\n\006maxNum\030\007 \001(\005\022\020\n\010joinType\030\010 \001(\005\022\014\n\004ico" +
|
||||
"n\030\t \001(\005\022\021\n\tlevelTime\030\n \001(\005\022A\n\013fightResul" +
|
||||
"t\030\013 \001(\0132,.com.ljsd.jieling.protocols.Fam" +
|
||||
"ilyContribute\022\027\n\017playerIntoLevel\030\014 \001(\005\")" +
|
||||
"\n\013endlessHero\022\016\n\006heroId\030\001 \001(\t\022\n\n\002hp\030\002 \001(" +
|
||||
"\005\"2\n\022EndlessRefreshInfo\022\016\n\006cellId\030\001 \001(\005\022" +
|
||||
"\014\n\004time\030\002 \001(\005\"u\n\014UseForceInfo\022\014\n\004name\030\001 " +
|
||||
"\001(\t\022\014\n\004leve\030\002 \001(\005\022\r\n\005force\030\003 \001(\005\022\014\n\004rank",
|
||||
"\030\004 \001(\005\022\014\n\004head\030\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005\022" +
|
||||
"\013\n\003uid\030\007 \001(\005\"H\n\013endlessSign\022\r\n\005mapId\030\001 \001" +
|
||||
"(\005\022\016\n\006cellId\030\002 \001(\005\022\014\n\004info\030\003 \001(\t\022\014\n\004type" +
|
||||
"\030\004 \001(\005\"g\n\nExpertInfo\022\014\n\004name\030\001 \001(\t\022\r\n\005sc" +
|
||||
"ore\030\002 \001(\005\022\014\n\004rank\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\022\014" +
|
||||
"\n\004head\030\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005\")\n\nSignI" +
|
||||
"nInfo\022\014\n\004days\030\001 \001(\005\022\r\n\005state\030\002 \001(\005\"N\n\016Te" +
|
||||
"amSimpleInfo\022\016\n\006heroid\030\001 \001(\t\022\017\n\007heroTid\030" +
|
||||
"\002 \001(\005\022\014\n\004star\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\"\207\001\n\017T" +
|
||||
"eamOneTeamInfo\0228\n\004team\030\001 \003(\0132*.com.ljsd.",
|
||||
"jieling.protocols.TeamSimpleInfo\022\024\n\014Poke" +
|
||||
"monInfos\030\002 \003(\005\022\022\n\ntotalForce\030\003 \001(\005\022\020\n\010re" +
|
||||
"mainHp\030\004 \003(\005\"\271\001\n\013TeamOneInfo\022\013\n\003uid\030\001 \001(" +
|
||||
"\005\022\r\n\005level\030\002 \001(\005\022\014\n\004name\030\003 \001(\t\022\014\n\004head\030\004" +
|
||||
" \001(\005\022\021\n\theadFrame\030\005 \001(\005\022\021\n\tguildName\030\007 \001" +
|
||||
"(\t\0229\n\004team\030\006 \001(\0132+.com.ljsd.jieling.prot" +
|
||||
"ocols.TeamOneTeamInfo\022\021\n\tisApplyed\030\010 \001(\005" +
|
||||
"\"y\n\017MonsterRankInfo\022\014\n\004name\030\001 \001(\t\022\r\n\005sco" +
|
||||
"re\030\002 \001(\005\022\014\n\004rank\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\022\014\n" +
|
||||
"\004head\030\005 \001(\005\022\021\n\theadFrame\030\006 \001(\005\022\013\n\003uid\030\007 ",
|
||||
"\001(\005\"2\n\rHeroBloodInfo\022\016\n\006heroId\030\001 \001(\t\022\021\n\t" +
|
||||
"lostBlood\030\002 \001(\005\"D\n\013EndlessInfo\022\r\n\005mapId\030" +
|
||||
"\001 \001(\005\022\022\n\nworldLevel\030\002 \001(\005\022\022\n\nbloodScore\030" +
|
||||
"\003 \001(\005\"2\n\017PlayerBindPhone\022\020\n\010phoneNum\030\001 \001" +
|
||||
"(\t\022\r\n\005state\030\002 \001(\005\"3\n\014EndlessPoint\022\020\n\010loc" +
|
||||
"ation\030\001 \001(\005\022\021\n\tmonsterId\030\002 \001(\005\"2\n\014Strong" +
|
||||
"erInfo\022\020\n\010curScore\030\001 \001(\005\022\020\n\010maxScore\030\002 \001" +
|
||||
"(\005\"U\n\017QuestionOptions\022\017\n\007content\030\001 \001(\t\022\014" +
|
||||
"\n\004type\030\002 \001(\005\022\017\n\007options\030\003 \003(\t\022\022\n\nanswerT" +
|
||||
"ype\030\004 \001(\005\"\212\001\n\017BloodPersonInfo\022\n\n\002id\030\001 \001(",
|
||||
"\005\022\014\n\004name\030\002 \001(\t\022\021\n\theadFrame\030\003 \001(\005\022\014\n\004he" +
|
||||
"ad\030\004 \001(\005\022\020\n\010serverId\030\005 \001(\005\022\r\n\005level\030\006 \001(" +
|
||||
"\005\022\014\n\004rank\030\007 \001(\005\022\r\n\005score\030\010 \001(\005\"H\n\026LuckWh" +
|
||||
"eelRewardPosInfo\022\013\n\003pos\030\001 \001(\005\022\016\n\006luckId\030" +
|
||||
"\002 \001(\005\022\021\n\tluckTimes\030\003 \001(\005\"W\n\013RefreshTask\022" +
|
||||
"\014\n\004type\030\001 \001(\005\022:\n\005tasks\030\002 \003(\0132+.com.ljsd." +
|
||||
"jieling.protocols.UserMissionInfo\"\221\001\n\021Ma" +
|
||||
"inLevelRankInfo\022\013\n\003uid\030\001 \001(\005\022\r\n\005level\030\002 " +
|
||||
"\001(\005\022\014\n\004name\030\003 \001(\t\022\017\n\007fightId\030\004 \001(\005\022\014\n\004he" +
|
||||
"ad\030\005 \001(\005\022\014\n\004rank\030\006 \001(\005\022\022\n\ntotalForce\030\007 \001",
|
||||
"(\005\022\021\n\theadFrame\030\010 \001(\005\"B\n\017ChampionBetInfo" +
|
||||
"\022\n\n\002id\030\001 \001(\t\022\020\n\010redCoins\030\002 \001(\005\022\021\n\tblueCo" +
|
||||
"ins\030\003 \001(\005\"B\n\026ChampionTeamPersonInfo\022\013\n\003u" +
|
||||
"id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\r\n\005score\030\003 \001(\005\"\231\001" +
|
||||
"\n\022ChampionBattleInfo\0227\n\006myInfo\030\001 \001(\0132\'.c" +
|
||||
"om.ljsd.jieling.protocols.TeamOneInfo\022:\n" +
|
||||
"\tenemyInfo\030\002 \001(\0132\'.com.ljsd.jieling.prot" +
|
||||
"ocols.TeamOneInfo\022\016\n\006result\030\003 \001(\005B\002H\001"
|
||||
};
|
||||
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
|
||||
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
|
||||
|
@ -82051,7 +81937,7 @@ public final class CommonProto {
|
|||
internal_static_com_ljsd_jieling_protocols_VipBaseInfo_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
|
||||
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 =
|
||||
getDescriptor().getMessageTypes().get(46);
|
||||
internal_static_com_ljsd_jieling_protocols_Friend_fieldAccessorTable = new
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -1017,7 +1017,7 @@ public class RedisUtil {
|
|||
String rkey = getKey(type, key);
|
||||
for (int i = 0; i < MAX_TRY_TIMES; i++) {
|
||||
try {
|
||||
String valueStr = (String) redisTemplate.opsForHash().get(type + RedisKey.Delimiter_colon + key, mapKey);
|
||||
String valueStr = (String) redisTemplate.opsForHash().get(rkey, mapKey);
|
||||
if (valueStr != null)
|
||||
return gson.fromJson(valueStr, clazz);
|
||||
} catch (Exception e) {
|
||||
|
|
|
@ -9,7 +9,7 @@ import com.ljsd.jieling.protocols.MessageTypeProto;
|
|||
public class ChampionBetHandler extends BaseHandler<ArenaInfoProto.ChampionBetReqeust> {
|
||||
@Override
|
||||
public MessageTypeProto.MessageType getMessageCode() {
|
||||
return MessageTypeProto.MessageType.CHAMPION_BET_REQUEST;
|
||||
return MessageTypeProto.MessageType.CHAMPION_BET_GUESS_REQUEST;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -245,7 +245,7 @@ public class GlobalDataManaager implements IManager {
|
|||
new UserLevelEventHandler();
|
||||
new RemoveEventHeroHandler();
|
||||
new FightMainEventHandler();
|
||||
// ChampionshipLogic.whenStart();
|
||||
ChampionshipLogic.whenStart();
|
||||
} catch (Exception e) {
|
||||
LOGGER.error("e",e);
|
||||
}
|
||||
|
|
|
@ -20,6 +20,7 @@ import com.ljsd.jieling.logic.dao.root.User;
|
|||
import com.ljsd.jieling.logic.fight.*;
|
||||
import com.ljsd.jieling.logic.hero.HeroLogic;
|
||||
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.session.ISession;
|
||||
import com.ljsd.jieling.protocols.ArenaInfoProto;
|
||||
|
@ -250,10 +251,7 @@ public class ChampionshipLogic {
|
|||
String key = RedisUtil.getInstence().getKey(RedisKey.CHAMPION_JOIN, "");
|
||||
RedisUtil.getInstence().del(key, RedisUtil.getInstence().getKey(RedisKey.CHAMPION_RANK, ""));
|
||||
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++){
|
||||
RedisUtil.getInstence().putMapEntry(RedisKey.CHAMPION_CHOSE_TEAM_INFO, "",Integer.toString(i),memberOfTeamOfGroup.get(i));
|
||||
}
|
||||
|
@ -271,7 +269,7 @@ public class ChampionshipLogic {
|
|||
* 2.告知前端现在是准备阶段,并告诉我是否加入了巅峰赛
|
||||
*/
|
||||
public static void whenStart() throws Exception {
|
||||
TimeControllerOfFunction timeControllerOfFunction = GlobalDataManaager.getInstance().getTimeControllerOfFunctionByFunctinoType(FunctionIdEnum.TopBattle);
|
||||
/* TimeControllerOfFunction timeControllerOfFunction = GlobalDataManaager.getInstance().getTimeControllerOfFunctionByFunctinoType(FunctionIdEnum.TopBattle);
|
||||
if( null == timeControllerOfFunction){
|
||||
progress = -1;
|
||||
return;
|
||||
|
@ -279,7 +277,12 @@ public class ChampionshipLogic {
|
|||
String key = RedisUtil.getInstence().getKey(RedisKey.CHAMPION_JOIN, "");
|
||||
Type type = new TypeToken<Map<Integer, byte[]>>() {
|
||||
}.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;
|
||||
}
|
||||
builder.setChampionBattleInfo(CommonProto.ChampionBattleInfo.newBuilder()
|
||||
/* .setMyInfo(getEnemyInfo(uid,0))
|
||||
.setEnemyInfo(getEnemyInfo(enemyId,0))*/
|
||||
.setMyInfo(getChampionBattleInfo(uid))
|
||||
.setEnemyInfo(getChampionBattleInfo(enemyId))
|
||||
.setResult(fightResult)
|
||||
.build());
|
||||
|
||||
|
@ -346,6 +349,45 @@ public class ChampionshipLogic {
|
|||
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){
|
||||
List<ArenaRecord> curArenaRecordList = getCurArenaRecordList();
|
||||
for(ArenaRecord arenaRecord :curArenaRecordList){
|
||||
|
@ -558,7 +600,7 @@ public class ChampionshipLogic {
|
|||
RedisUtil.getInstence().incrementZsetScore(RedisKey.CHAMPION_BET_ALL,"",selectUid +":" + winUid,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);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
package com.ljsd.jieling.logic.dao;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class FamilyFightInfo {
|
||||
|
@ -12,8 +14,7 @@ public class FamilyFightInfo {
|
|||
private int force;
|
||||
private Map<String, String> heroSkills = new HashMap<>();
|
||||
private String pokenmonSkills;
|
||||
|
||||
|
||||
private List<Integer> pokenmonIds = new ArrayList<>();
|
||||
public Map<String, FamilyHeroInfo> getHeroAttribute() {
|
||||
return heroAttribute;
|
||||
}
|
||||
|
@ -80,4 +81,12 @@ public class FamilyFightInfo {
|
|||
public void setPokenmonSkills(String pokenmonSkills) {
|
||||
this.pokenmonSkills = pokenmonSkills;
|
||||
}
|
||||
|
||||
public List<Integer> getPokenmonIds() {
|
||||
return pokenmonIds;
|
||||
}
|
||||
|
||||
public void setPokenmonIds(List<Integer> pokenmonIds) {
|
||||
this.pokenmonIds = pokenmonIds;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,7 +2,6 @@ package com.ljsd.jieling.logic.player;
|
|||
|
||||
import com.ljsd.GameApplication;
|
||||
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.core.VipPrivilegeType;
|
||||
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.ActivityType;
|
||||
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.family.GuildLogic;
|
||||
import com.ljsd.jieling.logic.fight.CombatLogic;
|
||||
import com.ljsd.jieling.logic.hero.HeroLogic;
|
||||
import com.ljsd.jieling.logic.mail.MailLogic;
|
||||
import com.ljsd.jieling.logic.mission.GameEvent;
|
||||
|
@ -46,7 +43,6 @@ import util.StringUtil;
|
|||
import util.TimeUtils;
|
||||
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
|
||||
public class PlayerLogic {
|
||||
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()
|
||||
.setLevel(sArenaRobotConfig.getRobotLevel())
|
||||
.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());
|
||||
}
|
||||
oneInfo.setTeam(teamInfo);
|
||||
|
||||
PlayerInfoProto.GetPlayerOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerOneTeamInfoResponse.newBuilder().setTeamInfo(oneInfo);
|
||||
|
||||
MessageUtil.sendMessage(session,1,messageType.getNumber(),playerTeamInfo.build(),true);
|
||||
return oneInfo;
|
||||
|
||||
}
|
||||
|
||||
|
@ -479,43 +472,45 @@ public class PlayerLogic {
|
|||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
||||
}
|
||||
SArenaRobotConfig sArenaRobotConfig = SArenaRobotConfig.getsArenaRobotConfigById(id);
|
||||
CommonProto.TeamOneInfo.Builder oneInfo=null;
|
||||
if(sArenaRobotConfig!=null){
|
||||
getRobotTeamInfo(session,sArenaRobotConfig,messageType);
|
||||
return;
|
||||
}
|
||||
User user = UserManager.getUser(id);
|
||||
PlayerManager playerManager = user.getPlayerInfoManager();
|
||||
CommonProto.TeamOneInfo.Builder oneInfo = CommonProto.TeamOneInfo.newBuilder()
|
||||
.setHead(playerManager.getHead())
|
||||
.setHeadFrame(playerManager.getHeadFrame())
|
||||
.setLevel(playerManager.getLevel())
|
||||
.setName(playerManager.getNickName()).setUid(id);
|
||||
TeamPosManager teamPosManager = user.getTeamPosManager();
|
||||
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
||||
teamInfo.setTotalForce(HeroLogic.getInstance().calTeamTotalForce(user,teamId,false));
|
||||
if(teamPosManager.getTeamPosForPoken().get(teamId)!=null&&teamPosManager.getTeamPosForPoken().get(teamId).size()>0){
|
||||
for(TeamPosForPokenInfo posForPokenInfo:teamPosManager.getTeamPosForPoken().get(teamId)){
|
||||
teamInfo.addPokemonInfos(posForPokenInfo.getPokenId());
|
||||
oneInfo=getRobotTeamInfo(sArenaRobotConfig);
|
||||
}else{
|
||||
User user = UserManager.getUser(id);
|
||||
PlayerManager playerManager = user.getPlayerInfoManager();
|
||||
oneInfo = CommonProto.TeamOneInfo.newBuilder()
|
||||
.setHead(playerManager.getHead())
|
||||
.setHeadFrame(playerManager.getHeadFrame())
|
||||
.setLevel(playerManager.getLevel())
|
||||
.setName(playerManager.getNickName()).setUid(id);
|
||||
TeamPosManager teamPosManager = user.getTeamPosManager();
|
||||
CommonProto.TeamOneTeamInfo.Builder teamInfo = CommonProto.TeamOneTeamInfo.newBuilder();
|
||||
teamInfo.setTotalForce(HeroLogic.getInstance().calTeamTotalForce(user,teamId,false));
|
||||
if(teamPosManager.getTeamPosForPoken().get(teamId)!=null&&teamPosManager.getTeamPosForPoken().get(teamId).size()>0){
|
||||
for(TeamPosForPokenInfo posForPokenInfo:teamPosManager.getTeamPosForPoken().get(teamId)){
|
||||
teamInfo.addPokemonInfos(posForPokenInfo.getPokenId());
|
||||
}
|
||||
}
|
||||
}
|
||||
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);
|
||||
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);
|
||||
if(UserManager.getUser(session.getUid()).getFriendManager().getMyApplyFriends().contains(id)){
|
||||
oneInfo.setIsApplyed(1);
|
||||
}
|
||||
}
|
||||
oneInfo.setTeam(teamInfo);
|
||||
if(UserManager.getUser(session.getUid()).getFriendManager().getMyApplyFriends().contains(id)){
|
||||
oneInfo.setIsApplyed(1);
|
||||
}
|
||||
|
||||
PlayerInfoProto.GetPlayerOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerOneTeamInfoResponse.newBuilder().setTeamInfo(oneInfo);
|
||||
|
||||
MessageUtil.sendMessage(session,1,messageType.getNumber(),playerTeamInfo.build(),true);
|
||||
|
|
Loading…
Reference in New Issue