back_recharge
wangyuan 2020-05-08 14:16:46 +08:00
parent 48d3616061
commit 17751438fd
11 changed files with 1228 additions and 271 deletions

View File

@ -61800,6 +61800,24 @@ public final class CommonProto {
* </pre>
*/
int getPlayerIntoLevel();
// optional int32 fete = 13;
/**
* <code>optional int32 fete = 13;</code>
*
* <pre>
*
* </pre>
*/
boolean hasFete();
/**
* <code>optional int32 fete = 13;</code>
*
* <pre>
*
* </pre>
*/
int getFete();
}
/**
* Protobuf type {@code com.ljsd.jieling.protocols.FamilyBaseInfo}
@ -61920,6 +61938,11 @@ public final class CommonProto {
playerIntoLevel_ = input.readInt32();
break;
}
case 104: {
bitField0_ |= 0x00001000;
fete_ = input.readInt32();
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -62320,6 +62343,30 @@ public final class CommonProto {
return playerIntoLevel_;
}
// optional int32 fete = 13;
public static final int FETE_FIELD_NUMBER = 13;
private int fete_;
/**
* <code>optional int32 fete = 13;</code>
*
* <pre>
*
* </pre>
*/
public boolean hasFete() {
return ((bitField0_ & 0x00001000) == 0x00001000);
}
/**
* <code>optional int32 fete = 13;</code>
*
* <pre>
*
* </pre>
*/
public int getFete() {
return fete_;
}
private void initFields() {
id_ = 0;
name_ = "";
@ -62333,6 +62380,7 @@ public final class CommonProto {
levelTime_ = 0;
fightResult_ = com.ljsd.jieling.protocols.CommonProto.FamilyContribute.getDefaultInstance();
playerIntoLevel_ = 0;
fete_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@ -62382,6 +62430,9 @@ public final class CommonProto {
if (((bitField0_ & 0x00000800) == 0x00000800)) {
output.writeInt32(12, playerIntoLevel_);
}
if (((bitField0_ & 0x00001000) == 0x00001000)) {
output.writeInt32(13, fete_);
}
getUnknownFields().writeTo(output);
}
@ -62439,6 +62490,10 @@ public final class CommonProto {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(12, playerIntoLevel_);
}
if (((bitField0_ & 0x00001000) == 0x00001000)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(13, fete_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@ -62584,6 +62639,8 @@ public final class CommonProto {
bitField0_ = (bitField0_ & ~0x00000400);
playerIntoLevel_ = 0;
bitField0_ = (bitField0_ & ~0x00000800);
fete_ = 0;
bitField0_ = (bitField0_ & ~0x00001000);
return this;
}
@ -62664,6 +62721,10 @@ public final class CommonProto {
to_bitField0_ |= 0x00000800;
}
result.playerIntoLevel_ = playerIntoLevel_;
if (((from_bitField0_ & 0x00001000) == 0x00001000)) {
to_bitField0_ |= 0x00001000;
}
result.fete_ = fete_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@ -62720,6 +62781,9 @@ public final class CommonProto {
if (other.hasPlayerIntoLevel()) {
setPlayerIntoLevel(other.getPlayerIntoLevel());
}
if (other.hasFete()) {
setFete(other.getFete());
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@ -63537,6 +63601,55 @@ public final class CommonProto {
return this;
}
// optional int32 fete = 13;
private int fete_ ;
/**
* <code>optional int32 fete = 13;</code>
*
* <pre>
*
* </pre>
*/
public boolean hasFete() {
return ((bitField0_ & 0x00001000) == 0x00001000);
}
/**
* <code>optional int32 fete = 13;</code>
*
* <pre>
*
* </pre>
*/
public int getFete() {
return fete_;
}
/**
* <code>optional int32 fete = 13;</code>
*
* <pre>
*
* </pre>
*/
public Builder setFete(int value) {
bitField0_ |= 0x00001000;
fete_ = value;
onChanged();
return this;
}
/**
* <code>optional int32 fete = 13;</code>
*
* <pre>
*
* </pre>
*/
public Builder clearFete() {
bitField0_ = (bitField0_ & ~0x00001000);
fete_ = 0;
onChanged();
return this;
}
// @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.FamilyBaseInfo)
}
@ -90176,94 +90289,94 @@ public final class CommonProto {
" \001(\005\022\020\n\010rewardId\030\003 \001(\005\"5\n\022fiveResetTower" +
"Info\022\r\n\005tower\030\001 \001(\005\022\020\n\010intoType\030\002 \001(\005\";\n",
"\020FamilyContribute\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" +
" \001(\005\022\014\n\004fail\030\003 \001(\005\"\226\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\tlevelTime\030\n \001(\005\022A\n\013fig" +
"htResult\030\013 \001(\0132,.com.ljsd.jieling.protoc" +
"ols.FamilyContribute\022\027\n\017playerIntoLevel\030" +
"\014 \001(\005\")\n\013endlessHero\022\016\n\006heroId\030\001 \001(\t\022\n\n\002" +
"hp\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\004" +
"name\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\005ma" +
"pId\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\005score\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\nSignInInfo\022\014\n\004days\030\001 \001(\005\022\r\n\005state\030\002 \001(" +
"\005\"`\n\016TeamSimpleInfo\022\016\n\006heroid\030\001 \001(\t\022\017\n\007h",
"eroTid\030\002 \001(\005\022\014\n\004star\030\003 \001(\005\022\r\n\005level\030\004 \001(" +
"\005\022\020\n\010position\030\005 \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\"l\n\013RefreshTask\022\014\n\004type\030\001 \001(\005\022:" +
"\n\005tasks\030\002 \003(\0132+.com.ljsd.jieling.protoco" +
"ls.UserMissionInfo\022\023\n\013refreshTime\030\003 \001(\005\"",
"\221\001\n\021MainLevelRankInfo\022\013\n\003uid\030\001 \001(\005\022\r\n\005le" +
"vel\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\004rank\030\006 \001(\005\022\022\n\ntotalFor" +
"ce\030\007 \001(\005\022\021\n\theadFrame\030\010 \001(\005\"B\n\017ChampionB" +
"etInfo\022\n\n\002id\030\001 \001(\t\022\020\n\010redCoins\030\002 \001(\005\022\021\n\t" +
"blueCoins\030\003 \001(\005\"\323\001\n\022ChampionBattleInfo\0227" +
"\n\006myInfo\030\001 \001(\0132\'.com.ljsd.jieling.protoc" +
"ols.TeamOneInfo\022:\n\tenemyInfo\030\002 \001(\0132\'.com" +
".ljsd.jieling.protocols.TeamOneInfo\022\016\n\006r" +
"esult\030\003 \001(\005\0228\n\tfightData\030\004 \001(\0132%.com.ljs",
"d.jieling.protocols.FightData\"\367\001\n\026Champi" +
"onBattlePairInfo\022;\n\nattackInfo\030\001 \001(\0132\'.c" +
"om.ljsd.jieling.protocols.TeamOneInfo\0228\n" +
"\007defInfo\030\002 \001(\0132\'.com.ljsd.jieling.protoc" +
"ols.TeamOneInfo\022\023\n\013fightResult\030\003 \001(\005\022\n\n\002" +
"id\030\004 \001(\t\022\022\n\nroundTImes\030\005 \001(\005\022\016\n\006teamId\030\006" +
" \001(\005\022\020\n\010position\030\007 \001(\005\022\017\n\007isGUess\030\010 \001(\005\"" +
"q\n\nRedPackage\022\020\n\010userName\030\001 \001(\t\022\r\n\005redId" +
"\030\002 \001(\005\022\r\n\005isGet\030\003 \001(\005\022\020\n\010getCount\030\004 \001(\005\022" +
"\017\n\007redType\030\005 \001(\005\022\020\n\010sendTime\030\006 \001(\005\"\211\001\n\014R",
"edOneDetail\022\013\n\003uid\030\001 \001(\005\022\014\n\004head\030\002 \001(\005\022\021" +
"\n\theadFrame\030\003 \001(\005\022\014\n\004name\030\004 \001(\t\022\014\n\004time\030" +
"\005 \001(\005\022\r\n\005count\030\006 \001(\005\022\016\n\006itemId\030\007 \001(\005\022\020\n\010" +
"position\030\010 \001(\005\"Z\n\030ExpeditionSimpleBossIn" +
"fo\022\017\n\007heroTid\030\001 \001(\005\022\014\n\004star\030\002 \001(\005\022\r\n\005lev" +
"el\030\003 \001(\005\022\020\n\010remainHp\030\004 \001(\001\"\202\001\n\022Expeditio" +
"nTeamInfo\022B\n\004hero\030\001 \003(\01324.com.ljsd.jieli" +
"ng.protocols.ExpeditionSimpleBossInfo\022\024\n" +
"\014PokemonInfos\030\002 \003(\005\022\022\n\ntotalForce\030\003 \001(\005\"" +
"\251\001\n\022ExpeditionNodeInfo\022\016\n\006sortId\030\001 \001(\005\022\013",
"\n\003lay\030\002 \001(\005\022\014\n\004type\030\003 \001(\005\022D\n\014bossTeaminf" +
"o\030\004 \001(\0132..com.ljsd.jieling.protocols.Exp" +
"editionTeamInfo\022\r\n\005state\030\005 \001(\005\022\023\n\013holyEq" +
"uipID\030\006 \003(\005\"<\n\030ExpeditionSimpleHeroInfo\022" +
"\016\n\006heroId\030\001 \001(\t\022\020\n\010remainHp\030\002 \001(\001\"/\n\017Exp" +
"editionEquip\022\n\n\002id\030\001 \001(\t\022\020\n\010equiptId\030\002 \001" +
"(\005\"P\n\rMonthCardInfo\022\n\n\002id\030\001 \001(\005\022\022\n\nendin" +
"gTime\030\002 \001(\005\022\r\n\005state\030\003 \001(\005\022\020\n\010totleAmt\030\004" +
" \001(\005B\002H\001"
"\014 \001(\005\022\014\n\004fete\030\r \001(\005\")\n\013endlessHero\022\016\n\006he" +
"roId\030\001 \001(\t\022\n\n\002hp\030\002 \001(\005\"2\n\022EndlessRefresh",
"Info\022\016\n\006cellId\030\001 \001(\005\022\014\n\004time\030\002 \001(\005\"u\n\014Us" +
"eForceInfo\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\013end" +
"lessSign\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\nExpertInf" +
"o\022\014\n\004name\030\001 \001(\t\022\r\n\005score\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\thea" +
"dFrame\030\006 \001(\005\")\n\nSignInInfo\022\014\n\004days\030\001 \001(\005" +
"\022\r\n\005state\030\002 \001(\005\"`\n\016TeamSimpleInfo\022\016\n\006her",
"oid\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\022\020\n\010position\030\005 \001(\005\"\207\001\n\017Te" +
"amOneTeamInfo\0228\n\004team\030\001 \003(\0132*.com.ljsd.j" +
"ieling.protocols.TeamSimpleInfo\022\024\n\014Pokem" +
"onInfos\030\002 \003(\005\022\022\n\ntotalForce\030\003 \001(\005\022\020\n\010rem" +
"ainHp\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.proto" +
"cols.TeamOneTeamInfo\022\021\n\tisApplyed\030\010 \001(\005\"",
"y\n\017MonsterRankInfo\022\014\n\004name\030\001 \001(\t\022\r\n\005scor" +
"e\030\002 \001(\005\022\014\n\004rank\030\003 \001(\005\022\r\n\005level\030\004 \001(\005\022\014\n\004" +
"head\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\tl" +
"ostBlood\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\010loca" +
"tion\030\001 \001(\005\022\021\n\tmonsterId\030\002 \001(\005\"2\n\014Stronge" +
"rInfo\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\nanswerTy" +
"pe\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\004hea" +
"d\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\026LuckWhe" +
"elRewardPosInfo\022\013\n\003pos\030\001 \001(\005\022\016\n\006luckId\030\002" +
" \001(\005\022\021\n\tluckTimes\030\003 \001(\005\"l\n\013RefreshTask\022\014" +
"\n\004type\030\001 \001(\005\022:\n\005tasks\030\002 \003(\0132+.com.ljsd.j" +
"ieling.protocols.UserMissionInfo\022\023\n\013refr",
"eshTime\030\003 \001(\005\"\221\001\n\021MainLevelRankInfo\022\013\n\003u" +
"id\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\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\010redC" +
"oins\030\002 \001(\005\022\021\n\tblueCoins\030\003 \001(\005\"\323\001\n\022Champi" +
"onBattleInfo\0227\n\006myInfo\030\001 \001(\0132\'.com.ljsd." +
"jieling.protocols.TeamOneInfo\022:\n\tenemyIn" +
"fo\030\002 \001(\0132\'.com.ljsd.jieling.protocols.Te" +
"amOneInfo\022\016\n\006result\030\003 \001(\005\0228\n\tfightData\030\004",
" \001(\0132%.com.ljsd.jieling.protocols.FightD" +
"ata\"\367\001\n\026ChampionBattlePairInfo\022;\n\nattack" +
"Info\030\001 \001(\0132\'.com.ljsd.jieling.protocols." +
"TeamOneInfo\0228\n\007defInfo\030\002 \001(\0132\'.com.ljsd." +
"jieling.protocols.TeamOneInfo\022\023\n\013fightRe" +
"sult\030\003 \001(\005\022\n\n\002id\030\004 \001(\t\022\022\n\nroundTImes\030\005 \001" +
"(\005\022\016\n\006teamId\030\006 \001(\005\022\020\n\010position\030\007 \001(\005\022\017\n\007" +
"isGUess\030\010 \001(\005\"q\n\nRedPackage\022\020\n\010userName\030" +
"\001 \001(\t\022\r\n\005redId\030\002 \001(\005\022\r\n\005isGet\030\003 \001(\005\022\020\n\010g" +
"etCount\030\004 \001(\005\022\017\n\007redType\030\005 \001(\005\022\020\n\010sendTi",
"me\030\006 \001(\005\"\211\001\n\014RedOneDetail\022\013\n\003uid\030\001 \001(\005\022\014" +
"\n\004head\030\002 \001(\005\022\021\n\theadFrame\030\003 \001(\005\022\014\n\004name\030" +
"\004 \001(\t\022\014\n\004time\030\005 \001(\005\022\r\n\005count\030\006 \001(\005\022\016\n\006it" +
"emId\030\007 \001(\005\022\020\n\010position\030\010 \001(\005\"Z\n\030Expediti" +
"onSimpleBossInfo\022\017\n\007heroTid\030\001 \001(\005\022\014\n\004sta" +
"r\030\002 \001(\005\022\r\n\005level\030\003 \001(\005\022\020\n\010remainHp\030\004 \001(\001" +
"\"\202\001\n\022ExpeditionTeamInfo\022B\n\004hero\030\001 \003(\01324." +
"com.ljsd.jieling.protocols.ExpeditionSim" +
"pleBossInfo\022\024\n\014PokemonInfos\030\002 \003(\005\022\022\n\ntot" +
"alForce\030\003 \001(\005\"\251\001\n\022ExpeditionNodeInfo\022\016\n\006",
"sortId\030\001 \001(\005\022\013\n\003lay\030\002 \001(\005\022\014\n\004type\030\003 \001(\005\022" +
"D\n\014bossTeaminfo\030\004 \001(\0132..com.ljsd.jieling" +
".protocols.ExpeditionTeamInfo\022\r\n\005state\030\005" +
" \001(\005\022\023\n\013holyEquipID\030\006 \003(\005\"<\n\030ExpeditionS" +
"impleHeroInfo\022\016\n\006heroId\030\001 \001(\t\022\020\n\010remainH" +
"p\030\002 \001(\001\"/\n\017ExpeditionEquip\022\n\n\002id\030\001 \001(\t\022\020" +
"\n\010equiptId\030\002 \001(\005\"P\n\rMonthCardInfo\022\n\n\002id\030" +
"\001 \001(\005\022\022\n\nendingTime\030\002 \001(\005\022\r\n\005state\030\003 \001(\005" +
"\022\020\n\010totleAmt\030\004 \001(\005B\002H\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -90671,7 +90784,7 @@ public final class CommonProto {
internal_static_com_ljsd_jieling_protocols_FamilyBaseInfo_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_ljsd_jieling_protocols_FamilyBaseInfo_descriptor,
new java.lang.String[] { "Id", "Name", "Annouce", "Levle", "Exp", "TotalNum", "MaxNum", "JoinType", "Icon", "LevelTime", "FightResult", "PlayerIntoLevel", });
new java.lang.String[] { "Id", "Name", "Annouce", "Levle", "Exp", "TotalNum", "MaxNum", "JoinType", "Icon", "LevelTime", "FightResult", "PlayerIntoLevel", "Fete", });
internal_static_com_ljsd_jieling_protocols_endlessHero_descriptor =
getDescriptor().getMessageTypes().get(66);
internal_static_com_ljsd_jieling_protocols_endlessHero_fieldAccessorTable = new

View File

@ -23398,6 +23398,20 @@ public final class FightInfoProto {
* </pre>
*/
int getHurt();
// optional .com.ljsd.jieling.protocols.FightData fightData = 3;
/**
* <code>optional .com.ljsd.jieling.protocols.FightData fightData = 3;</code>
*/
boolean hasFightData();
/**
* <code>optional .com.ljsd.jieling.protocols.FightData fightData = 3;</code>
*/
com.ljsd.jieling.protocols.CommonProto.FightData getFightData();
/**
* <code>optional .com.ljsd.jieling.protocols.FightData fightData = 3;</code>
*/
com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder getFightDataOrBuilder();
}
/**
* Protobuf type {@code com.ljsd.jieling.protocols.FastFightChallengeResponse}
@ -23460,6 +23474,19 @@ public final class FightInfoProto {
hurt_ = input.readInt32();
break;
}
case 26: {
com.ljsd.jieling.protocols.CommonProto.FightData.Builder subBuilder = null;
if (((bitField0_ & 0x00000004) == 0x00000004)) {
subBuilder = fightData_.toBuilder();
}
fightData_ = input.readMessage(com.ljsd.jieling.protocols.CommonProto.FightData.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(fightData_);
fightData_ = subBuilder.buildPartial();
}
bitField0_ |= 0x00000004;
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -23548,9 +23575,32 @@ public final class FightInfoProto {
return hurt_;
}
// optional .com.ljsd.jieling.protocols.FightData fightData = 3;
public static final int FIGHTDATA_FIELD_NUMBER = 3;
private com.ljsd.jieling.protocols.CommonProto.FightData fightData_;
/**
* <code>optional .com.ljsd.jieling.protocols.FightData fightData = 3;</code>
*/
public boolean hasFightData() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* <code>optional .com.ljsd.jieling.protocols.FightData fightData = 3;</code>
*/
public com.ljsd.jieling.protocols.CommonProto.FightData getFightData() {
return fightData_;
}
/**
* <code>optional .com.ljsd.jieling.protocols.FightData fightData = 3;</code>
*/
public com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder getFightDataOrBuilder() {
return fightData_;
}
private void initFields() {
score_ = 0;
hurt_ = 0;
fightData_ = com.ljsd.jieling.protocols.CommonProto.FightData.getDefaultInstance();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@ -23570,6 +23620,9 @@ public final class FightInfoProto {
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeInt32(2, hurt_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
output.writeMessage(3, fightData_);
}
getUnknownFields().writeTo(output);
}
@ -23587,6 +23640,10 @@ public final class FightInfoProto {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(2, hurt_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
.computeMessageSize(3, fightData_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@ -23695,6 +23752,7 @@ public final class FightInfoProto {
}
private void maybeForceBuilderInitialization() {
if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getFightDataFieldBuilder();
}
}
private static Builder create() {
@ -23707,6 +23765,12 @@ public final class FightInfoProto {
bitField0_ = (bitField0_ & ~0x00000001);
hurt_ = 0;
bitField0_ = (bitField0_ & ~0x00000002);
if (fightDataBuilder_ == null) {
fightData_ = com.ljsd.jieling.protocols.CommonProto.FightData.getDefaultInstance();
} else {
fightDataBuilder_.clear();
}
bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
@ -23743,6 +23807,14 @@ public final class FightInfoProto {
to_bitField0_ |= 0x00000002;
}
result.hurt_ = hurt_;
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004;
}
if (fightDataBuilder_ == null) {
result.fightData_ = fightData_;
} else {
result.fightData_ = fightDataBuilder_.build();
}
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@ -23765,6 +23837,9 @@ public final class FightInfoProto {
if (other.hasHurt()) {
setHurt(other.getHurt());
}
if (other.hasFightData()) {
mergeFightData(other.getFightData());
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@ -23890,6 +23965,123 @@ public final class FightInfoProto {
return this;
}
// optional .com.ljsd.jieling.protocols.FightData fightData = 3;
private com.ljsd.jieling.protocols.CommonProto.FightData fightData_ = com.ljsd.jieling.protocols.CommonProto.FightData.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
com.ljsd.jieling.protocols.CommonProto.FightData, com.ljsd.jieling.protocols.CommonProto.FightData.Builder, com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder> fightDataBuilder_;
/**
* <code>optional .com.ljsd.jieling.protocols.FightData fightData = 3;</code>
*/
public boolean hasFightData() {
return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
* <code>optional .com.ljsd.jieling.protocols.FightData fightData = 3;</code>
*/
public com.ljsd.jieling.protocols.CommonProto.FightData getFightData() {
if (fightDataBuilder_ == null) {
return fightData_;
} else {
return fightDataBuilder_.getMessage();
}
}
/**
* <code>optional .com.ljsd.jieling.protocols.FightData fightData = 3;</code>
*/
public Builder setFightData(com.ljsd.jieling.protocols.CommonProto.FightData value) {
if (fightDataBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
}
fightData_ = value;
onChanged();
} else {
fightDataBuilder_.setMessage(value);
}
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>optional .com.ljsd.jieling.protocols.FightData fightData = 3;</code>
*/
public Builder setFightData(
com.ljsd.jieling.protocols.CommonProto.FightData.Builder builderForValue) {
if (fightDataBuilder_ == null) {
fightData_ = builderForValue.build();
onChanged();
} else {
fightDataBuilder_.setMessage(builderForValue.build());
}
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>optional .com.ljsd.jieling.protocols.FightData fightData = 3;</code>
*/
public Builder mergeFightData(com.ljsd.jieling.protocols.CommonProto.FightData value) {
if (fightDataBuilder_ == null) {
if (((bitField0_ & 0x00000004) == 0x00000004) &&
fightData_ != com.ljsd.jieling.protocols.CommonProto.FightData.getDefaultInstance()) {
fightData_ =
com.ljsd.jieling.protocols.CommonProto.FightData.newBuilder(fightData_).mergeFrom(value).buildPartial();
} else {
fightData_ = value;
}
onChanged();
} else {
fightDataBuilder_.mergeFrom(value);
}
bitField0_ |= 0x00000004;
return this;
}
/**
* <code>optional .com.ljsd.jieling.protocols.FightData fightData = 3;</code>
*/
public Builder clearFightData() {
if (fightDataBuilder_ == null) {
fightData_ = com.ljsd.jieling.protocols.CommonProto.FightData.getDefaultInstance();
onChanged();
} else {
fightDataBuilder_.clear();
}
bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
/**
* <code>optional .com.ljsd.jieling.protocols.FightData fightData = 3;</code>
*/
public com.ljsd.jieling.protocols.CommonProto.FightData.Builder getFightDataBuilder() {
bitField0_ |= 0x00000004;
onChanged();
return getFightDataFieldBuilder().getBuilder();
}
/**
* <code>optional .com.ljsd.jieling.protocols.FightData fightData = 3;</code>
*/
public com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder getFightDataOrBuilder() {
if (fightDataBuilder_ != null) {
return fightDataBuilder_.getMessageOrBuilder();
} else {
return fightData_;
}
}
/**
* <code>optional .com.ljsd.jieling.protocols.FightData fightData = 3;</code>
*/
private com.google.protobuf.SingleFieldBuilder<
com.ljsd.jieling.protocols.CommonProto.FightData, com.ljsd.jieling.protocols.CommonProto.FightData.Builder, com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder>
getFightDataFieldBuilder() {
if (fightDataBuilder_ == null) {
fightDataBuilder_ = new com.google.protobuf.SingleFieldBuilder<
com.ljsd.jieling.protocols.CommonProto.FightData, com.ljsd.jieling.protocols.CommonProto.FightData.Builder, com.ljsd.jieling.protocols.CommonProto.FightDataOrBuilder>(
fightData_,
getParentForChildren(),
isClean());
fightData_ = null;
}
return fightDataBuilder_;
}
// @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.FastFightChallengeResponse)
}
@ -24153,9 +24345,10 @@ public final class FightInfoProto {
"protocols.MainLevelRankInfo\"@\n\036MainLevel" +
"FightUpdateIndication\022\017\n\007fightId\030\001 \001(\005\022\r" +
"\n\005state\030\002 \001(\005\">\n\031FastFightChallengeReque" +
"st\022\014\n\004type\030\001 \001(\005\022\023\n\013challeageId\030\002 \001(\005\"9\n" +
"st\022\014\n\004type\030\001 \001(\005\022\023\n\013challeageId\030\002 \001(\005\"s\n" +
"\032FastFightChallengeResponse\022\r\n\005score\030\001 \001",
"(\005\022\014\n\004hurt\030\002 \001(\005B\002H\001"
"(\005\022\014\n\004hurt\030\002 \001(\005\0228\n\tfightData\030\003 \001(\0132%.co" +
"m.ljsd.jieling.protocols.FightDataB\002H\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -24347,7 +24540,7 @@ public final class FightInfoProto {
internal_static_com_ljsd_jieling_protocols_FastFightChallengeResponse_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_ljsd_jieling_protocols_FastFightChallengeResponse_descriptor,
new java.lang.String[] { "Score", "Hurt", });
new java.lang.String[] { "Score", "Hurt", "FightData", });
return null;
}
};

View File

@ -216,7 +216,7 @@ function BattleMain.Execute(args, fightData, optionData)
Random.SetSeed(args.seed)
BattleLogic.Init(fightData, optionData, _maxRound)
BattleLogic.Type = _type
if _type == 9 or _type == 10 then
if _type == 9 or _type == 10 or _type == 11 then
AddRecord(fightData)
end
BattleLogic.StartOrder()

View File

@ -216,7 +216,7 @@ function BattleMain.Execute(args, fightData, optionData)
Random.SetSeed(args.seed)
BattleLogic.Init(fightData, optionData, _maxRound)
BattleLogic.Type = _type
if _type == 9 or _type == 10 then
if _type == 9 or _type == 10 or _type == 11 then
AddRecord(fightData)
end
BattleLogic.StartOrder()

View File

@ -88,7 +88,7 @@ public interface GlobalsDef {
int ENDLESS_TEAM = 401;//无尽编队
int BLOODY_TEAM =701; //血战队伍
int CHAMPION_ATTACK_TEAM =801; //
int CAR_DELAY_TEAM =901; //车迟斗法
int CAR_DELAY_TEAM =1101; //车迟斗法
//特权解锁类型
int LEVEL_UNLOCK_PRIVILEGE = 1;

View File

@ -11,11 +11,13 @@ import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.family.GuildFightLogic;
import com.ljsd.jieling.logic.fight.FightDispatcher;
import com.ljsd.jieling.logic.fight.GameFightType;
import com.ljsd.jieling.logic.fight.PVEFightEvent;
import com.ljsd.jieling.logic.fight.PVPFightEvent;
import com.ljsd.jieling.logic.fight.result.FightResult;
import com.ljsd.jieling.logic.player.PlayerLogic;
import com.ljsd.jieling.logic.rank.RankEnum;
import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.protocols.CommonProto;
import com.ljsd.jieling.protocols.FightInfoProto;
import com.ljsd.jieling.protocols.MessageTypeProto;
import com.ljsd.jieling.util.MessageUtil;
@ -50,21 +52,23 @@ public class FastChallengeHandler extends BaseHandler<FightInfoProto.FastFightCh
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE);
}
int privilege = sWorldBossSetting.getPrivilege()[type - 1];
boolean b = PlayerLogic.getInstance().checkAndUpdate(user, privilege, 1);
/* boolean b = PlayerLogic.getInstance().checkAndUpdate(user, privilege, 1);
if(!b){
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE);
}
}*/
}
int hurt = 0;
int gainScore = 0;
int challeageId = proto.getChalleageId();
int battleRound = sWorldBossSetting.getBattleRound();
CommonProto.FightData fightData= null;
switch (type){
case 1:{
int monsterId = STableManager.getConfig(SWorldBossConfig.class).get(GuildFightLogic.carDelayProgressIndication.getBossIndexId()).getMonsterId();
PVPFightEvent pvpFightEvent = new PVPFightEvent(uid,GlobalsDef.CAR_DELAY_TEAM, battleRound,"", GameFightType.CarBossChallenge,monsterId,3);
PVEFightEvent pvpFightEvent = new PVEFightEvent(uid,GlobalsDef.CAR_DELAY_TEAM, battleRound,"", GameFightType.CarBossChallenge,monsterId,3);
FightResult fightResult = FightDispatcher.dispatcher(pvpFightEvent);
hurt = fightResult.getCheckResult()[1];
fightData = fightResult.getFightData();
gainScore = (int) (hurt*(sWorldBossSetting.getScorePercent()/10000F));
RankEnum.toRank(RankEnum.CAR_DEALY_RANK.getType()).incrementRankScore(uid,"",gainScore);
@ -92,7 +96,7 @@ public class FastChallengeHandler extends BaseHandler<FightInfoProto.FastFightCh
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE);
}
FightInfoProto.FastFightChallengeResponse build = FightInfoProto.FastFightChallengeResponse.newBuilder().setHurt(hurt).setScore(gainScore).build();
FightInfoProto.FastFightChallengeResponse build = FightInfoProto.FastFightChallengeResponse.newBuilder().setHurt(hurt).setScore(gainScore).setFightData(fightData).build();
MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.FAST_FIGHT_CHALLENGE_RESPONSE_VALUE,build,true);
}
}

View File

@ -7,6 +7,8 @@ import com.ljsd.jieling.exception.ErrorCode;
import com.ljsd.jieling.exception.ErrorCodeException;
import com.ljsd.jieling.handler.BaseHandler;
import com.ljsd.jieling.logic.dao.GuilidManager;
import com.ljsd.jieling.logic.dao.Hero;
import com.ljsd.jieling.logic.dao.TeamPosHeroInfo;
import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.GuildCache;
import com.ljsd.jieling.logic.dao.root.GuildInfo;
@ -18,6 +20,7 @@ import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.protocols.CommonProto;
import com.ljsd.jieling.protocols.Family;
import com.ljsd.jieling.protocols.MessageTypeProto;
import com.ljsd.jieling.util.CBean2Proto;
import com.ljsd.jieling.util.MessageUtil;
import config.SWorldBossSetting;
import manager.STableManager;
@ -86,14 +89,18 @@ public class GetCarChallengeListHandler extends BaseHandler {
CommonProto.TeamOneInfo.Builder userTeamOneInfo = PlayerLogic.getInstance().getUserTeamOneInfo(challenegUid, GlobalsDef.CAR_DELAY_TEAM);
User challenegeUser = UserManager.getUser(challenegUid);
int challengeGuildId = challenegeUser.getPlayerInfoManager().getGuildId();
Family.CarChallengeItem.Builder builder1 = Family.CarChallengeItem.newBuilder()
.setUid(challenegUid)
.setUserName(challenegeUser.getPlayerInfoManager().getNickName())
.setScore(item.getScore().intValue())
.setForce(0)
.setTeamInfo(userTeamOneInfo)
.setHadChallenge(records.containsKey(challenegUid)?1:0)
.setRank(rank);
for (TeamPosHeroInfo heroInfo:challenegeUser.getTeamPosManager().getTeamPosForHero().get(GlobalsDef.CAR_DELAY_TEAM)) {
Hero hero = user.getHeroManager().getHero(heroInfo.getHeroId());
builder1.addTeamInfo(CBean2Proto.getSimpleTeamInfoByHero(hero,heroInfo.getPosition()));
}
if(challengeGuildId!=0){
GuildInfo challenegeGuildInfo = GuilidManager.guildInfoMap.get(challenegeUser.getPlayerInfoManager().getGuildId());
builder1.setGuildName(challenegeGuildInfo.getName());

View File

@ -1265,10 +1265,10 @@ public class GuildFightLogic {
endTime = (int)(calendar.getTimeInMillis()/1000);
}else if(sourceCompare>=grapCompareStart && sourceCompare<=grapCompaeEnd){
if(carProgressTmp == 2){
if(carProgressTmp == 3){
return;
}
carProgressTmp = 2;
carProgressTmp = 3;
calendar.set(calendar.HOUR_OF_DAY,grabTime[1][0]);
calendar.set(calendar.MINUTE,grabTime[1][1]);
calendar.set(calendar.SECOND,0);

View File

@ -91,6 +91,8 @@ public class FightUtil {
builder.setSeed(fightSeed);
builder.setFightTeamInfo(fightTeamInfo);
builder.setMonsterTeamList(monsterfightTeamInfos);
CommonProto.FightData fightData = CommonProto.FightData.newBuilder().setFightType(fightEvent.getFightType().getFightType().getType()).setHeroFightInfos(fightTeamInfo).addAllMonsterList(monsterfightTeamInfos).setFightSeed(fightSeed).setFightMaxTime(fightEvent.getMostTime()).build();
builder.setFightData(fightData);
return builder.build();
}

View File

@ -43,8 +43,8 @@ public enum GameFightType {
GuildBossFight(FightType.GuildBossFight,new DefaultOfRedisCacheFightHandler(),RedisKey.GUILD_MONSTER_FIGHT),
DailyChallenge(FightType.StoryFight,new DefaultWithoutHandFightHandler(),null),
CarBossChallenge(FightType.StoryFight,new DefaultWithoutHandFightHandler(),null),
CarPersonChallenge(FightType.StoryFight,new DefaultWithoutHandFightHandler(),null),
CarBossChallenge(FightType.CarBossFight,new DefaultWithoutHandFightHandler(),null),
CarPersonChallenge(FightType.CarPersonFight,new DefaultWithoutHandFightHandler(),null),
;