Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
3daf45e1d1
File diff suppressed because it is too large
Load Diff
|
@ -2511,6 +2511,24 @@ public final class Family {
|
|||
*/
|
||||
com.google.protobuf.ByteString
|
||||
getNameBytes();
|
||||
|
||||
// optional int32 gender = 5;
|
||||
/**
|
||||
* <code>optional int32 gender = 5;</code>
|
||||
*
|
||||
* <pre>
|
||||
* 性别
|
||||
* </pre>
|
||||
*/
|
||||
boolean hasGender();
|
||||
/**
|
||||
* <code>optional int32 gender = 5;</code>
|
||||
*
|
||||
* <pre>
|
||||
* 性别
|
||||
* </pre>
|
||||
*/
|
||||
int getGender();
|
||||
}
|
||||
/**
|
||||
* Protobuf type {@code com.ljsd.jieling.protocols.FamilyWalkIndicaiton}
|
||||
|
@ -2599,6 +2617,11 @@ public final class Family {
|
|||
name_ = input.readBytes();
|
||||
break;
|
||||
}
|
||||
case 40: {
|
||||
bitField0_ |= 0x00000008;
|
||||
gender_ = input.readInt32();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
|
||||
|
@ -2780,11 +2803,36 @@ public final class Family {
|
|||
}
|
||||
}
|
||||
|
||||
// optional int32 gender = 5;
|
||||
public static final int GENDER_FIELD_NUMBER = 5;
|
||||
private int gender_;
|
||||
/**
|
||||
* <code>optional int32 gender = 5;</code>
|
||||
*
|
||||
* <pre>
|
||||
* 性别
|
||||
* </pre>
|
||||
*/
|
||||
public boolean hasGender() {
|
||||
return ((bitField0_ & 0x00000008) == 0x00000008);
|
||||
}
|
||||
/**
|
||||
* <code>optional int32 gender = 5;</code>
|
||||
*
|
||||
* <pre>
|
||||
* 性别
|
||||
* </pre>
|
||||
*/
|
||||
public int getGender() {
|
||||
return gender_;
|
||||
}
|
||||
|
||||
private void initFields() {
|
||||
path_ = java.util.Collections.emptyList();
|
||||
curPos_ = 0;
|
||||
uid_ = 0;
|
||||
name_ = "";
|
||||
gender_ = 0;
|
||||
}
|
||||
private byte memoizedIsInitialized = -1;
|
||||
public final boolean isInitialized() {
|
||||
|
@ -2810,6 +2858,9 @@ public final class Family {
|
|||
if (((bitField0_ & 0x00000004) == 0x00000004)) {
|
||||
output.writeBytes(4, getNameBytes());
|
||||
}
|
||||
if (((bitField0_ & 0x00000008) == 0x00000008)) {
|
||||
output.writeInt32(5, gender_);
|
||||
}
|
||||
getUnknownFields().writeTo(output);
|
||||
}
|
||||
|
||||
|
@ -2840,6 +2891,10 @@ public final class Family {
|
|||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeBytesSize(4, getNameBytes());
|
||||
}
|
||||
if (((bitField0_ & 0x00000008) == 0x00000008)) {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(5, gender_);
|
||||
}
|
||||
size += getUnknownFields().getSerializedSize();
|
||||
memoizedSerializedSize = size;
|
||||
return size;
|
||||
|
@ -2964,6 +3019,8 @@ public final class Family {
|
|||
bitField0_ = (bitField0_ & ~0x00000004);
|
||||
name_ = "";
|
||||
bitField0_ = (bitField0_ & ~0x00000008);
|
||||
gender_ = 0;
|
||||
bitField0_ = (bitField0_ & ~0x00000010);
|
||||
return this;
|
||||
}
|
||||
|
||||
|
@ -3009,6 +3066,10 @@ public final class Family {
|
|||
to_bitField0_ |= 0x00000004;
|
||||
}
|
||||
result.name_ = name_;
|
||||
if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
|
||||
to_bitField0_ |= 0x00000008;
|
||||
}
|
||||
result.gender_ = gender_;
|
||||
result.bitField0_ = to_bitField0_;
|
||||
onBuilt();
|
||||
return result;
|
||||
|
@ -3046,6 +3107,9 @@ public final class Family {
|
|||
name_ = other.name_;
|
||||
onChanged();
|
||||
}
|
||||
if (other.hasGender()) {
|
||||
setGender(other.getGender());
|
||||
}
|
||||
this.mergeUnknownFields(other.getUnknownFields());
|
||||
return this;
|
||||
}
|
||||
|
@ -3363,6 +3427,55 @@ public final class Family {
|
|||
return this;
|
||||
}
|
||||
|
||||
// optional int32 gender = 5;
|
||||
private int gender_ ;
|
||||
/**
|
||||
* <code>optional int32 gender = 5;</code>
|
||||
*
|
||||
* <pre>
|
||||
* 性别
|
||||
* </pre>
|
||||
*/
|
||||
public boolean hasGender() {
|
||||
return ((bitField0_ & 0x00000010) == 0x00000010);
|
||||
}
|
||||
/**
|
||||
* <code>optional int32 gender = 5;</code>
|
||||
*
|
||||
* <pre>
|
||||
* 性别
|
||||
* </pre>
|
||||
*/
|
||||
public int getGender() {
|
||||
return gender_;
|
||||
}
|
||||
/**
|
||||
* <code>optional int32 gender = 5;</code>
|
||||
*
|
||||
* <pre>
|
||||
* 性别
|
||||
* </pre>
|
||||
*/
|
||||
public Builder setGender(int value) {
|
||||
bitField0_ |= 0x00000010;
|
||||
gender_ = value;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
/**
|
||||
* <code>optional int32 gender = 5;</code>
|
||||
*
|
||||
* <pre>
|
||||
* 性别
|
||||
* </pre>
|
||||
*/
|
||||
public Builder clearGender() {
|
||||
bitField0_ = (bitField0_ & ~0x00000010);
|
||||
gender_ = 0;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.FamilyWalkIndicaiton)
|
||||
}
|
||||
|
||||
|
@ -36514,117 +36627,118 @@ public final class Family {
|
|||
"uteToday\030\007 \001(\005\022\021\n\tsoulForce\030\010 \001(\005\022\014\n\004hea" +
|
||||
"d\030\t \001(\005\022\r\n\005frame\030\n \001(\005\"9\n\rFamilyLogInfo\022" +
|
||||
"\014\n\004name\030\001 \001(\t\022\014\n\004info\030\002 \001(\t\022\014\n\004time\030\003 \001(" +
|
||||
"\005\"O\n\024FamilyWalkIndicaiton\022\014\n\004path\030\001 \003(\005\022" +
|
||||
"\005\"_\n\024FamilyWalkIndicaiton\022\014\n\004path\030\001 \003(\005\022" +
|
||||
"\016\n\006curPos\030\002 \001(\005\022\013\n\003uid\030\003 \001(\005\022\014\n\004name\030\004 \001",
|
||||
"(\t\"\210\001\n\013FamilyApply\022\014\n\004name\030\001 \001(\t\022\017\n\007role" +
|
||||
"Uid\030\002 \001(\005\022\014\n\004time\030\003 \001(\005\022\r\n\005frame\030\004 \001(\005\022\017" +
|
||||
"\n\007outTime\030\005 \001(\005\022\r\n\005level\030\006 \001(\005\022\017\n\007forece" +
|
||||
"s\030\007 \001(\005\022\014\n\004head\030\010 \001(\005\"l\n\020FamilyNoticeInf" +
|
||||
"o\022\023\n\013guildNotice\030\001 \002(\t\022\022\n\nupdateTime\030\002 \002" +
|
||||
"(\005\022\r\n\005steps\030\003 \003(\005\022\020\n\010adminres\030\004 \003(\005\022\016\n\006h" +
|
||||
"asNew\030\005 \002(\005\"i\n\022FamilyRecomandInfo\022B\n\016fam" +
|
||||
"ilyBaseInfo\030\001 \001(\0132*.com.ljsd.jieling.pro" +
|
||||
"tocols.FamilyBaseInfo\022\017\n\007isApply\030\002 \001(\005\"U" +
|
||||
"\n\020FamilyDefendInfo\022\013\n\003uid\030\001 \001(\005\022\021\n\tstarC",
|
||||
"ount\030\002 \001(\005\022\017\n\007buildId\030\003 \001(\005\022\020\n\010curForce\030" +
|
||||
"\004 \001(\005\"6\n\023FamilyBuildBuffInfo\022\017\n\007buildId\030" +
|
||||
"\001 \001(\005\022\016\n\006buffId\030\002 \003(\005\"y\n\025FamilyFightPlay" +
|
||||
"erInfo\022<\n\010userInfo\030\001 \001(\0132*.com.ljsd.jiel" +
|
||||
"ing.protocols.FamilyUserInfo\022\021\n\tstarCoun" +
|
||||
"t\030\002 \001(\005\022\017\n\007buildId\030\003 \001(\005\"\243\001\n\017FamilyFight" +
|
||||
"Info\022\013\n\003gid\030\001 \001(\005\022B\n\tbuildBuff\030\002 \003(\0132/.c" +
|
||||
"om.ljsd.jieling.protocols.FamilyBuildBuf" +
|
||||
"fInfo\022?\n\004user\030\003 \003(\01321.com.ljsd.jieling.p" +
|
||||
"rotocols.FamilyFightPlayerInfo\"\357\001\n\025GetFa",
|
||||
"milyInfoResponse\022B\n\016familyBaseInfo\030\001 \001(\013" +
|
||||
"2*.com.ljsd.jieling.protocols.FamilyBase" +
|
||||
"Info\022B\n\016familyUserInfo\030\002 \001(\0132*.com.ljsd." +
|
||||
"jieling.protocols.FamilyUserInfo\022N\n\024fami" +
|
||||
"lyWalkIndicaiton\030\003 \003(\01320.com.ljsd.jielin" +
|
||||
"g.protocols.FamilyWalkIndicaiton\"5\n\023Fami" +
|
||||
"lyCreateReqeust\022\014\n\004name\030\001 \001(\t\022\020\n\010announc" +
|
||||
"e\030\002 \001(\t\"\356\001\n\024FamilyCreateResponse\022B\n\016fami" +
|
||||
"(\t\022\016\n\006gender\030\005 \001(\005\"\210\001\n\013FamilyApply\022\014\n\004na" +
|
||||
"me\030\001 \001(\t\022\017\n\007roleUid\030\002 \001(\005\022\014\n\004time\030\003 \001(\005\022" +
|
||||
"\r\n\005frame\030\004 \001(\005\022\017\n\007outTime\030\005 \001(\005\022\r\n\005level" +
|
||||
"\030\006 \001(\005\022\017\n\007foreces\030\007 \001(\005\022\014\n\004head\030\010 \001(\005\"l\n" +
|
||||
"\020FamilyNoticeInfo\022\023\n\013guildNotice\030\001 \002(\t\022\022" +
|
||||
"\n\nupdateTime\030\002 \002(\005\022\r\n\005steps\030\003 \003(\005\022\020\n\010adm" +
|
||||
"inres\030\004 \003(\005\022\016\n\006hasNew\030\005 \002(\005\"i\n\022FamilyRec" +
|
||||
"omandInfo\022B\n\016familyBaseInfo\030\001 \001(\0132*.com." +
|
||||
"ljsd.jieling.protocols.FamilyBaseInfo\022\017\n" +
|
||||
"\007isApply\030\002 \001(\005\"U\n\020FamilyDefendInfo\022\013\n\003ui",
|
||||
"d\030\001 \001(\005\022\021\n\tstarCount\030\002 \001(\005\022\017\n\007buildId\030\003 " +
|
||||
"\001(\005\022\020\n\010curForce\030\004 \001(\005\"6\n\023FamilyBuildBuff" +
|
||||
"Info\022\017\n\007buildId\030\001 \001(\005\022\016\n\006buffId\030\002 \003(\005\"y\n" +
|
||||
"\025FamilyFightPlayerInfo\022<\n\010userInfo\030\001 \001(\013" +
|
||||
"2*.com.ljsd.jieling.protocols.FamilyUser" +
|
||||
"Info\022\021\n\tstarCount\030\002 \001(\005\022\017\n\007buildId\030\003 \001(\005" +
|
||||
"\"\243\001\n\017FamilyFightInfo\022\013\n\003gid\030\001 \001(\005\022B\n\tbui" +
|
||||
"ldBuff\030\002 \003(\0132/.com.ljsd.jieling.protocol" +
|
||||
"s.FamilyBuildBuffInfo\022?\n\004user\030\003 \003(\01321.co" +
|
||||
"m.ljsd.jieling.protocols.FamilyFightPlay",
|
||||
"erInfo\"\357\001\n\025GetFamilyInfoResponse\022B\n\016fami" +
|
||||
"lyBaseInfo\030\001 \001(\0132*.com.ljsd.jieling.prot" +
|
||||
"ocols.FamilyBaseInfo\022B\n\016familyUserInfo\030\002",
|
||||
"ocols.FamilyBaseInfo\022B\n\016familyUserInfo\030\002" +
|
||||
" \001(\0132*.com.ljsd.jieling.protocols.Family" +
|
||||
"UserInfo\022N\n\024familyWalkIndicaiton\030\003 \001(\01320" +
|
||||
"UserInfo\022N\n\024familyWalkIndicaiton\030\003 \003(\01320" +
|
||||
".com.ljsd.jieling.protocols.FamilyWalkIn" +
|
||||
"dicaiton\"#\n\023FamilySearchReqeust\022\014\n\004name\030" +
|
||||
"\001 \001(\t\"a\n\023FamilySeachResponse\022J\n\022familyRe" +
|
||||
"comandInfo\030\001 \003(\0132..com.ljsd.jieling.prot" +
|
||||
"ocols.FamilyRecomandInfo\"&\n\022FamilyApplyR" +
|
||||
"equest\022\020\n\010familyId\030\001 \003(\005\"\235\001\n\023FamilyJoinI" +
|
||||
"ndicaion\022B\n\016familyBaseInfo\030\001 \001(\0132*.com.l" +
|
||||
"dicaiton\"5\n\023FamilyCreateReqeust\022\014\n\004name\030" +
|
||||
"\001 \001(\t\022\020\n\010announce\030\002 \001(\t\"\356\001\n\024FamilyCreate" +
|
||||
"Response\022B\n\016familyBaseInfo\030\001 \001(\0132*.com.l" +
|
||||
"jsd.jieling.protocols.FamilyBaseInfo\022B\n\016",
|
||||
"familyUserInfo\030\002 \001(\0132*.com.ljsd.jieling." +
|
||||
"protocols.FamilyUserInfo\"%\n\021FamilyJoinRe" +
|
||||
"quest\022\020\n\010familyId\030\001 \001(\005\"b\n\022FamilyJoinRes" +
|
||||
"ponse\022L\n\023familyJoinIndicaion\030\001 \001(\0132/.com" +
|
||||
".ljsd.jieling.protocols.FamilyJoinIndica" +
|
||||
"ion\"e\n\027FamilyRecommandResponse\022J\n\022family" +
|
||||
"RecomandInfo\030\001 \003(\0132..com.ljsd.jieling.pr" +
|
||||
"otocols.FamilyRecomandInfo\"a\n\033GetFamilyM" +
|
||||
"emberInfoResponse\022B\n\016familyUserInfo\030\001 \003(" +
|
||||
"\0132*.com.ljsd.jieling.protocols.FamilyUse",
|
||||
"rInfo\"X\n\024GetFamilyLogResponse\022@\n\rfamilyL" +
|
||||
"ogInfo\030\001 \003(\0132).com.ljsd.jieling.protocol" +
|
||||
"s.FamilyLogInfo\"V\n\026GetFamilyApplyRespons" +
|
||||
"e\022<\n\013familyApply\030\001 \003(\0132\'.com.ljsd.jielin" +
|
||||
"g.protocols.FamilyApply\"<\n\033FamilyOperati" +
|
||||
"onApplyRequest\022\014\n\004type\030\001 \001(\005\022\017\n\007applyId\030" +
|
||||
"\002 \001(\005\")\n\024FamilyKickOutRequest\022\021\n\ttargetU" +
|
||||
"id\030\001 \001(\005\"?\n\030FamilyAppointmentReqeust\022\021\n\t" +
|
||||
"targetUid\030\001 \001(\005\022\020\n\010position\030\002 \001(\005\"?\n\036Fam" +
|
||||
"ilyPositionUpdateIndication\022\020\n\010position\030",
|
||||
"\001 \001(\005\022\013\n\003uid\030\002 \001(\005\"4\n\023FamilyChangeReques" +
|
||||
"t\022\014\n\004type\030\001 \001(\005\022\017\n\007content\030\002 \001(\t\"3\n\024Fami" +
|
||||
"lyChangeResponse\022\016\n\006result\030\001 \001(\005\022\013\n\003err\030" +
|
||||
"\002 \001(\t\">\n\033FamilyChangeJoinTypeRequest\022\014\n\004" +
|
||||
"type\030\001 \001(\005\022\021\n\tintoLevel\030\002 \001(\005\"\\\n\026FamilyC" +
|
||||
"hangeIndication\022B\n\016familyBaseInfo\030\001 \001(\0132" +
|
||||
"*.com.ljsd.jieling.protocols.FamilyBaseI" +
|
||||
"nfo\"0\n\033FamilyChairmanChangeRequest\022\021\n\tta" +
|
||||
"rgetUid\030\001 \001(\005\"(\n\030FamilyDissolutionReques" +
|
||||
"t\022\014\n\004type\030\001 \001(\005\"V\n\030FamilyDefendViewRespo",
|
||||
"nse\022:\n\004info\030\001 \003(\0132,.com.ljsd.jieling.pro" +
|
||||
"tocols.FamilyDefendInfo\">\n\035FamilyDefendD" +
|
||||
"etailViewRequest\022\020\n\010playerId\030\001 \001(\005\022\013\n\003gi" +
|
||||
"d\030\002 \001(\005\"_\n\036FamilyDefendDetailViewRespons" +
|
||||
"e\022=\n\010teamInfo\030\001 \001(\0132+.com.ljsd.jieling.p" +
|
||||
"rotocols.TeamOneTeamInfo\"8\n\030FamilyQuickD" +
|
||||
"efendRequest\022\017\n\007buildId\030\001 \001(\005\022\013\n\003uid\030\002 \001" +
|
||||
"(\005\"!\n\021FamilyWalkRequest\022\014\n\004path\030\001 \003(\005\"T\n" +
|
||||
"\027FamilyFightInfoResponse\0229\n\004info\030\001 \003(\0132+" +
|
||||
".com.ljsd.jieling.protocols.FamilyFightI",
|
||||
"nfo\"q\n\013EnemyFamily\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002" +
|
||||
" \001(\t\022\r\n\005level\030\003 \001(\005\022\021\n\tpictureId\030\004 \001(\005\022\021" +
|
||||
"\n\ttotalStar\030\005 \001(\005\022\023\n\013myTotalStar\030\006 \001(\005\"\310" +
|
||||
"\001\n\030FamilyFightRoundResponse\022\014\n\004type\030\001 \001(" +
|
||||
"\005\022\021\n\tstartTime\030\002 \001(\005\022\026\n\016roundStartTime\030\003" +
|
||||
" \001(\005\022\024\n\014roundEndTime\030\004 \001(\005\022\020\n\010joinType\030\005" +
|
||||
" \001(\005\0226\n\005enemy\030\006 \001(\0132\'.com.ljsd.jieling.p" +
|
||||
"rotocols.EnemyFamily\022\023\n\013attackCount\030\007 \001(" +
|
||||
"\005\":\n\030FamilyFightAttackRequest\022\021\n\tattackU" +
|
||||
"id\030\001 \001(\005\022\013\n\003gid\030\002 \001(\005\"s\n\031FamilyFightAtta",
|
||||
"ckResponse\022\016\n\006result\030\001 \001(\005\022\021\n\tstarCount\030" +
|
||||
"\002 \001(\005\0223\n\004data\030\003 \001(\0132%.com.ljsd.jieling.p" +
|
||||
"rotocols.FightData\"\231\001\n\023PersonalFightResu" +
|
||||
"lt\022\014\n\004rank\030\001 \001(\005\022\013\n\003uid\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\020\n\010" +
|
||||
"position\030\006 \001(\005\022\023\n\013attackCount\030\007 \001(\005\022\021\n\ts" +
|
||||
"tarCount\030\010 \001(\005\"*\n\032PersonalFightResultReq" +
|
||||
"uest\022\014\n\004type\030\001 \001(\005\"^\n\033PersonalFightResul" +
|
||||
"tResponse\022?\n\006result\030\001 \003(\0132/.com.ljsd.jie" +
|
||||
"ling.protocols.PersonalFightResult\"j\n\030Gu",
|
||||
"ildFightResultResponse\022\016\n\006getExp\030\001 \001(\005\022\014" +
|
||||
"\n\004star\030\002 \003(\005\022\021\n\textraStar\030\003 \003(\005\022\r\n\005level" +
|
||||
"\030\004 \001(\005\022\016\n\006curExp\030\005 \001(\005\"3\n\016DefeatResponse" +
|
||||
"\022\013\n\003uid\030\001 \001(\005\022\024\n\014teamLostStar\030\002 \001(\005\"#\n\021C" +
|
||||
"hangeIconRequest\022\016\n\006iconId\030\001 \001(\005\"V\n\032GetA" +
|
||||
"ttackHeroBloodResponse\0228\n\005blood\030\001 \003(\0132)." +
|
||||
"com.ljsd.jieling.protocols.HeroBloodInfo" +
|
||||
"\" \n\020RefuseJoinFamily\022\014\n\004name\030\001 \001(\t\" \n\021Ki" +
|
||||
"ckOutIndication\022\013\n\003uid\030\001 \001(\005B\002H\001"
|
||||
"protocols.FamilyUserInfo\022N\n\024familyWalkIn" +
|
||||
"dicaiton\030\003 \001(\01320.com.ljsd.jieling.protoc" +
|
||||
"ols.FamilyWalkIndicaiton\"#\n\023FamilySearch" +
|
||||
"Reqeust\022\014\n\004name\030\001 \001(\t\"a\n\023FamilySeachResp" +
|
||||
"onse\022J\n\022familyRecomandInfo\030\001 \003(\0132..com.l" +
|
||||
"jsd.jieling.protocols.FamilyRecomandInfo" +
|
||||
"\"&\n\022FamilyApplyRequest\022\020\n\010familyId\030\001 \003(\005" +
|
||||
"\"\235\001\n\023FamilyJoinIndicaion\022B\n\016familyBaseIn" +
|
||||
"fo\030\001 \001(\0132*.com.ljsd.jieling.protocols.Fa",
|
||||
"milyBaseInfo\022B\n\016familyUserInfo\030\002 \001(\0132*.c" +
|
||||
"om.ljsd.jieling.protocols.FamilyUserInfo" +
|
||||
"\"%\n\021FamilyJoinRequest\022\020\n\010familyId\030\001 \001(\005\"" +
|
||||
"b\n\022FamilyJoinResponse\022L\n\023familyJoinIndic" +
|
||||
"aion\030\001 \001(\0132/.com.ljsd.jieling.protocols." +
|
||||
"FamilyJoinIndicaion\"e\n\027FamilyRecommandRe" +
|
||||
"sponse\022J\n\022familyRecomandInfo\030\001 \003(\0132..com" +
|
||||
".ljsd.jieling.protocols.FamilyRecomandIn" +
|
||||
"fo\"a\n\033GetFamilyMemberInfoResponse\022B\n\016fam" +
|
||||
"ilyUserInfo\030\001 \003(\0132*.com.ljsd.jieling.pro",
|
||||
"tocols.FamilyUserInfo\"X\n\024GetFamilyLogRes" +
|
||||
"ponse\022@\n\rfamilyLogInfo\030\001 \003(\0132).com.ljsd." +
|
||||
"jieling.protocols.FamilyLogInfo\"V\n\026GetFa" +
|
||||
"milyApplyResponse\022<\n\013familyApply\030\001 \003(\0132\'" +
|
||||
".com.ljsd.jieling.protocols.FamilyApply\"" +
|
||||
"<\n\033FamilyOperationApplyRequest\022\014\n\004type\030\001" +
|
||||
" \001(\005\022\017\n\007applyId\030\002 \001(\005\")\n\024FamilyKickOutRe" +
|
||||
"quest\022\021\n\ttargetUid\030\001 \001(\005\"?\n\030FamilyAppoin" +
|
||||
"tmentReqeust\022\021\n\ttargetUid\030\001 \001(\005\022\020\n\010posit" +
|
||||
"ion\030\002 \001(\005\"?\n\036FamilyPositionUpdateIndicat",
|
||||
"ion\022\020\n\010position\030\001 \001(\005\022\013\n\003uid\030\002 \001(\005\"4\n\023Fa" +
|
||||
"milyChangeRequest\022\014\n\004type\030\001 \001(\005\022\017\n\007conte" +
|
||||
"nt\030\002 \001(\t\"3\n\024FamilyChangeResponse\022\016\n\006resu" +
|
||||
"lt\030\001 \001(\005\022\013\n\003err\030\002 \001(\t\">\n\033FamilyChangeJoi" +
|
||||
"nTypeRequest\022\014\n\004type\030\001 \001(\005\022\021\n\tintoLevel\030" +
|
||||
"\002 \001(\005\"\\\n\026FamilyChangeIndication\022B\n\016famil" +
|
||||
"yBaseInfo\030\001 \001(\0132*.com.ljsd.jieling.proto" +
|
||||
"cols.FamilyBaseInfo\"0\n\033FamilyChairmanCha" +
|
||||
"ngeRequest\022\021\n\ttargetUid\030\001 \001(\005\"(\n\030FamilyD" +
|
||||
"issolutionRequest\022\014\n\004type\030\001 \001(\005\"V\n\030Famil",
|
||||
"yDefendViewResponse\022:\n\004info\030\001 \003(\0132,.com." +
|
||||
"ljsd.jieling.protocols.FamilyDefendInfo\"" +
|
||||
">\n\035FamilyDefendDetailViewRequest\022\020\n\010play" +
|
||||
"erId\030\001 \001(\005\022\013\n\003gid\030\002 \001(\005\"_\n\036FamilyDefendD" +
|
||||
"etailViewResponse\022=\n\010teamInfo\030\001 \001(\0132+.co" +
|
||||
"m.ljsd.jieling.protocols.TeamOneTeamInfo" +
|
||||
"\"8\n\030FamilyQuickDefendRequest\022\017\n\007buildId\030" +
|
||||
"\001 \001(\005\022\013\n\003uid\030\002 \001(\005\"!\n\021FamilyWalkRequest\022" +
|
||||
"\014\n\004path\030\001 \003(\005\"T\n\027FamilyFightInfoResponse" +
|
||||
"\0229\n\004info\030\001 \003(\0132+.com.ljsd.jieling.protoc",
|
||||
"ols.FamilyFightInfo\"q\n\013EnemyFamily\022\n\n\002id" +
|
||||
"\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\r\n\005level\030\003 \001(\005\022\021\n\tp" +
|
||||
"ictureId\030\004 \001(\005\022\021\n\ttotalStar\030\005 \001(\005\022\023\n\013myT" +
|
||||
"otalStar\030\006 \001(\005\"\310\001\n\030FamilyFightRoundRespo" +
|
||||
"nse\022\014\n\004type\030\001 \001(\005\022\021\n\tstartTime\030\002 \001(\005\022\026\n\016" +
|
||||
"roundStartTime\030\003 \001(\005\022\024\n\014roundEndTime\030\004 \001" +
|
||||
"(\005\022\020\n\010joinType\030\005 \001(\005\0226\n\005enemy\030\006 \001(\0132\'.co" +
|
||||
"m.ljsd.jieling.protocols.EnemyFamily\022\023\n\013" +
|
||||
"attackCount\030\007 \001(\005\":\n\030FamilyFightAttackRe" +
|
||||
"quest\022\021\n\tattackUid\030\001 \001(\005\022\013\n\003gid\030\002 \001(\005\"s\n",
|
||||
"\031FamilyFightAttackResponse\022\016\n\006result\030\001 \001" +
|
||||
"(\005\022\021\n\tstarCount\030\002 \001(\005\0223\n\004data\030\003 \001(\0132%.co" +
|
||||
"m.ljsd.jieling.protocols.FightData\"\231\001\n\023P" +
|
||||
"ersonalFightResult\022\014\n\004rank\030\001 \001(\005\022\013\n\003uid\030" +
|
||||
"\002 \001(\005\022\014\n\004name\030\003 \001(\t\022\014\n\004head\030\004 \001(\005\022\021\n\thea" +
|
||||
"dFrame\030\005 \001(\005\022\020\n\010position\030\006 \001(\005\022\023\n\013attack" +
|
||||
"Count\030\007 \001(\005\022\021\n\tstarCount\030\010 \001(\005\"*\n\032Person" +
|
||||
"alFightResultRequest\022\014\n\004type\030\001 \001(\005\"^\n\033Pe" +
|
||||
"rsonalFightResultResponse\022?\n\006result\030\001 \003(" +
|
||||
"\0132/.com.ljsd.jieling.protocols.PersonalF",
|
||||
"ightResult\"j\n\030GuildFightResultResponse\022\016" +
|
||||
"\n\006getExp\030\001 \001(\005\022\014\n\004star\030\002 \003(\005\022\021\n\textraSta" +
|
||||
"r\030\003 \003(\005\022\r\n\005level\030\004 \001(\005\022\016\n\006curExp\030\005 \001(\005\"3" +
|
||||
"\n\016DefeatResponse\022\013\n\003uid\030\001 \001(\005\022\024\n\014teamLos" +
|
||||
"tStar\030\002 \001(\005\"#\n\021ChangeIconRequest\022\016\n\006icon" +
|
||||
"Id\030\001 \001(\005\"V\n\032GetAttackHeroBloodResponse\0228" +
|
||||
"\n\005blood\030\001 \003(\0132).com.ljsd.jieling.protoco" +
|
||||
"ls.HeroBloodInfo\" \n\020RefuseJoinFamily\022\014\n\004" +
|
||||
"name\030\001 \001(\t\" \n\021KickOutIndication\022\013\n\003uid\030\001" +
|
||||
" \001(\005B\002H\001"
|
||||
};
|
||||
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
|
||||
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
|
||||
|
@ -36648,7 +36762,7 @@ public final class Family {
|
|||
internal_static_com_ljsd_jieling_protocols_FamilyWalkIndicaiton_fieldAccessorTable = new
|
||||
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
|
||||
internal_static_com_ljsd_jieling_protocols_FamilyWalkIndicaiton_descriptor,
|
||||
new java.lang.String[] { "Path", "CurPos", "Uid", "Name", });
|
||||
new java.lang.String[] { "Path", "CurPos", "Uid", "Name", "Gender", });
|
||||
internal_static_com_ljsd_jieling_protocols_FamilyApply_descriptor =
|
||||
getDescriptor().getMessageTypes().get(3);
|
||||
internal_static_com_ljsd_jieling_protocols_FamilyApply_fieldAccessorTable = new
|
||||
|
|
|
@ -243,7 +243,8 @@ public class GMRequestHandler extends BaseHandler{
|
|||
VipMissionIdsType vipMissionIdsType = cUser.getUserMissionManager().getVipMissionIdsType();
|
||||
vipMissionIdsType.getFinishMissionIds().clear();
|
||||
vipMissionIdsType.getDoingMissionIds().clear();
|
||||
cUser.getPlayerInfoManager().updateVipInfo(cUser,prarm1);
|
||||
cUser.getPlayerInfoManager().setVipLevel(prarm1);
|
||||
cUser.getPlayerInfoManager().updateVipInfo(GlobalsDef.VIP_UNLOCK_PRIVILEGE,prarm1);
|
||||
vipMissionIdsType.getFinishMissionIds().addAll(vipMissionIdsType.getDoingMissionIds());
|
||||
vipMissionIdsType.getDoingMissionIds().clear();
|
||||
cUser.getUserMissionManager().setVipMissionIdsType(vipMissionIdsType);
|
||||
|
|
|
@ -8,10 +8,7 @@ import com.ljsd.jieling.handler.map.MapLogic;
|
|||
import com.ljsd.jieling.handler.map.MapManager;
|
||||
import com.ljsd.jieling.logic.GlobalDataManaager;
|
||||
import com.ljsd.jieling.logic.activity.ActivityLogic;
|
||||
import com.ljsd.jieling.logic.dao.PlayerManager;
|
||||
import com.ljsd.jieling.logic.dao.RechargeInfo;
|
||||
import com.ljsd.jieling.logic.dao.ServerConfig;
|
||||
import com.ljsd.jieling.logic.dao.UserManager;
|
||||
import com.ljsd.jieling.logic.dao.*;
|
||||
import com.ljsd.jieling.logic.dao.root.GlobalSystemControl;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import com.ljsd.jieling.logic.player.PlayerLogic;
|
||||
|
@ -70,7 +67,7 @@ public class GetPlayerInfoHandler extends BaseHandler{
|
|||
GlobalDataManaager.checkNeedReFlush(iSession,user,null);
|
||||
playerInfoManager.setLoginTime(TimeUtils.now());
|
||||
Map<Integer, Integer> guidePoints = playerInfoManager.getGuidePoints();
|
||||
Map<Integer, Integer> vipInfo = playerInfoManager.getVipInfo();
|
||||
Map<Integer, VipInfo> vipInfo = playerInfoManager.getVipInfo();
|
||||
List<CommonProto.NewPlayerGuidePoint> list = new ArrayList<>();
|
||||
List<CommonProto.Privilege> privilegeList = new ArrayList<>();
|
||||
for(Map.Entry<Integer,Integer> guideItem : guidePoints.entrySet()){
|
||||
|
@ -79,10 +76,11 @@ public class GetPlayerInfoHandler extends BaseHandler{
|
|||
. setId(guideItem.getValue())
|
||||
.build());
|
||||
}
|
||||
for(Map.Entry<Integer,Integer> vipInfoItem : vipInfo.entrySet()){
|
||||
for(Map.Entry<Integer,VipInfo> vipInfoItem : vipInfo.entrySet()){
|
||||
privilegeList.add(CommonProto.Privilege.newBuilder()
|
||||
.setId(vipInfoItem.getKey())
|
||||
. setUsedTimes(vipInfoItem.getValue())
|
||||
. setUsedTimes(vipInfoItem.getValue().getCount())
|
||||
.setEffectTime(vipInfoItem.getValue().getEffectTime())
|
||||
.build());
|
||||
}
|
||||
MapManager mapManager = user.getMapManager();
|
||||
|
|
|
@ -2,6 +2,7 @@ package com.ljsd.jieling.kefu;
|
|||
|
||||
|
||||
import com.ljsd.jieling.db.mongo.MongoUtil;
|
||||
import com.ljsd.jieling.logic.dao.VipInfo;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import config.SStoreConfig;
|
||||
|
||||
|
@ -41,8 +42,8 @@ public class Cmd_fix_store extends GmAbstract {
|
|||
for (User user :userList){
|
||||
process++;
|
||||
try {
|
||||
for (Map.Entry<Integer, Integer> en:user.getPlayerInfoManager().getVipInfo().entrySet()){
|
||||
if(en.getValue()!=0){
|
||||
for (Map.Entry<Integer, VipInfo> en:user.getPlayerInfoManager().getVipInfo().entrySet()){
|
||||
if(en.getValue().getCount()!=0){
|
||||
Integer itemId = vip2itemid.get(en.getKey());
|
||||
if(itemId == null ){
|
||||
continue;
|
||||
|
@ -50,7 +51,7 @@ public class Cmd_fix_store extends GmAbstract {
|
|||
int storeid = SStoreConfig.getSstoreConfigMap().get(itemId).getStoreId();
|
||||
Map<Integer, Integer> itemNumMap = user.getStoreManager().getStoreInfoMap().get(storeid).getItemNumMap();
|
||||
if(itemNumMap.containsKey(itemId)){
|
||||
itemNumMap.put(itemId,en.getValue());
|
||||
itemNumMap.put(itemId,en.getValue().getCount());
|
||||
}
|
||||
user.getStoreManager().getStoreInfoMap().get(storeid).setItemNumMap(itemNumMap);
|
||||
}
|
||||
|
|
|
@ -49,12 +49,15 @@ public interface ActivityType {
|
|||
|
||||
int NEW_WELFARE = 42;//萌新福利
|
||||
int LIMIT_RANDOM_CARD = 43;//限时抽卡
|
||||
|
||||
|
||||
int MISSIONSEARCH_EXPERT = 46;//寻宝达人
|
||||
int LUCKWHEEL_EXPERT = 47;//探宝达人
|
||||
int HERORANDOM_EXPERT = 48;//征募达人
|
||||
int SECURTBOX_EXPERT = 49;//秘宝达人
|
||||
|
||||
int LIMIT_UP_CARD = 50;//指定英雄进行升星
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -38,10 +38,12 @@ public enum ActivityTypeEnum {
|
|||
LUCK_WHEEL_ADVANCE(ActivityType.LUCK_WHEEL_ADVANCE, LuckWheelAdvancedActivity::new),
|
||||
NEW_WELFARE(ActivityType.NEW_WELFARE, NewWelfareActivity::new),
|
||||
LIMIT_RANDOM_CARD(ActivityType.LIMIT_RANDOM_CARD,LimitRandomCardActivity::new),
|
||||
LIMIT_UP_CARD(ActivityType.LIMIT_UP_CARD,LimitUpCardActivity::new),
|
||||
MISSIONSEARCH_EXPERT(ActivityType.MISSIONSEARCH_EXPERT,MissSearchExpectRankActivity::new),
|
||||
LUCKWHEEL_EXPERT(ActivityType.LUCKWHEEL_EXPERT,LuckWheelExpectRankActivity::new),
|
||||
HERORANDOM_EXPERT(ActivityType.HERORANDOM_EXPERT,HeroRandomExpectRankActivity::new),
|
||||
SECURTBOX_EXPERT(ActivityType.SECURTBOX_EXPERT,SecurtBoxExpectRankActivity::new),
|
||||
|
||||
;
|
||||
private int type;
|
||||
private Function<Integer, AbstractActivity> toActivityFunction;
|
||||
|
|
|
@ -2,6 +2,7 @@ package com.ljsd.jieling.logic.activity;
|
|||
|
||||
|
||||
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.globals.BIReason;
|
||||
import com.ljsd.jieling.logic.activity.event.FightMainEvent;
|
||||
import com.ljsd.jieling.logic.activity.event.IEvent;
|
||||
|
@ -35,6 +36,8 @@ public class FightMainEventHandler implements IEventHandler{
|
|||
|
||||
int uid = fightMainEvent.getUid();
|
||||
User user = UserManager.getUser(uid);
|
||||
//检测更新vip是否有新开
|
||||
user.getPlayerInfoManager().updateVipInfo(GlobalsDef.MAIN_LEVEL_UNLOCK_PRIVILEGE,10_000_000 * (fightId % 10) + fightId);
|
||||
for(SGlobalActivity sGlobalActivity : SGlobalActivity.getsGlobalActivityMap().values()){
|
||||
int[] openRules = sGlobalActivity.getOpenRules();
|
||||
if(openRules!=null && openRules.length>0 && openRules[0] == 1){
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package com.ljsd.jieling.logic.activity;
|
||||
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.db.redis.RedisKey;
|
||||
import com.ljsd.jieling.db.redis.RedisUtil;
|
||||
import com.ljsd.jieling.logic.activity.event.IEvent;
|
||||
|
@ -15,6 +16,7 @@ import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank;
|
|||
import com.ljsd.jieling.network.session.ISession;
|
||||
import config.SActivityRewardConfig;
|
||||
import config.SCHero;
|
||||
import config.SSpecialConfig;
|
||||
import util.TimeUtils;
|
||||
|
||||
import java.util.function.Consumer;
|
||||
|
@ -55,6 +57,7 @@ public class LimitRandomCardActivity extends AbstractActivity {
|
|||
Consumer<int[]> consumer = a->RankContext.getRankEnum(RankEnum.RANDOM_CARD_PERFECT_RANK.getType()).addRank(cardEvent.getUid(), TimeUtils.now()/1000,a[0]);
|
||||
Stream.of(cardEvent.getHeros()).filter(pre).forEach(consumer);
|
||||
update(UserManager.getUser(cardEvent.getUid()),cardEvent.getScore());
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -64,6 +67,11 @@ public class LimitRandomCardActivity extends AbstractActivity {
|
|||
|
||||
@Override
|
||||
void updateProgressWithUser(User user, ActivityMission activityMission, int count) {
|
||||
//150分赠一次
|
||||
int[] onceArrayValue = SSpecialConfig.getOnceArrayValue(SSpecialConfig.TIME_LIMIT_RECRUITMENT_FREEINTEGRAL);
|
||||
if((activityMission.getValue()+count)/onceArrayValue[0]-activityMission.getValue()/onceArrayValue[0]>0){
|
||||
user.getPlayerInfoManager().updateVipPrivilage(onceArrayValue[1],-1);
|
||||
}
|
||||
activityMission.setValue(activityMission.getValue()+count);
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,58 @@
|
|||
package com.ljsd.jieling.logic.activity;
|
||||
|
||||
import com.ljsd.jieling.db.redis.RedisKey;
|
||||
import com.ljsd.jieling.db.redis.RedisUtil;
|
||||
import com.ljsd.jieling.logic.OnlineUserManager;
|
||||
import com.ljsd.jieling.logic.activity.event.HeroUpStarEvent;
|
||||
import com.ljsd.jieling.logic.activity.event.IEvent;
|
||||
import com.ljsd.jieling.logic.activity.event.Poster;
|
||||
import com.ljsd.jieling.logic.activity.event.RandomCardEvent;
|
||||
import com.ljsd.jieling.logic.dao.ActivityMission;
|
||||
import com.ljsd.jieling.logic.dao.ActivityProgressInfo;
|
||||
import com.ljsd.jieling.logic.dao.UserManager;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import com.ljsd.jieling.network.session.ISession;
|
||||
import config.SActivityRewardConfig;
|
||||
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public class LimitUpCardActivity extends AbstractActivity {
|
||||
public LimitUpCardActivity(int id) {
|
||||
super(id);
|
||||
Poster.getPoster().listenEvent(this, HeroUpStarEvent.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEvent(IEvent event) throws Exception {
|
||||
if (!(event instanceof HeroUpStarEvent))
|
||||
return;
|
||||
HeroUpStarEvent heroUpStarEvent = (HeroUpStarEvent) event;
|
||||
User user = UserManager.getUser(heroUpStarEvent.getUid());
|
||||
ActivityMission activityMission = user.getActivityManager().getActivityMissionMap().get(id);
|
||||
Map<Integer, ActivityProgressInfo> activityProgressInfoMap = activityMission.getActivityProgressInfoMap();
|
||||
|
||||
for (SActivityRewardConfig sActivityRewardConfig : SActivityRewardConfig.getsActivityRewardConfigByActivityId(id)) {
|
||||
if (heroUpStarEvent.getHeroTid() == sActivityRewardConfig.getValues()[0][0] && heroUpStarEvent.getStar() == sActivityRewardConfig.getValues()[0][1]) {
|
||||
ActivityProgressInfo activityProgressInfo = activityProgressInfoMap.getOrDefault(sActivityRewardConfig.getId(), null);
|
||||
if (null == activityProgressInfo)
|
||||
continue;
|
||||
activityProgressInfo.setProgrss(activityProgressInfo.getProgrss() + 1);
|
||||
activityMission.updateProgressInfo(sActivityRewardConfig.getId(), activityProgressInfo);
|
||||
}
|
||||
}
|
||||
//更新进度
|
||||
ISession sessionByUid = OnlineUserManager.getSessionByUid(user.getId());
|
||||
sendActivityProgress(sessionByUid, activityMission, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
boolean takeRewardsProcess(ISession session, SActivityRewardConfig sActivityRewardConfig, ActivityProgressInfo activityProgressInfo) throws Exception {
|
||||
int[][] values = sActivityRewardConfig.getValues();
|
||||
int missionProgress = activityProgressInfo.getProgrss();
|
||||
if (missionProgress < values[1][0]) {
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
|
@ -1,6 +1,7 @@
|
|||
package com.ljsd.jieling.logic.activity;
|
||||
|
||||
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.globals.BIReason;
|
||||
import com.ljsd.jieling.logic.activity.event.IEvent;
|
||||
import com.ljsd.jieling.logic.activity.event.Poster;
|
||||
|
@ -13,9 +14,11 @@ import com.ljsd.jieling.util.ToolsUtil;
|
|||
import config.SGlobalActivity;
|
||||
import config.SGlobalSystemConfig;
|
||||
import config.SMainLevelConfig;
|
||||
import config.SPrivilegeTypeConfig;
|
||||
import manager.STableManager;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class UserLevelEventHandler implements IEventHandler{
|
||||
|
||||
|
@ -28,11 +31,11 @@ public class UserLevelEventHandler implements IEventHandler{
|
|||
return;
|
||||
UserLevelEvent userLevelEvent = (UserLevelEvent) event;
|
||||
int level = userLevelEvent.getLevel();
|
||||
|
||||
List<SGlobalSystemConfig> sGlobalSystemConfigs = STableManager.getFigureConfig(CommonStaticConfig.class).getsGlobalSystemConfigMapByTypeAndConditionMap().get(2).get(level);
|
||||
|
||||
int uid = userLevelEvent.getUid();
|
||||
User user = UserManager.getUser(uid);
|
||||
user.getPlayerInfoManager().updateVipInfo(GlobalsDef.LEVEL_UNLOCK_PRIVILEGE,user.getPlayerInfoManager().getLevel());
|
||||
int state = user.getMainLevelManager().getState();
|
||||
if(state == -1 ){
|
||||
int fightId = user.getMainLevelManager().getFightId();
|
||||
|
|
|
@ -7,9 +7,11 @@ public class HeroUpStarEvent implements IEvent {
|
|||
|
||||
private int uid;
|
||||
private int star;
|
||||
private int heroTid;
|
||||
|
||||
public HeroUpStarEvent(int uid, int star) {
|
||||
public HeroUpStarEvent(int uid,int heroTid, int star) {
|
||||
this.uid = uid;
|
||||
this.heroTid = heroTid;
|
||||
this.star = star;
|
||||
}
|
||||
|
||||
|
@ -20,4 +22,8 @@ public class HeroUpStarEvent implements IEvent {
|
|||
public int getUid() {
|
||||
return uid;
|
||||
}
|
||||
|
||||
public int getHeroTid() {
|
||||
return heroTid;
|
||||
}
|
||||
}
|
|
@ -314,7 +314,7 @@ public class ArenaLogic {
|
|||
if( null == enemyInfo ){
|
||||
return "对手错误";
|
||||
}
|
||||
if(skipFight == 0){
|
||||
if(skipFight == 1){
|
||||
boolean allowed = user.getPlayerInfoManager().checkFunctionIsAllowed(VipPrivilegeType.UNLOCK_SKIP_FIGHT);
|
||||
if(!allowed){
|
||||
return "not allowed";
|
||||
|
|
|
@ -2,6 +2,7 @@ package com.ljsd.jieling.logic.dao;
|
|||
|
||||
|
||||
import com.ljsd.common.mogodb.MongoBase;
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.core.VipPrivilegeType;
|
||||
import com.ljsd.jieling.globals.BIReason;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
|
@ -9,11 +10,9 @@ import com.ljsd.jieling.logic.mission.GameEvent;
|
|||
import com.ljsd.jieling.logic.player.PlayerLogic;
|
||||
import config.SPrivilegeTypeConfig;
|
||||
import config.SVipLevelConfig;
|
||||
import util.TimeUtils;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.CopyOnWriteArraySet;
|
||||
|
||||
|
||||
|
@ -63,7 +62,7 @@ public class PlayerManager extends MongoBase {
|
|||
|
||||
private Map<Integer,Integer> guidePoints = new HashMap<>();
|
||||
|
||||
private Map<Integer,Integer> vipInfo = new HashMap<>();
|
||||
private Map<Integer,VipInfo> vipInfo = new HashMap<>();
|
||||
private Set<Integer> vipGoodInfo = new HashSet<>();// 特权商品礼包
|
||||
|
||||
private Set<Integer> reds = new CopyOnWriteArraySet<>();
|
||||
|
@ -167,6 +166,11 @@ public class PlayerManager extends MongoBase {
|
|||
return vipLevel;
|
||||
}
|
||||
|
||||
public void setVipLevel(int vipLevel) {
|
||||
this.vipLevel = vipLevel;
|
||||
updateString("vipLevel",vipLevel);
|
||||
}
|
||||
|
||||
public int getHead() {
|
||||
return head;
|
||||
}
|
||||
|
@ -239,51 +243,52 @@ public class PlayerManager extends MongoBase {
|
|||
this.loginTime = loginTime;
|
||||
}
|
||||
|
||||
public Map<Integer, Integer> getVipInfo() {
|
||||
public Map<Integer, VipInfo> getVipInfo() {
|
||||
return vipInfo;
|
||||
}
|
||||
|
||||
public void updateVipInfo(User user,int vipLevel) throws Exception {
|
||||
SVipLevelConfig sVipLevelConfig = SVipLevelConfig.getsVipLevelConfigMap().get(vipLevel);
|
||||
if(sVipLevelConfig == null){
|
||||
return;
|
||||
}
|
||||
Map<Integer, Integer> vip = new HashMap<>(sVipLevelConfig.getPrivilegeMap());
|
||||
for(Integer privilageId : vip.keySet()){
|
||||
if(!vipInfo.containsKey(privilageId)){
|
||||
vipInfo.put(privilageId,0);
|
||||
public void updateVipInfo(int unlockType,int condition) {
|
||||
Map<Integer, Map<Integer, Integer>> conditionMap = SPrivilegeTypeConfig.conditionMap.get(unlockType);
|
||||
for(Map.Entry<Integer, Map<Integer, Integer>> entry:conditionMap.entrySet()){
|
||||
if(entry.getValue().containsKey(condition)){
|
||||
if(!vipInfo.containsKey(entry.getKey())) {
|
||||
vipInfo.put(entry.getKey(), new VipInfo());
|
||||
}
|
||||
}
|
||||
}
|
||||
updateString("vipInfo", vipInfo);
|
||||
updateString("vipLevel", vipLevel);
|
||||
this.vipLevel = vipLevel;
|
||||
user.getUserMissionManager().onGameEvent(user,GameEvent.VIP_LEVLUP,vipLevel);
|
||||
PlayerLogic.getInstance().sendVipDailyOrLevlUpReward(user, vipLevel, BIReason.VIP_LEVEL_REWARD);
|
||||
|
||||
}
|
||||
|
||||
public boolean check(int privilageId,int updateNum){
|
||||
if(privilageId == 0){
|
||||
return true;
|
||||
}
|
||||
SVipLevelConfig sVipLevelConfig = SVipLevelConfig.getsVipLevelConfigMap().get(vipLevel);
|
||||
if(sVipLevelConfig == null ){
|
||||
|
||||
if(!vipInfo.containsKey(privilageId)){
|
||||
return false;
|
||||
}
|
||||
Integer limitNum = sVipLevelConfig.getPrivilegeMap().get(privilageId);
|
||||
if(limitNum == null){
|
||||
VipInfo info = vipInfo.get(privilageId);
|
||||
if(info.getEffectTime()!=0&&TimeUtils.now()/1000>info.getEffectTime()){
|
||||
return false;
|
||||
}
|
||||
if(limitNum == -1){
|
||||
|
||||
SPrivilegeTypeConfig sPrivilegeTypeConfig = SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(privilageId);
|
||||
Map<Integer, Map<Integer, Integer>> conditionMap = SPrivilegeTypeConfig.conditionMap.get(sPrivilegeTypeConfig.getUnlockType());
|
||||
int maxCount = 0;
|
||||
if(sPrivilegeTypeConfig.getUnlockType()!=GlobalsDef.RECHARGE_UNLOCK_PRIVILEGE){
|
||||
TreeMap<Integer, Integer> condition = (TreeMap)conditionMap.get(privilageId);
|
||||
maxCount = condition.floorEntry(level).getValue();
|
||||
}
|
||||
if(maxCount==-1){
|
||||
return true;
|
||||
}
|
||||
if(!vipInfo.containsKey(privilageId)){
|
||||
vipInfo.put(privilageId,0);
|
||||
}
|
||||
if(vipInfo.get(privilageId) + updateNum > limitNum){
|
||||
if((info.getCount()+updateNum>maxCount)|| (info.getEffectTime()!=0&&TimeUtils.now()/1000>info.getEffectTime())){
|
||||
return false;
|
||||
}
|
||||
updateVipPrivilage(privilageId, updateNum);
|
||||
return true;
|
||||
|
||||
|
||||
}
|
||||
|
||||
public boolean checkFunctionIsAllowed(int privilageId){
|
||||
|
@ -297,14 +302,16 @@ public class PlayerManager extends MongoBase {
|
|||
if(!vipInfo.containsKey(privilageId)){
|
||||
return 0;
|
||||
}
|
||||
return vipInfo.get(privilageId);
|
||||
return vipInfo.get(privilageId).getCount();
|
||||
}
|
||||
|
||||
public void updateVipPrivilage(int privilageId,int updateNum){
|
||||
if(!vipInfo.containsKey(privilageId)){
|
||||
return;
|
||||
}
|
||||
vipInfo.put(privilageId,vipInfo.get(privilageId)+updateNum);
|
||||
VipInfo info = vipInfo.get(privilageId);
|
||||
info.setCount(info.getCount()+updateNum);
|
||||
vipInfo.put(privilageId, info);
|
||||
updateString("vipInfo", vipInfo);
|
||||
}
|
||||
|
||||
|
@ -328,6 +335,7 @@ public class PlayerManager extends MongoBase {
|
|||
vipGoodInfo.add(vipLevel);
|
||||
}
|
||||
|
||||
|
||||
public int getHadTakeDailyBoxVip() {
|
||||
return hadTakeDailyBoxVip;
|
||||
}
|
||||
|
@ -338,14 +346,17 @@ public class PlayerManager extends MongoBase {
|
|||
}
|
||||
|
||||
public void vipFlush( Set<Integer> removePrivileges) {
|
||||
if (vipInfo.isEmpty()){
|
||||
return;
|
||||
}
|
||||
for(Integer id : vipInfo.keySet()){
|
||||
SPrivilegeTypeConfig sPrivilegeTypeConfig = SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(id);
|
||||
if(null == sPrivilegeTypeConfig){
|
||||
continue;
|
||||
}
|
||||
int refreshType = sPrivilegeTypeConfig.getRefreshType()[0];
|
||||
if(refreshType == 1){
|
||||
vipInfo.put(id,0);
|
||||
if(refreshType == 1&&vipInfo.get(id).getCount()>0){
|
||||
vipInfo.put(id,new VipInfo());
|
||||
}
|
||||
}
|
||||
for(Integer remove : removePrivileges){
|
||||
|
@ -356,8 +367,18 @@ public class PlayerManager extends MongoBase {
|
|||
}
|
||||
|
||||
public void addVipInfo(int privilageId){
|
||||
vipInfo.put(privilageId,0);
|
||||
updateString("vipInfo."+privilageId, 0);
|
||||
SPrivilegeTypeConfig config = SPrivilegeTypeConfig.getsPrivilegeTypeConfigMap().get(privilageId);
|
||||
if (config==null){
|
||||
return;
|
||||
}
|
||||
int maxTime = 0;
|
||||
if(vipInfo.containsKey(privilageId)){
|
||||
maxTime = (int)(TimeUtils.now()/1000>vipInfo.get(privilageId).getEffectTime()?(TimeUtils.now()/1000):vipInfo.get(privilageId).getEffectTime());
|
||||
}else {
|
||||
maxTime = (int)(TimeUtils.now()/1000+config.getContinueTime());
|
||||
}
|
||||
vipInfo.put(privilageId,new VipInfo(0,maxTime+config.getContinueTime()));
|
||||
updateString("vipInfo", vipInfo);
|
||||
}
|
||||
|
||||
public void removeVipPriviliageId(int privilageId){
|
||||
|
|
|
@ -2,6 +2,7 @@ package com.ljsd.jieling.logic.dao;
|
|||
|
||||
|
||||
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.db.mongo.MongoUtil;
|
||||
import com.ljsd.jieling.globals.BIReason;
|
||||
import com.ljsd.jieling.ktbeans.KtEventUtils;
|
||||
|
@ -78,7 +79,8 @@ public class UserManager {
|
|||
playerManager.setCreateTime(now);
|
||||
playerManager.setLoginTime(now);
|
||||
playerManager.setSendDays(1);
|
||||
playerManager.updateVipInfo(user,0);
|
||||
playerManager.updateVipInfo(GlobalsDef.LEVEL_UNLOCK_PRIVILEGE,1);
|
||||
playerManager.updateVipInfo(GlobalsDef.VIP_UNLOCK_PRIVILEGE,0);
|
||||
playerManager.setRechargeInfo(new RechargeInfo());
|
||||
playerManager.setPhoneBindInfo(new PhoneBindInfo(""));
|
||||
playerManager.setChannel(channel);
|
||||
|
|
|
@ -0,0 +1,35 @@
|
|||
package com.ljsd.jieling.logic.dao;
|
||||
|
||||
/**
|
||||
* @author lvxinran
|
||||
* @date 2019/12/26
|
||||
* @discribe
|
||||
*/
|
||||
public class VipInfo {
|
||||
private int count;
|
||||
private int effectTime;
|
||||
|
||||
public void setCount(int count) {
|
||||
this.count = count;
|
||||
}
|
||||
|
||||
public void setEffectTime(int effectTime) {
|
||||
this.effectTime = effectTime;
|
||||
}
|
||||
|
||||
public int getCount() {
|
||||
return count;
|
||||
}
|
||||
|
||||
public int getEffectTime() {
|
||||
return effectTime;
|
||||
}
|
||||
|
||||
public VipInfo(int count, int effectTime) {
|
||||
this.count = count;
|
||||
this.effectTime = effectTime;
|
||||
}
|
||||
|
||||
public VipInfo() {
|
||||
}
|
||||
}
|
|
@ -249,9 +249,10 @@ public class HeroLogic{
|
|||
if(!enoughCost){
|
||||
throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH);
|
||||
}
|
||||
}else{
|
||||
user.getPlayerInfoManager().updateVipPrivilage(privilege, 1);
|
||||
}
|
||||
// else{
|
||||
// user.getPlayerInfoManager().updateVipPrivilage(privilege, 1);
|
||||
// }
|
||||
//额外获取
|
||||
int length = perCount;
|
||||
int[][] tenTimesMustGetItem = null;
|
||||
|
@ -796,7 +797,7 @@ public class HeroLogic{
|
|||
CommonProto.Drop.Builder baseBuilder = ItemLogic.getInstance().decomposeHero(session,new LinkedList<>(removeHeroIds),Collections.singleton(26),MessageTypeProto.MessageType.UP_HERO_STAR_RESPONSE_VALUE);
|
||||
// recyleHeroBySystem(user,removeHeroIds);
|
||||
targetHero.upStar( 1 );
|
||||
Poster.getPoster().dispatchEvent(new HeroUpStarEvent(user.getId(),targetHero.getStar()));
|
||||
Poster.getPoster().dispatchEvent(new HeroUpStarEvent(user.getId(),targetHero.getTemplateId(),targetHero.getStar()));
|
||||
if(targetHero.getStar()>=5&&targetHero.getStar()!=15){
|
||||
if(SItem.getsItemMap().get(scHero.getId()).getQuantity()>=5)
|
||||
Poster.getPoster().dispatchEvent(new HeroFiveStarGetEvent(user.getId(),targetHero.getStar()));
|
||||
|
|
|
@ -288,11 +288,12 @@ public class PlayerLogic {
|
|||
sendVipDailyOrLevlUpReward(user, vipLevel,BIReason.VIP_DAY_REWARD);
|
||||
if(fBuilder!=null){
|
||||
List<CommonProto.Privilege> privilegeList = new ArrayList<>();
|
||||
Map<Integer, Integer> vipInfo = playerInfoManager.getVipInfo();
|
||||
for(Map.Entry<Integer,Integer> vipInfoItem : vipInfo.entrySet()){
|
||||
Map<Integer, VipInfo> vipInfo = playerInfoManager.getVipInfo();
|
||||
for(Map.Entry<Integer,VipInfo> vipInfoItem : vipInfo.entrySet()){
|
||||
privilegeList.add(CommonProto.Privilege.newBuilder()
|
||||
.setId(vipInfoItem.getKey())
|
||||
. setUsedTimes(vipInfoItem.getValue())
|
||||
. setUsedTimes(vipInfoItem.getValue().getCount())
|
||||
.setEffectTime(vipInfoItem.getValue().getEffectTime())
|
||||
.build());
|
||||
}
|
||||
fBuilder.setHadTakeDailyBox(playerInfoManager.getHadTakeDailyBoxVip()).addAllPrivilege(privilegeList);
|
||||
|
@ -402,9 +403,6 @@ public class PlayerLogic {
|
|||
continue;
|
||||
}
|
||||
remainDays = TimeUtils.differentDays(nowTime * 1000L, goodsInfo.getValue()*1000L)-1;
|
||||
if(remainDays<0){
|
||||
days-=1;
|
||||
}
|
||||
}else{
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package com.ljsd.jieling.logic.store;
|
||||
|
||||
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
|
||||
import com.ljsd.jieling.core.GlobalsDef;
|
||||
import com.ljsd.jieling.db.mongo.MongoUtil;
|
||||
import com.ljsd.jieling.exception.ErrorCode;
|
||||
import com.ljsd.jieling.exception.ErrorCodeException;
|
||||
|
@ -205,7 +206,9 @@ public class BuyGoodsLogic {
|
|||
//vip 等级更新和推送
|
||||
int newLeve= SVipLevelConfig.getsVipLevel(rechargeInfo.getSaveAmt());
|
||||
if(user.getPlayerInfoManager().getVipLevel()!=newLeve){
|
||||
user.getPlayerInfoManager().updateVipInfo(user,newLeve);
|
||||
// user.getPlayerInfoManager().updateVipInfo(user,newLeve);
|
||||
user.getPlayerInfoManager().setVipLevel(newLeve);
|
||||
user.getPlayerInfoManager().updateVipInfo(GlobalsDef.VIP_UNLOCK_PRIVILEGE,newLeve);
|
||||
CombatLogic.getInstance().getNewAdventureReward(user, true);
|
||||
}
|
||||
PlayerInfoProto.RefreshRechargeIndication.Builder builder = PlayerInfoProto.RefreshRechargeIndication.newBuilder();
|
||||
|
|
|
@ -422,6 +422,9 @@ public class StoreLogic {
|
|||
int vipLeve = user.getPlayerInfoManager().getVipLevel();
|
||||
user.getPlayerInfoManager().setHadTakeLevelBoxVip(vipLeve);
|
||||
}
|
||||
if(sStoreConfig.getOpenPrivilege()!=null){
|
||||
Arrays.stream(sStoreConfig.getOpenPrivilege()).forEach(n->user.getPlayerInfoManager().addVipInfo(n));
|
||||
}
|
||||
|
||||
PlayerInfoProto.BuyStoreItemResponse builder = PlayerInfoProto.BuyStoreItemResponse.newBuilder().setDrop(drop).build();
|
||||
MessageUtil.sendMessage(iSession, 1,msgId, builder, true);
|
||||
|
|
Loading…
Reference in New Issue