root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

车轮

back_recharge
wangyuan 2020-05-07 16:31:28 +08:00
parent a871b0444a
commit a0d031e7d8
32 changed files with 13790 additions and 997 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10543
bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java
View File

File diff suppressed because it is too large Load Diff

1109
bloodybattle/src/main/java/com/ljsd/jieling/protocols/FightInfoProto.java
View File

File diff suppressed because it is too large Load Diff

1565
bloodybattle/src/main/java/com/ljsd/jieling/protocols/MessageTypeProto.java
View File

File diff suppressed because it is too large Load Diff

611
bloodybattle/src/main/java/com/ljsd/jieling/protocols/PlayerInfoProto.java
View File

@ -50038,6 +50038,50 @@ public final class PlayerInfoProto {
* </pre>
*/
int getMonthDailyTake(int index);
// optional int32 lastFeteType = 11;
/**
* <code>optional int32 lastFeteType = 11;</code>
*
* <pre>
* 上次祭祀类型 //每日清除 5点推送
* </pre>
*/
boolean hasLastFeteType();
/**
* <code>optional int32 lastFeteType = 11;</code>
*
* <pre>
* 上次祭祀类型 //每日清除 5点推送
* </pre>
*/
int getLastFeteType();
// repeated int32 takeFeteReward = 12;
/**
* <code>repeated int32 takeFeteReward = 12;</code>
*
* <pre>
* 祭祀领取进度
* </pre>
*/
java.util.List<java.lang.Integer> getTakeFeteRewardList();
/**
* <code>repeated int32 takeFeteReward = 12;</code>
*
* <pre>
* 祭祀领取进度
* </pre>
*/
int getTakeFeteRewardCount();
/**
* <code>repeated int32 takeFeteReward = 12;</code>
*
* <pre>
* 祭祀领取进度
* </pre>
*/
int getTakeFeteReward(int index);
}
/**
* Protobuf type {@code com.ljsd.jieling.protocols.FivePlayerUpdateIndication}
@ -50195,6 +50239,32 @@ public final class PlayerInfoProto {
input.popLimit(limit);
break;
}
case 88: {
bitField0_ |= 0x00000010;
lastFeteType_ = input.readInt32();
break;
}
case 96: {
if (!((mutable_bitField0_ & 0x00000800) == 0x00000800)) {
takeFeteReward_ = new java.util.ArrayList<java.lang.Integer>();
mutable_bitField0_ |= 0x00000800;
}
takeFeteReward_.add(input.readInt32());
break;
}
case 98: {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
if (!((mutable_bitField0_ & 0x00000800) == 0x00000800) && input.getBytesUntilLimit() > 0) {
takeFeteReward_ = new java.util.ArrayList<java.lang.Integer>();
mutable_bitField0_ |= 0x00000800;
}
while (input.getBytesUntilLimit() > 0) {
takeFeteReward_.add(input.readInt32());
}
input.popLimit(limit);
break;
}
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@ -50221,6 +50291,9 @@ public final class PlayerInfoProto {
if (((mutable_bitField0_ & 0x00000200) == 0x00000200)) {
monthDailyTake_ = java.util.Collections.unmodifiableList(monthDailyTake_);
}
if (((mutable_bitField0_ & 0x00000800) == 0x00000800)) {
takeFeteReward_ = java.util.Collections.unmodifiableList(takeFeteReward_);
}
this.unknownFields = unknownFields.build();
makeExtensionsImmutable();
}
@ -50694,6 +50767,65 @@ public final class PlayerInfoProto {
return monthDailyTake_.get(index);
}
// optional int32 lastFeteType = 11;
public static final int LASTFETETYPE_FIELD_NUMBER = 11;
private int lastFeteType_;
/**
* <code>optional int32 lastFeteType = 11;</code>
*
* <pre>
* 上次祭祀类型 //每日清除 5点推送
* </pre>
*/
public boolean hasLastFeteType() {
return ((bitField0_ & 0x00000010) == 0x00000010);
}
/**
* <code>optional int32 lastFeteType = 11;</code>
*
* <pre>
* 上次祭祀类型 //每日清除 5点推送
* </pre>
*/
public int getLastFeteType() {
return lastFeteType_;
}
// repeated int32 takeFeteReward = 12;
public static final int TAKEFETEREWARD_FIELD_NUMBER = 12;
private java.util.List<java.lang.Integer> takeFeteReward_;
/**
* <code>repeated int32 takeFeteReward = 12;</code>
*
* <pre>
* 祭祀领取进度
* </pre>
*/
public java.util.List<java.lang.Integer>
getTakeFeteRewardList() {
return takeFeteReward_;
}
/**
* <code>repeated int32 takeFeteReward = 12;</code>
*
* <pre>
* 祭祀领取进度
* </pre>
*/
public int getTakeFeteRewardCount() {
return takeFeteReward_.size();
}
/**
* <code>repeated int32 takeFeteReward = 12;</code>
*
* <pre>
* 祭祀领取进度
* </pre>
*/
public int getTakeFeteReward(int index) {
return takeFeteReward_.get(index);
}
private void initFields() {
hadTakeDailyBox_ = 0;
privilege_ = java.util.Collections.emptyList();
@ -50705,6 +50837,8 @@ public final class PlayerInfoProto {
posInfos_ = java.util.Collections.emptyList();
posInfosAdvance_ = java.util.Collections.emptyList();
monthDailyTake_ = java.util.Collections.emptyList();
lastFeteType_ = 0;
takeFeteReward_ = java.util.Collections.emptyList();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@ -50754,6 +50888,12 @@ public final class PlayerInfoProto {
for (int i = 0; i < monthDailyTake_.size(); i++) {
output.writeInt32(10, monthDailyTake_.get(i));
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
output.writeInt32(11, lastFeteType_);
}
for (int i = 0; i < takeFeteReward_.size(); i++) {
output.writeInt32(12, takeFeteReward_.get(i));
}
getUnknownFields().writeTo(output);
}
@ -50808,6 +50948,19 @@ public final class PlayerInfoProto {
size += dataSize;
size += 1 * getMonthDailyTakeList().size();
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream
.computeInt32Size(11, lastFeteType_);
}
{
int dataSize = 0;
for (int i = 0; i < takeFeteReward_.size(); i++) {
dataSize += com.google.protobuf.CodedOutputStream
.computeInt32SizeNoTag(takeFeteReward_.get(i));
}
size += dataSize;
size += 1 * getTakeFeteRewardList().size();
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@ -50984,6 +51137,10 @@ public final class PlayerInfoProto {
}
monthDailyTake_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000200);
lastFeteType_ = 0;
bitField0_ = (bitField0_ & ~0x00000400);
takeFeteReward_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000800);
return this;
}
@ -51090,6 +51247,15 @@ public final class PlayerInfoProto {
bitField0_ = (bitField0_ & ~0x00000200);
}
result.monthDailyTake_ = monthDailyTake_;
if (((from_bitField0_ & 0x00000400) == 0x00000400)) {
to_bitField0_ |= 0x00000010;
}
result.lastFeteType_ = lastFeteType_;
if (((bitField0_ & 0x00000800) == 0x00000800)) {
takeFeteReward_ = java.util.Collections.unmodifiableList(takeFeteReward_);
bitField0_ = (bitField0_ & ~0x00000800);
}
result.takeFeteReward_ = takeFeteReward_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@ -51258,6 +51424,19 @@ public final class PlayerInfoProto {
}
onChanged();
}
if (other.hasLastFeteType()) {
setLastFeteType(other.getLastFeteType());
}
if (!other.takeFeteReward_.isEmpty()) {
if (takeFeteReward_.isEmpty()) {
takeFeteReward_ = other.takeFeteReward_;
bitField0_ = (bitField0_ & ~0x00000800);
} else {
ensureTakeFeteRewardIsMutable();
takeFeteReward_.addAll(other.takeFeteReward_);
}
onChanged();
}
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@ -53453,6 +53632,149 @@ public final class PlayerInfoProto {
return this;
}
// optional int32 lastFeteType = 11;
private int lastFeteType_ ;
/**
* <code>optional int32 lastFeteType = 11;</code>
*
* <pre>
* 上次祭祀类型 //每日清除 5点推送
* </pre>
*/
public boolean hasLastFeteType() {
return ((bitField0_ & 0x00000400) == 0x00000400);
}
/**
* <code>optional int32 lastFeteType = 11;</code>
*
* <pre>
* 上次祭祀类型 //每日清除 5点推送
* </pre>
*/
public int getLastFeteType() {
return lastFeteType_;
}
/**
* <code>optional int32 lastFeteType = 11;</code>
*
* <pre>
* 上次祭祀类型 //每日清除 5点推送
* </pre>
*/
public Builder setLastFeteType(int value) {
bitField0_ |= 0x00000400;
lastFeteType_ = value;
onChanged();
return this;
}
/**
* <code>optional int32 lastFeteType = 11;</code>
*
* <pre>
* 上次祭祀类型 //每日清除 5点推送
* </pre>
*/
public Builder clearLastFeteType() {
bitField0_ = (bitField0_ & ~0x00000400);
lastFeteType_ = 0;
onChanged();
return this;
}
// repeated int32 takeFeteReward = 12;
private java.util.List<java.lang.Integer> takeFeteReward_ = java.util.Collections.emptyList();
private void ensureTakeFeteRewardIsMutable() {
if (!((bitField0_ & 0x00000800) == 0x00000800)) {
takeFeteReward_ = new java.util.ArrayList<java.lang.Integer>(takeFeteReward_);
bitField0_ |= 0x00000800;
}
}
/**
* <code>repeated int32 takeFeteReward = 12;</code>
*
* <pre>
* 祭祀领取进度
* </pre>
*/
public java.util.List<java.lang.Integer>
getTakeFeteRewardList() {
return java.util.Collections.unmodifiableList(takeFeteReward_);
}
/**
* <code>repeated int32 takeFeteReward = 12;</code>
*
* <pre>
* 祭祀领取进度
* </pre>
*/
public int getTakeFeteRewardCount() {
return takeFeteReward_.size();
}
/**
* <code>repeated int32 takeFeteReward = 12;</code>
*
* <pre>
* 祭祀领取进度
* </pre>
*/
public int getTakeFeteReward(int index) {
return takeFeteReward_.get(index);
}
/**
* <code>repeated int32 takeFeteReward = 12;</code>
*
* <pre>
* 祭祀领取进度
* </pre>
*/
public Builder setTakeFeteReward(
int index, int value) {
ensureTakeFeteRewardIsMutable();
takeFeteReward_.set(index, value);
onChanged();
return this;
}
/**
* <code>repeated int32 takeFeteReward = 12;</code>
*
* <pre>
* 祭祀领取进度
* </pre>
*/
public Builder addTakeFeteReward(int value) {
ensureTakeFeteRewardIsMutable();
takeFeteReward_.add(value);
onChanged();
return this;
}
/**
* <code>repeated int32 takeFeteReward = 12;</code>
*
* <pre>
* 祭祀领取进度
* </pre>
*/
public Builder addAllTakeFeteReward(
java.lang.Iterable<? extends java.lang.Integer> values) {
ensureTakeFeteRewardIsMutable();
super.addAll(values, takeFeteReward_);
onChanged();
return this;
}
/**
* <code>repeated int32 takeFeteReward = 12;</code>
*
* <pre>
* 祭祀领取进度
* </pre>
*/
public Builder clearTakeFeteReward() {
takeFeteReward_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000800);
onChanged();
return this;
}
// @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.FivePlayerUpdateIndication)
}
@ -101292,7 +101614,7 @@ public final class PlayerInfoProto {
"\004type\030\001 \001(\005\022\020\n\010friendId\030\002 \001(\005\"/\n\032Refresh" +
"FriendStateResponse\022\021\n\tfriendIds\030\001 \003(\005\"7" +
"\n\025FriendBlackOptRequest\022\014\n\004type\030\001 \001(\005\022\020\n" +
"\010blackUid\030\002 \001(\005\"\356\004\n\032FivePlayerUpdateIndi" +
"\010blackUid\030\002 \001(\005\"\234\005\n\032FivePlayerUpdateIndi" +
"cation\022\027\n\017hadTakeDailyBox\030\001 \001(\005\0228\n\tprivi",
"lege\030\002 \003(\0132%.com.ljsd.jieling.protocols." +
"Privilege\022>\n\014activityInfo\030\003 \003(\0132(.com.lj" +
@ -101308,148 +101630,149 @@ public final class PlayerInfoProto {
"kWheelRewardPosInfo\022K\n\017posInfosAdvance\030\t" +
" \003(\01322.com.ljsd.jieling.protocols.LuckWh" +
"eelRewardPosInfo\022\026\n\016MonthDailyTake\030\n \003(\005" +
"\"Z\n\022GetMissionResponse\022D\n\017userMissionInf" +
"o\030\001 \003(\0132+.com.ljsd.jieling.protocols.Use" +
"rMissionInfo\"\'\n\025RefreshItemNumRequest\022\016\n" +
"\006itemId\030\001 \003(\005\"P\n\026RefreshItemNumResponse\022" +
"6\n\010itemInfo\030\001 \003(\0132$.com.ljsd.jieling.pro" +
"tocols.ItemInfo\"S\n\023UpdateBagIndication\022\014",
"\n\004type\030\001 \001(\005\022.\n\004item\030\002 \003(\0132 .com.ljsd.ji" +
"eling.protocols.Item\"=\n\027ModifyDecoration" +
"Request\022\024\n\014decorationId\030\001 \001(\005\022\014\n\004type\030\002 " +
"\001(\005\"\336\002\n\rblessResponse\022:\n\tfixReward\030\001 \003(\013" +
"2\'.com.ljsd.jieling.protocols.blessRewar" +
"d\022=\n\014legendReward\030\002 \003(\0132\'.com.ljsd.jieli" +
"ng.protocols.blessReward\022>\n\rsupremeRewar" +
"d\030\003 \003(\0132\'.com.ljsd.jieling.protocols.ble" +
"ssReward\022<\n\013countReward\030\004 \003(\0132\'.com.ljsd" +
".jieling.protocols.blessReward\022;\n\nreward",
"View\030\005 \003(\0132\'.com.ljsd.jieling.protocols." +
"blessReward\022\027\n\017lastRefreshTime\030\006 \001(\005\"%\n\020" +
"blessSaveRequest\022\021\n\trewardIds\030\001 \003(\005\"(\n\022b" +
"lessChooseRequest\022\022\n\nlocationId\030\001 \001(\005\"_\n" +
"\023blessChooseResponse\0220\n\006reward\030\001 \001(\0132 .c" +
"om.ljsd.jieling.protocols.Drop\022\026\n\016choose" +
"RewardId\030\002 \001(\005\"I\n\014blessRefresh\0229\n\006reward" +
"\030\001 \001(\0132).com.ljsd.jieling.protocols.bles" +
"sResponse\"Q\n\025storeUpdateIndication\0228\n\tst" +
"oreInfo\030\001 \003(\0132%.com.ljsd.jieling.protoco",
"ls.StoreInfo\"%\n\tLockEquip\022\n\n\002id\030\001 \003(\t\022\014\n" +
"\004type\030\002 \001(\005\"r\n\027ActivityUpateIndication\022>" +
"\n\014activityInfo\030\001 \003(\0132(.com.ljsd.jieling." +
"protocols.ActivityInfo\022\027\n\017closeActivityI" +
"d\030\002 \003(\005\";\n\027GetForceRankInfoRequest\022\014\n\004pa" +
"ge\030\001 \001(\005\022\022\n\nactiviteId\030\002 \001(\005\"{\n\030GetForce" +
"RankInfoResponse\022>\n\014useForceInfo\030\001 \003(\0132(" +
".com.ljsd.jieling.protocols.UseForceInfo" +
"\022\017\n\007myForce\030\002 \001(\005\022\016\n\006myRank\030\003 \001(\005\"a\n\037Act" +
"ivityUpateProgressIndication\022>\n\014activity",
"Info\030\001 \002(\0132(.com.ljsd.jieling.protocols." +
"ActivityInfo\"*\n\024GetExpertInfoRequest\022\022\n\n" +
"activiteId\030\001 \001(\005\"p\n\025GetExpertInfoRespons" +
"e\0226\n\006expert\030\001 \003(\0132&.com.ljsd.jieling.pro" +
"tocols.ExpertInfo\022\017\n\007myScore\030\002 \001(\005\022\016\n\006my" +
"Rank\030\003 \001(\005\"!\n\rSignInRequest\022\020\n\010dayIndex\030" +
"\001 \001(\005\"@\n\016SignInResponse\022.\n\004drop\030\001 \001(\0132 ." +
"com.ljsd.jieling.protocols.Drop\"?\n\033GetPl" +
"ayerOneTeamInfoRequest\022\020\n\010playerId\030\001 \001(\005" +
"\022\016\n\006teamId\030\002 \001(\005\"Y\n\034GetPlayerOneTeamInfo",
"Response\0229\n\010teamInfo\030\001 \001(\0132\'.com.ljsd.ji" +
"eling.protocols.TeamOneInfo\"O\n\035TakeSenve" +
"nScoreRewardResponse\022.\n\004drop\030\001 \001(\0132 .com" +
".ljsd.jieling.protocols.Drop\"\"\n\022UpdateSt" +
"ateRequest\022\014\n\004type\030\001 \001(\005\"5\n\027UpdateUserEx" +
"pIndicaiton\022\r\n\005level\030\001 \001(\005\022\013\n\003exp\030\002 \001(\005\"" +
"6\n\037UpdateSecretBoxSeasonIndication\022\023\n\013ne" +
"wSeasonId\030\001 \001(\005\"\033\n\031GetMonsterRankInfoReq" +
"uest\"{\n\032GetMonsterRankInfoResponse\022<\n\007mo" +
"nster\030\001 \003(\0132+.com.ljsd.jieling.protocols",
".MonsterRankInfo\022\017\n\007myScore\030\002 \001(\005\022\016\n\006myR" +
"ank\030\003 \001(\005\"-\n\031PlayerBackCInfoIndication\022\020" +
"\n\010nickName\030\001 \001(\t\"*\n\026UpdatePhoneinfoReque" +
"st\022\020\n\010phoneNum\030\001 \001(\t\"(\n\027UpdatePhoneinfoR" +
"esponse\022\r\n\005state\030\001 \001(\005\"\027\n\025GetPhoneReward" +
"Request\"H\n\026GetPhoneRewardResponse\022.\n\004dro" +
"p\030\001 \001(\0132 .com.ljsd.jieling.protocols.Dro" +
"p\"#\n\022QuestionIndication\022\r\n\005state\030\001 \001(\005\"\024" +
"\n\022GetQuestionRequest\"\226\001\n\023GetQuestionResp" +
"onse\022\n\n\002id\030\001 \001(\t\022\020\n\010questDes\030\002 \001(\t\022\r\n\005st",
"art\030\003 \001(\t\022\017\n\007endtime\030\004 \001(\t\022A\n\014questOptio" +
"ns\030\005 \003(\0132+.com.ljsd.jieling.protocols.Qu" +
"estionOptions\"(\n\025upDataQuestionRequest\022\017" +
"\n\007options\030\001 \003(\t\"(\n\026upDataQuestionRespons" +
"e\022\016\n\006result\030\001 \001(\005\"\013\n\tBloodRank\"!\n\022Exchan" +
"geCdkRequest\022\013\n\003key\030\001 \001(\t\"0\n\035NotifyPaySu" +
"ccessfulIndicaiton\022\017\n\007goodsId\030\001 \001(\005\"V\n\023D" +
"irectBuyIndication\022\017\n\007goodsId\030\001 \001(\005\022.\n\004d" +
"rop\030\002 \001(\0132 .com.ljsd.jieling.protocols.D" +
"rop\"=\n\027RefreshLuckWheelRequest\022\022\n\nactivi",
"tyId\030\001 \001(\005\022\016\n\006isFree\030\002 \001(\010\"`\n\030RefreshLuc" +
"kWheelResponse\022D\n\010posInfos\030\001 \003(\01322.com.l" +
"jsd.jieling.protocols.LuckWheelRewardPos" +
"Info\"E\n\035GetLuckWheelRandRewardRequest\022\022\n" +
"\nactivityId\030\001 \001(\005\022\020\n\010repeated\030\002 \001(\010\"\252\001\n\036" +
"GetLuckWheelRandRewardResponse\022\022\n\nactivi" +
"tyId\030\001 \001(\005\022D\n\010posInfos\030\002 \003(\01322.com.ljsd." +
"jieling.protocols.LuckWheelRewardPosInfo" +
"\022.\n\004drop\030\003 \001(\0132 .com.ljsd.jieling.protoc" +
"ols.Drop\"\250\001\n\023LuckWheelIndication\022D\n\010posI",
"nfos\030\001 \003(\01322.com.ljsd.jieling.protocols." +
"LuckWheelRewardPosInfo\022K\n\017posInfosAdvanc" +
"e\030\002 \003(\01322.com.ljsd.jieling.protocols.Luc" +
"kWheelRewardPosInfo\"\246\001\n\030GetMainLevelInfo" +
"Response\022\017\n\007fightId\030\001 \001(\005\022\r\n\005state\030\002 \001(\005" +
"\022\020\n\010duration\030\003 \001(\005\022H\n\021adventureBossInfo\030" +
"\004 \003(\0132-.com.ljsd.jieling.protocols.Adven" +
"tureBossInfo\022\016\n\006reward\030\005 \001(\t\"-\n\034QuickBuy" +
"TreasureLevelRequest\022\r\n\005level\030\001 \001(\005\"S\n\031T" +
"reasureRefreshIndication\0226\n\005tasks\030\001 \003(\0132",
"\'.com.ljsd.jieling.protocols.RefreshTask" +
"\"*\n\031TreasureLevelUpIndication\022\r\n\005level\030\001" +
" \001(\005\" \n\016MailDelRequest\022\016\n\006mailId\030\001 \003(\t\"8" +
"\n\023ViewHeroInfoRequest\022\021\n\ttargetUid\030\001 \001(\005" +
"\022\016\n\006heroId\030\002 \001(\t\"\313\001\n\024ViewHeroInfoRespons" +
"e\022.\n\004hero\030\001 \001(\0132 .com.ljsd.jieling.proto" +
"cols.Hero\0220\n\005equip\030\002 \003(\0132!.com.ljsd.jiel" +
"ing.protocols.Equip\022B\n\016SpecialEffects\030\003 " +
"\003(\0132*.com.ljsd.jieling.protocols.Special" +
"Effects\022\r\n\005force\030\004 \001(\005\"/\n\013RankRequest\022\014\n",
"\004type\030\001 \001(\005\022\022\n\nactiviteId\030\002 \001(\005\"}\n\014RankR" +
"esponse\0223\n\005ranks\030\001 \003(\0132$.com.ljsd.jielin" +
"g.protocols.UserRank\0228\n\nmyRankInfo\030\002 \001(\013" +
"2$.com.ljsd.jieling.protocols.RankInfo\")" +
"\n\023NextActivityRequest\022\022\n\nactivityId\030\001 \001(" +
"\005\"0\n\024NextActivityResponse\022\n\n\002id\030\001 \001(\005\022\014\n" +
"\004time\030\002 \001(\005\"X\n\031RefreshRechargeIndication" +
"\022\016\n\006amount\030\001 \001(\005\022\024\n\014monthSaveAmt\030\002 \001(\005\022\025" +
"\n\rsmonthSaveAmt\030\003 \001(\005\"\024\n\022VipTakeDilyRequ" +
"est\"E\n\023VipTakeDilyResponse\022.\n\004drop\030\001 \001(\013",
"2 .com.ljsd.jieling.protocols.Drop\"X\n\032Mi" +
"ssingRoomRefreshResponse\022:\n\005infos\030\001 \003(\0132" +
"+.com.ljsd.jieling.protocols.UserMission" +
"Info\"@\n\032MissingRoomSendHeroRequest\022\017\n\007he" +
"roIds\030\001 \003(\t\022\021\n\tmissionId\030\002 \001(\005\"1\n\034Missin" +
"gRoomAccelerateRequest\022\021\n\tmissionId\030\001 \001(" +
"\005\"\037\n\020SexChangeRequest\022\013\n\003sex\030\001 \001(\005\"\023\n\021Se" +
"xChangeResponse\"K\n\023PrivilegeIndication\0224" +
"\n\005infos\030\001 \003(\0132%.com.ljsd.jieling.protoco" +
"ls.Privilege\"@\n\033TreasureRefreshTimeRespo",
"nse\022\017\n\007dayTime\030\001 \001(\005\022\020\n\010weekTime\030\002 \001(\005\"T" +
"\n\023MonthCardIndication\022=\n\nmonthinfos\030\001 \003(" +
"\0132).com.ljsd.jieling.protocols.MonthCard" +
"Info\"#\n\023TakeMothDilyRequest\022\014\n\004type\030\001 \001(" +
"\005\"F\n\024TakeMothDilyResponse\022.\n\004drop\030\001 \001(\0132" +
" .com.ljsd.jieling.protocols.Drop\"1\n\025Dai" +
"lyChallengeRequest\022\n\n\002id\030\001 \001(\005\022\014\n\004type\030\002" +
" \001(\005\"\202\001\n\026DailyChallengeResponse\022.\n\004drop\030" +
"\001 \001(\0132 .com.ljsd.jieling.protocols.Drop\022" +
"8\n\tfightData\030\002 \001(\0132%.com.ljsd.jieling.pr",
"otocols.FightData\"(\n\032GetSomeActivityInfo" +
"Request\022\n\n\002id\030\001 \003(\005\"\\\n\032GetSomeActitityIn" +
"foRespone\022>\n\014activityInfo\030\001 \003(\0132(.com.lj" +
"sd.jieling.protocols.ActivityInfo\";\n\021Jew" +
"elBuildRequest\022\n\n\002id\030\001 \001(\t\022\014\n\004type\030\002 \001(\005" +
"\022\014\n\004item\030\003 \003(\tB\002H\001"
"\022\024\n\014lastFeteType\030\013 \001(\005\022\026\n\016takeFeteReward" +
"\030\014 \003(\005\"Z\n\022GetMissionResponse\022D\n\017userMiss" +
"ionInfo\030\001 \003(\0132+.com.ljsd.jieling.protoco" +
"ls.UserMissionInfo\"\'\n\025RefreshItemNumRequ" +
"est\022\016\n\006itemId\030\001 \003(\005\"P\n\026RefreshItemNumRes" +
"ponse\0226\n\010itemInfo\030\001 \003(\0132$.com.ljsd.jieli",
"ng.protocols.ItemInfo\"S\n\023UpdateBagIndica" +
"tion\022\014\n\004type\030\001 \001(\005\022.\n\004item\030\002 \003(\0132 .com.l" +
"jsd.jieling.protocols.Item\"=\n\027ModifyDeco" +
"rationRequest\022\024\n\014decorationId\030\001 \001(\005\022\014\n\004t" +
"ype\030\002 \001(\005\"\336\002\n\rblessResponse\022:\n\tfixReward" +
"\030\001 \003(\0132\'.com.ljsd.jieling.protocols.bles" +
"sReward\022=\n\014legendReward\030\002 \003(\0132\'.com.ljsd" +
".jieling.protocols.blessReward\022>\n\rsuprem" +
"eReward\030\003 \003(\0132\'.com.ljsd.jieling.protoco" +
"ls.blessReward\022<\n\013countReward\030\004 \003(\0132\'.co",
"m.ljsd.jieling.protocols.blessReward\022;\n\n" +
"rewardView\030\005 \003(\0132\'.com.ljsd.jieling.prot" +
"ocols.blessReward\022\027\n\017lastRefreshTime\030\006 \001" +
"(\005\"%\n\020blessSaveRequest\022\021\n\trewardIds\030\001 \003(" +
"\005\"(\n\022blessChooseRequest\022\022\n\nlocationId\030\001 " +
"\001(\005\"_\n\023blessChooseResponse\0220\n\006reward\030\001 \001" +
"(\0132 .com.ljsd.jieling.protocols.Drop\022\026\n\016" +
"chooseRewardId\030\002 \001(\005\"I\n\014blessRefresh\0229\n\006" +
"reward\030\001 \001(\0132).com.ljsd.jieling.protocol" +
"s.blessResponse\"Q\n\025storeUpdateIndication",
"\0228\n\tstoreInfo\030\001 \003(\0132%.com.ljsd.jieling.p" +
"rotocols.StoreInfo\"%\n\tLockEquip\022\n\n\002id\030\001 " +
"\003(\t\022\014\n\004type\030\002 \001(\005\"r\n\027ActivityUpateIndica" +
"tion\022>\n\014activityInfo\030\001 \003(\0132(.com.ljsd.ji" +
"eling.protocols.ActivityInfo\022\027\n\017closeAct" +
"ivityId\030\002 \003(\005\";\n\027GetForceRankInfoRequest" +
"\022\014\n\004page\030\001 \001(\005\022\022\n\nactiviteId\030\002 \001(\005\"{\n\030Ge" +
"tForceRankInfoResponse\022>\n\014useForceInfo\030\001" +
" \003(\0132(.com.ljsd.jieling.protocols.UseFor" +
"ceInfo\022\017\n\007myForce\030\002 \001(\005\022\016\n\006myRank\030\003 \001(\005\"",
"a\n\037ActivityUpateProgressIndication\022>\n\014ac" +
"tivityInfo\030\001 \002(\0132(.com.ljsd.jieling.prot" +
"ocols.ActivityInfo\"*\n\024GetExpertInfoReque" +
"st\022\022\n\nactiviteId\030\001 \001(\005\"p\n\025GetExpertInfoR" +
"esponse\0226\n\006expert\030\001 \003(\0132&.com.ljsd.jieli" +
"ng.protocols.ExpertInfo\022\017\n\007myScore\030\002 \001(\005" +
"\022\016\n\006myRank\030\003 \001(\005\"!\n\rSignInRequest\022\020\n\010day" +
"Index\030\001 \001(\005\"@\n\016SignInResponse\022.\n\004drop\030\001 " +
"\001(\0132 .com.ljsd.jieling.protocols.Drop\"?\n" +
"\033GetPlayerOneTeamInfoRequest\022\020\n\010playerId",
"\030\001 \001(\005\022\016\n\006teamId\030\002 \001(\005\"Y\n\034GetPlayerOneTe" +
"amInfoResponse\0229\n\010teamInfo\030\001 \001(\0132\'.com.l" +
"jsd.jieling.protocols.TeamOneInfo\"O\n\035Tak" +
"eSenvenScoreRewardResponse\022.\n\004drop\030\001 \001(\013" +
"2 .com.ljsd.jieling.protocols.Drop\"\"\n\022Up" +
"dateStateRequest\022\014\n\004type\030\001 \001(\005\"5\n\027Update" +
"UserExpIndicaiton\022\r\n\005level\030\001 \001(\005\022\013\n\003exp\030" +
"\002 \001(\005\"6\n\037UpdateSecretBoxSeasonIndication" +
"\022\023\n\013newSeasonId\030\001 \001(\005\"\033\n\031GetMonsterRankI" +
"nfoRequest\"{\n\032GetMonsterRankInfoResponse",
"\022<\n\007monster\030\001 \003(\0132+.com.ljsd.jieling.pro" +
"tocols.MonsterRankInfo\022\017\n\007myScore\030\002 \001(\005\022" +
"\016\n\006myRank\030\003 \001(\005\"-\n\031PlayerBackCInfoIndica" +
"tion\022\020\n\010nickName\030\001 \001(\t\"*\n\026UpdatePhoneinf" +
"oRequest\022\020\n\010phoneNum\030\001 \001(\t\"(\n\027UpdatePhon" +
"einfoResponse\022\r\n\005state\030\001 \001(\005\"\027\n\025GetPhone" +
"RewardRequest\"H\n\026GetPhoneRewardResponse\022" +
".\n\004drop\030\001 \001(\0132 .com.ljsd.jieling.protoco" +
"ls.Drop\"#\n\022QuestionIndication\022\r\n\005state\030\001" +
" \001(\005\"\024\n\022GetQuestionRequest\"\226\001\n\023GetQuesti",
"onResponse\022\n\n\002id\030\001 \001(\t\022\020\n\010questDes\030\002 \001(\t" +
"\022\r\n\005start\030\003 \001(\t\022\017\n\007endtime\030\004 \001(\t\022A\n\014ques" +
"tOptions\030\005 \003(\0132+.com.ljsd.jieling.protoc" +
"ols.QuestionOptions\"(\n\025upDataQuestionReq" +
"uest\022\017\n\007options\030\001 \003(\t\"(\n\026upDataQuestionR" +
"esponse\022\016\n\006result\030\001 \001(\005\"\013\n\tBloodRank\"!\n\022" +
"ExchangeCdkRequest\022\013\n\003key\030\001 \001(\t\"0\n\035Notif" +
"yPaySuccessfulIndicaiton\022\017\n\007goodsId\030\001 \001(" +
"\005\"V\n\023DirectBuyIndication\022\017\n\007goodsId\030\001 \001(" +
"\005\022.\n\004drop\030\002 \001(\0132 .com.ljsd.jieling.proto",
"cols.Drop\"=\n\027RefreshLuckWheelRequest\022\022\n\n" +
"activityId\030\001 \001(\005\022\016\n\006isFree\030\002 \001(\010\"`\n\030Refr" +
"eshLuckWheelResponse\022D\n\010posInfos\030\001 \003(\01322" +
".com.ljsd.jieling.protocols.LuckWheelRew" +
"ardPosInfo\"E\n\035GetLuckWheelRandRewardRequ" +
"est\022\022\n\nactivityId\030\001 \001(\005\022\020\n\010repeated\030\002 \001(" +
"\010\"\252\001\n\036GetLuckWheelRandRewardResponse\022\022\n\n" +
"activityId\030\001 \001(\005\022D\n\010posInfos\030\002 \003(\01322.com" +
".ljsd.jieling.protocols.LuckWheelRewardP" +
"osInfo\022.\n\004drop\030\003 \001(\0132 .com.ljsd.jieling.",
"protocols.Drop\"\250\001\n\023LuckWheelIndication\022D" +
"\n\010posInfos\030\001 \003(\01322.com.ljsd.jieling.prot" +
"ocols.LuckWheelRewardPosInfo\022K\n\017posInfos" +
"Advance\030\002 \003(\01322.com.ljsd.jieling.protoco" +
"ls.LuckWheelRewardPosInfo\"\246\001\n\030GetMainLev" +
"elInfoResponse\022\017\n\007fightId\030\001 \001(\005\022\r\n\005state" +
"\030\002 \001(\005\022\020\n\010duration\030\003 \001(\005\022H\n\021adventureBos" +
"sInfo\030\004 \003(\0132-.com.ljsd.jieling.protocols" +
".AdventureBossInfo\022\016\n\006reward\030\005 \001(\t\"-\n\034Qu" +
"ickBuyTreasureLevelRequest\022\r\n\005level\030\001 \001(",
"\005\"S\n\031TreasureRefreshIndication\0226\n\005tasks\030" +
"\001 \003(\0132\'.com.ljsd.jieling.protocols.Refre" +
"shTask\"*\n\031TreasureLevelUpIndication\022\r\n\005l" +
"evel\030\001 \001(\005\" \n\016MailDelRequest\022\016\n\006mailId\030\001" +
" \003(\t\"8\n\023ViewHeroInfoRequest\022\021\n\ttargetUid" +
"\030\001 \001(\005\022\016\n\006heroId\030\002 \001(\t\"\313\001\n\024ViewHeroInfoR" +
"esponse\022.\n\004hero\030\001 \001(\0132 .com.ljsd.jieling" +
".protocols.Hero\0220\n\005equip\030\002 \003(\0132!.com.ljs" +
"d.jieling.protocols.Equip\022B\n\016SpecialEffe" +
"cts\030\003 \003(\0132*.com.ljsd.jieling.protocols.S",
"pecialEffects\022\r\n\005force\030\004 \001(\005\"/\n\013RankRequ" +
"est\022\014\n\004type\030\001 \001(\005\022\022\n\nactiviteId\030\002 \001(\005\"}\n" +
"\014RankResponse\0223\n\005ranks\030\001 \003(\0132$.com.ljsd." +
"jieling.protocols.UserRank\0228\n\nmyRankInfo" +
"\030\002 \001(\0132$.com.ljsd.jieling.protocols.Rank" +
"Info\")\n\023NextActivityRequest\022\022\n\nactivityI" +
"d\030\001 \001(\005\"0\n\024NextActivityResponse\022\n\n\002id\030\001 " +
"\001(\005\022\014\n\004time\030\002 \001(\005\"X\n\031RefreshRechargeIndi" +
"cation\022\016\n\006amount\030\001 \001(\005\022\024\n\014monthSaveAmt\030\002" +
" \001(\005\022\025\n\rsmonthSaveAmt\030\003 \001(\005\"\024\n\022VipTakeDi",
"lyRequest\"E\n\023VipTakeDilyResponse\022.\n\004drop" +
"\030\001 \001(\0132 .com.ljsd.jieling.protocols.Drop" +
"\"X\n\032MissingRoomRefreshResponse\022:\n\005infos\030" +
"\001 \003(\0132+.com.ljsd.jieling.protocols.UserM" +
"issionInfo\"@\n\032MissingRoomSendHeroRequest" +
"\022\017\n\007heroIds\030\001 \003(\t\022\021\n\tmissionId\030\002 \001(\005\"1\n\034" +
"MissingRoomAccelerateRequest\022\021\n\tmissionI" +
"d\030\001 \001(\005\"\037\n\020SexChangeRequest\022\013\n\003sex\030\001 \001(\005" +
"\"\023\n\021SexChangeResponse\"K\n\023PrivilegeIndica" +
"tion\0224\n\005infos\030\001 \003(\0132%.com.ljsd.jieling.p",
"rotocols.Privilege\"@\n\033TreasureRefreshTim" +
"eResponse\022\017\n\007dayTime\030\001 \001(\005\022\020\n\010weekTime\030\002" +
" \001(\005\"T\n\023MonthCardIndication\022=\n\nmonthinfo" +
"s\030\001 \003(\0132).com.ljsd.jieling.protocols.Mon" +
"thCardInfo\"#\n\023TakeMothDilyRequest\022\014\n\004typ" +
"e\030\001 \001(\005\"F\n\024TakeMothDilyResponse\022.\n\004drop\030" +
"\001 \001(\0132 .com.ljsd.jieling.protocols.Drop\"" +
"1\n\025DailyChallengeRequest\022\n\n\002id\030\001 \001(\005\022\014\n\004" +
"type\030\002 \001(\005\"\202\001\n\026DailyChallengeResponse\022.\n" +
"\004drop\030\001 \001(\0132 .com.ljsd.jieling.protocols",
".Drop\0228\n\tfightData\030\002 \001(\0132%.com.ljsd.jiel" +
"ing.protocols.FightData\"(\n\032GetSomeActivi" +
"tyInfoRequest\022\n\n\002id\030\001 \003(\005\"\\\n\032GetSomeActi" +
"tityInfoRespone\022>\n\014activityInfo\030\001 \003(\0132(." +
"com.ljsd.jieling.protocols.ActivityInfo\"" +
";\n\021JewelBuildRequest\022\n\n\002id\030\001 \001(\t\022\014\n\004type" +
"\030\002 \001(\005\022\014\n\004item\030\003 \003(\tB\002H\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -101875,7 +102198,7 @@ public final class PlayerInfoProto {
internal_static_com_ljsd_jieling_protocols_FivePlayerUpdateIndication_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_com_ljsd_jieling_protocols_FivePlayerUpdateIndication_descriptor,
new java.lang.String[] { "HadTakeDailyBox", "Privilege", "ActivityInfo", "UserMissionInfo", "FiveResetTowerInfo", "SignInInfo", "PlayerBindPhone", "PosInfos", "PosInfosAdvance", "MonthDailyTake", });
new java.lang.String[] { "HadTakeDailyBox", "Privilege", "ActivityInfo", "UserMissionInfo", "FiveResetTowerInfo", "SignInInfo", "PlayerBindPhone", "PosInfos", "PosInfosAdvance", "MonthDailyTake", "LastFeteType", "TakeFeteReward", });
internal_static_com_ljsd_jieling_protocols_GetMissionResponse_descriptor =
getDescriptor().getMessageTypes().get(70);
internal_static_com_ljsd_jieling_protocols_GetMissionResponse_fieldAccessorTable = new

26
common/src/main/java/com/ljsd/common/mogodb/test/TestMongo.java
View File

@ -1,20 +1,23 @@
package com.ljsd.common.mogodb.test;
import com.ljsd.common.mogodb.LjsdMongoTemplate;
import com.ljsd.common.mogodb.MongoRootConverter;
import com.ljsd.common.mogodb.test.pojo.BaseInfoForTest;
import com.ljsd.common.mogodb.test.pojo.CardTestInfo;
import com.ljsd.common.mogodb.test.pojo.PlayerForTest;
import com.mongodb.MongoClientURI;
import org.springframework.core.convert.converter.Converter;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
import org.springframework.data.mongodb.core.convert.CustomConversions;
import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper;
import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
public class TestMongo {
private static LjsdMongoTemplate ljsdMongoTemplate;
@ -22,7 +25,9 @@ public class TestMongo {
public static void main(String[] args) {
try {
ljsdMongoTemplate = getLjsdMongoTemplate();
save();
PlayerForTest one = findOne();
System.out.println(one);
} catch (UnknownHostException e) {
e.printStackTrace();
@ -56,20 +61,19 @@ public class TestMongo {
}
public static LjsdMongoTemplate getLjsdMongoTemplate() throws UnknownHostException {
SimpleMongoDbFactory simpleMongoDbFactory = new SimpleMongoDbFactory(new MongoClientURI("mongodb://60.1.1.14:27017/ysj_20215999999"));
SimpleMongoDbFactory simpleMongoDbFactory = new SimpleMongoDbFactory(new MongoClientURI("mongodb://60.1.1.14:27017/test_10215"));
DefaultDbRefResolver dbRefResolver = new DefaultDbRefResolver(simpleMongoDbFactory);
MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, new MongoMappingContext());
converter.setTypeMapper(new DefaultMongoTypeMapper(null));
// MongoTemplate mongoTemplate = new MongoTemplate(simpleMongoDbFactory, converter);
/* MappingMongoConverter mongoMapping = (MappingMongoConverter) mongoTemplate.getConverter();
mongoMapping.setCustomConversions(customConversions()); // tell mongodb to use the custom converters
mongoMapping.afterPropertiesSet();*/
return new LjsdMongoTemplate(new MongoTemplate(simpleMongoDbFactory, converter));
// converter.setCustomConversions(customConversions());
converter.afterPropertiesSet();
MongoTemplate mongoTemplate = new MongoTemplate(simpleMongoDbFactory, converter);
return new LjsdMongoTemplate(mongoTemplate);
}
/* private static CustomConversions customConversions() {
private static CustomConversions customConversions() {
List<Converter<?, ?>> converterList = new ArrayList<Converter<?, ?>>();
converterList.add(new MongoRootConverter());
return new CustomConversions(converterList);
}*/
}
}

9
common/src/main/java/com/ljsd/common/mogodb/test/pojo/PlayerForTest.java
View File

@ -6,7 +6,7 @@ import com.ljsd.common.mogodb.MongoRoot;
import java.util.Map;
public class PlayerForTest extends MongoRoot {
public final static String _COLLECTION_NAME = "play_test";
public final static String _COLLECTION_NAME = "playerForTest";
private BaseInfoForTest baseInfoForTest;
public PlayerForTest(int playerId,BaseInfoForTest baseInfoForTest){
@ -15,10 +15,9 @@ public class PlayerForTest extends MongoRoot {
baseInfoForTest.init(playerId,"baseInfoForTest");
}
// public PlayerForTest(){
// this.baseInfoForTest = new BaseInfoForTest();
// baseInfoForTest.init(this,"baseInfoForTest",false);
// }
public PlayerForTest(){
}
public BaseInfoForTest getBaseInfoForTest() {

14
conf/BattleMain.lua
View File

@ -28,6 +28,7 @@ local _BattleErrorCache = {}
local _BattleErrorIndex = 0
local _seed
local _type
local _maxRound
local _fightData
local _optionData
@ -199,9 +200,9 @@ local function AddRecord(fightData)
end
end
function BattleMain.Execute(args, fightData, optionData)
print("trfghjdfgucvhbjnfdcgvj")
_seed = args.seed
_type = args.type
_maxRound = args.maxRound
_fightData = fightData
_optionData = optionData or {}
@ -212,7 +213,7 @@ function BattleMain.Execute(args, fightData, optionData)
local errorCache
if xpcall(function ()
Random.SetSeed(args.seed)
BattleLogic.Init(fightData, optionData)
BattleLogic.Init(fightData, optionData, _maxRound)
BattleLogic.Type = _type
if _type == 9 or _type == 10 then
AddRecord(fightData)
@ -228,12 +229,12 @@ function BattleMain.Execute(args, fightData, optionData)
end) then
local resultList = {}
if BattleLogic.Result == 1 then --胜利记录我方剩余血量
local arr = BattleLogic.Query(function (r) return r.camp == 0 end, true)
local arr = RoleManager.Query(function (r) return r.camp == 0 end, true)
for i=1, #arr do
resultList[i] = arr[i]:GetRoleData(RoleDataName.Hp)
end
elseif BattleLogic.Result == 0 then --失败记录敌方剩余血量
local arr = BattleLogic.Query(function (r) return r.camp == 1 end, true)
local arr = RoleManager.Query(function (r) return r.camp == 1 end, true)
for i=1, #arr do
resultList[i] = arr[i]:GetRoleData(RoleDataName.Hp)
end
@ -249,7 +250,7 @@ function BattleMain.Execute(args, fightData, optionData)
-- print("hp:"..resultList[i])
--end
--print("最终运行帧数："..BattleLogic.CurFrame())
local curRound, maxRound = BattleLogic.GetCurRound()
local curRound, maxRound = BattleLogic.GetCurRound()
if curRound > maxRound and _type == 9 then
local playerDamage=0
local enemyDamage=0
@ -265,7 +266,7 @@ function BattleMain.Execute(args, fightData, optionData)
resultList.result = BattleLogic.Result
end
if _type == 10 then
if _type == 10 or _type == 11 then -- 公会boss和车迟斗法boss返回伤害值
local playerDamage=0
for k,v in pairs(BattleRecord)do
if v.camp == 0 then
@ -304,4 +305,5 @@ function BattleMain.Execute(args, fightData, optionData)
end
return { result = -1 }
end
return BattleMain

1
fightmanager/src/main/java/com/ljsd/fight/CheckFight.java
View File

@ -99,6 +99,7 @@ public class CheckFight {
args.set("seed",seed);
//todo type
args.set("type",fightType.getType());
args.set("maxRound",maxTime);
LuaValue result = func.call( args,fightData,optionData);
int status = result.get("result").toint();
int duration = result.get("duration").toint();

7
fightmanager/src/main/java/com/ljsd/fight/FightType.java
View File

@ -11,7 +11,12 @@ public enum FightType {
MonterFight(8), // 兽潮
TOPFight(9), // 巅峰赛
GuildBossFight(10), // 工会boss
EXPEDITION(11), // 远征
CarBossFight(11), // 车迟斗法挑战boss
CarPersonFight(12), // 车迟斗法抢夺
EXPEDITION(13), // 远征
;

14
luafight/BattleMain.lua
View File

@ -29,6 +29,7 @@ local _BattleErrorCache = {}
local _BattleErrorIndex = 0
local _seed
local _type
local _maxRound
local _fightData
local _optionData
@ -200,9 +201,9 @@ local function AddRecord(fightData)
end
end
function BattleMain.Execute(args, fightData, optionData)
print("trfghjdfgucvhbjnfdcgvj")
_seed = args.seed
_type = args.type
_maxRound = args.maxRound
_fightData = fightData
_optionData = optionData or {}
@ -213,7 +214,7 @@ function BattleMain.Execute(args, fightData, optionData)
local errorCache
if xpcall(function ()
Random.SetSeed(args.seed)
BattleLogic.Init(fightData, optionData)
BattleLogic.Init(fightData, optionData, _maxRound)
BattleLogic.Type = _type
if _type == 9 or _type == 10 then
AddRecord(fightData)
@ -229,12 +230,12 @@ function BattleMain.Execute(args, fightData, optionData)
end) then
local resultList = {}
if BattleLogic.Result == 1 then --胜利记录我方剩余血量
local arr = BattleLogic.Query(function (r) return r.camp == 0 end, true)
local arr = RoleManager.Query(function (r) return r.camp == 0 end, true)
for i=1, #arr do
resultList[i] = arr[i]:GetRoleData(RoleDataName.Hp)
end
elseif BattleLogic.Result == 0 then --失败记录敌方剩余血量
local arr = BattleLogic.Query(function (r) return r.camp == 1 end, true)
local arr = RoleManager.Query(function (r) return r.camp == 1 end, true)
for i=1, #arr do
resultList[i] = arr[i]:GetRoleData(RoleDataName.Hp)
end
@ -250,7 +251,7 @@ function BattleMain.Execute(args, fightData, optionData)
-- print("hp:"..resultList[i])
--end
--print("最终运行帧数："..BattleLogic.CurFrame())
local curRound, maxRound = BattleLogic.GetCurRound()
local curRound, maxRound = BattleLogic.GetCurRound()
if curRound > maxRound and _type == 9 then
local playerDamage=0
local enemyDamage=0
@ -266,7 +267,7 @@ function BattleMain.Execute(args, fightData, optionData)
resultList.result = BattleLogic.Result
end
if _type == 10 then
if _type == 10 or _type == 11 then -- 公会boss和车迟斗法boss返回伤害值
local playerDamage=0
for k,v in pairs(BattleRecord)do
if v.camp == 0 then
@ -305,4 +306,5 @@ function BattleMain.Execute(args, fightData, optionData)
end
return { result = -1 }
end
return BattleMain

0
luafight/LogError/test.json
View File

2
serverlogic/src/main/java/com/ljsd/DbClear.java
View File

@ -15,7 +15,7 @@ import java.util.Properties;
public class DbClear {
public static void main(String[] args) throws IOException {
Properties properties = new Properties();
URL resource = DbClear.class.getClassLoader().getResource("application.properties");
URL resource = DbClear.class.getClassLoader().getResource( "application.properties");
File file = new File(resource.getFile());
//BufferedInputStream bufferedInputStream = new BufferedInputStream(DbClear.class.getResourceAsStream("application.properties"));
System.out.println(file.getAbsolutePath());

1
serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/PlayStaticConfig.java
View File

@ -17,6 +17,7 @@ import java.util.Set;
public class PlayStaticConfig extends AbstractClassStaticConfig {
private static Map<Integer,int[][]> expeditioonRewardBoxMap;
@Override
public void registConfigs(Set<String> registConfigs) {
registConfigs.add(SExpeditionFloorConfig.class.getAnnotation(Table.class).name());

1
serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
View File

@ -63,6 +63,7 @@ public enum FunctionIdEnum {
WorkShopRebuildEquip(104,null,MessageTypeProto.MessageType.WORKSHOP_REBUILD_REQUEST_VALUE),
Expedition(64,null),
Achieve(65,null),
Car_Delay(73,null),
;
private int functionType;

1
serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java
View File

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

16
serverlogic/src/main/java/com/ljsd/jieling/core/function/CarDelayFunction.java 100644
View File

@ -0,0 +1,16 @@
package com.ljsd.jieling.core.function;
import com.ljsd.jieling.core.FunctionManager;
import com.ljsd.jieling.logic.dao.TimeControllerOfFunction;
public class CarDelayFunction implements FunctionManager {
@Override
public void startAction(TimeControllerOfFunction timeControllerOfFunction) throws Exception {
}
@Override
public void closeAction() throws Exception {
}
}

2
serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
View File

@ -137,6 +137,8 @@ public class RedisKey {
public static final String GUILD_RED_PACKAGE_RANK = "GUILD_RED_PACKAGE_RANK";
public static final String CAR_DEALY_RANK = "CAR_DEALY_RANK";
public static final String FAMILY_ID = "FAMILY_ID";
public static final String FAMILY_JOIN = "FAMILY_JOIN";

92
serverlogic/src/main/java/com/ljsd/jieling/handler/FastChallengeHandler.java 100644
View File

@ -0,0 +1,92 @@
package com.ljsd.jieling.handler;
import com.ljsd.jieling.core.GlobalsDef;
import com.ljsd.jieling.db.redis.RedisUtil;
import com.ljsd.jieling.exception.ErrorCode;
import com.ljsd.jieling.exception.ErrorCodeException;
import com.ljsd.jieling.logic.dao.TeamPosHeroInfo;
import com.ljsd.jieling.logic.dao.UserManager;
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.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.FightInfoProto;
import com.ljsd.jieling.protocols.MessageTypeProto;
import com.ljsd.jieling.util.MessageUtil;
import config.SWorldBossConfig;
import config.SWorldBossSetting;
import manager.STableManager;
import java.util.List;
public class FastChallengeHandler extends BaseHandler<FightInfoProto.FastFightChallengeRequest>{
@Override
public MessageTypeProto.MessageType getMessageCode() {
return MessageTypeProto.MessageType.FAST_FIGHT_CHALLENGE_REQUEST;
}
@Override
public void processWithProto(ISession iSession, FightInfoProto.FastFightChallengeRequest proto) throws Exception {
int type = proto.getType();
int uid = iSession.getUid();
User user = UserManager.getUser(uid);
SWorldBossSetting sWorldBossSetting = STableManager.getConfig(SWorldBossSetting.class).get(1);
if(type == 1 || type == 2){
if(GuildFightLogic.carDelayProgressIndication.getProgress()!=type){
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE);
}
if(user.getPlayerInfoManager().getGuildId() == 0){
throw new ErrorCodeException(ErrorCode.FAMILY_NO);
}
List<TeamPosHeroInfo> teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(GlobalsDef.CAR_DELAY_TEAM);
if(teamPosHeroInfos == null || teamPosHeroInfos.isEmpty()){
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE);
}
int privilege = sWorldBossSetting.getPrivilege()[type - 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();
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);
FightResult fightResult = FightDispatcher.dispatcher(pvpFightEvent);
hurt = fightResult.getCheckResult()[1];
gainScore = (int) (hurt*(sWorldBossSetting.getScorePercent()/10000F));
RankEnum.toRank(RankEnum.CAR_DEALY_RANK.getType()).incrementRankScore(uid,"",gainScore);
}break;
case 2:{
PVPFightEvent pvpFightEvent = new PVPFightEvent(uid,GlobalsDef.CAR_DELAY_TEAM, battleRound,"", GameFightType.CarPersonChallenge,challeageId,GlobalsDef.CAR_DELAY_TEAM);
FightResult fightResult = FightDispatcher.dispatcher(pvpFightEvent);
int fight = fightResult.getCheckResult()[0];
if(fight == 1){
int challenegScore = RedisUtil.getInstence().getZSetScore(RankEnum.CAR_DEALY_RANK.getRedisKey(), "", String.valueOf(challeageId)).intValue();
if(challenegScore !=-1){
gainScore = (int) (challenegScore*(sWorldBossSetting.getGrabPercent()/10000F));
RankEnum.toRank(RankEnum.CAR_DEALY_RANK.getType()).incrementRankScore(uid,"",gainScore);
RankEnum.toRank(RankEnum.CAR_DEALY_RANK.getType()).incrementRankScore(challeageId,"",-gainScore);
}
}
}break;
default:
throw new ErrorCodeException(ErrorCode.SERVER_DEFINE);
}
FightInfoProto.FastFightChallengeResponse build = FightInfoProto.FastFightChallengeResponse.newBuilder().setHurt(hurt).setScore(gainScore).build();
MessageUtil.sendMessage(iSession,1, MessageTypeProto.MessageType.FAST_FIGHT_CHALLENGE_RESPONSE_VALUE,build,true);
}
}

76
serverlogic/src/main/java/com/ljsd/jieling/handler/family/GetCarChallengeListHandler.java 100644
View File

@ -0,0 +1,76 @@
package com.ljsd.jieling.handler.family;
import com.ljsd.jieling.db.redis.RedisKey;
import com.ljsd.jieling.db.redis.RedisUtil;
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.UserManager;
import com.ljsd.jieling.logic.dao.root.GuildCache;
import com.ljsd.jieling.logic.dao.root.GuildInfo;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.rank.RankEnum;
import com.ljsd.jieling.netty.cocdex.PacketNetData;
import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.protocols.MessageTypeProto;
import config.SWorldBossSetting;
import manager.STableManager;
import org.springframework.data.redis.core.ZSetOperations;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
public class GetCarChallengeListHandler extends BaseHandler {
@Override
public MessageTypeProto.MessageType getMessageCode() {
return MessageTypeProto.MessageType.GET_CAR_CHALLENEG_LIST_REQUEST;
}
@Override
public void process(ISession iSession, PacketNetData netData) throws Exception {
int uid = iSession.getUid();
User user = UserManager.getUser(uid);
int guildId = user.getPlayerInfoManager().getGuildId();
if(guildId == 0){
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
}
Long myRank = RedisUtil.getInstence().getZSetreverseRank(RedisKey.CAR_DEALY_RANK, "", String.valueOf(uid));
int[] matchSection = STableManager.getConfig(SWorldBossSetting.class).get(1).getMatchSection();
int matchNums = matchSection[0] + matchSection[1];
Set<ZSetOperations.TypedTuple<String>> infos = new LinkedHashSet<>(matchNums);
GuildInfo guildInfo = GuilidManager.guildInfoMap.get(guildId);
Set<Integer> members = new HashSet<>();
guildInfo.getMembers().values().forEach(integers ->members.addAll(integers));
String key = RedisUtil.getInstence().getKey(RedisKey.CAR_DEALY_RANK, "");
int zsetSize = RedisUtil.getInstence().getZsetSize(key);
if(myRank == -1){
int start = zsetSize - matchNums;
int end=-1;
while (start>=0 && infos.size()<matchNums){
Set<ZSetOperations.TypedTuple<String>> zsetreverseRangeWithScores = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.CAR_DEALY_RANK, "", start, end);
for(ZSetOperations.TypedTuple<String> item : zsetreverseRangeWithScores){
if(!members.contains(Integer.parseInt(item.getValue()))){
zsetreverseRangeWithScores.add(item);
}
}
end=start;
start-=matchNums;
}
}else{
//取前面
/* int start = (int) (myRank - matchSection[0]);
while (start>0 && infos.size()<matchNums){
end=start+matchNums;
Set<ZSetOperations.TypedTuple<String>> zsetreverseRangeWithScores = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.CAR_DEALY_RANK, "", start, end);
zsetreverseRangeWithScores.forEach(item->{
if(!members.contains(Integer.parseInt(item.getValue()))){
zsetreverseRangeWithScores.add(item);
}
});
}
RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.CAR_DEALY_RANK, "", myRank - matchSection[0], myRank+5);*/
}
}
}

106
serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java
View File

@ -1,7 +1,10 @@
package com.ljsd.jieling.logic.family;
import com.googlecode.protobuf.format.JsonFormat;
import com.ljsd.GameApplication;
import com.ljsd.fight.FightType;
import com.ljsd.jieling.config.clazzStaticCfg.CommonStaticConfig;
import com.ljsd.jieling.core.FunctionIdEnum;
import com.ljsd.jieling.core.GlobalsDef;
import com.ljsd.jieling.core.VipPrivilegeType;
import com.ljsd.jieling.db.mongo.MongoUtil;
@ -15,6 +18,8 @@ import com.ljsd.jieling.handler.map.behavior.BehaviorUtil;
import com.ljsd.jieling.ktbeans.KTGameType;
import com.ljsd.jieling.ktbeans.KtEventUtils;
import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean;
import com.ljsd.jieling.logic.GlobalDataManaager;
import com.ljsd.jieling.logic.OnlineUserManager;
import com.ljsd.jieling.logic.blood.BloodLogic;
import com.ljsd.jieling.logic.dao.*;
import com.ljsd.jieling.logic.dao.root.GuildCache;
@ -30,10 +35,7 @@ import com.ljsd.jieling.logic.player.PlayerLogic;
import com.ljsd.jieling.logic.rank.RankEnum;
import com.ljsd.jieling.logic.rank.rankImpl.GuildBossRank;
import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.protocols.CommonProto;
import com.ljsd.jieling.protocols.Family;
import com.ljsd.jieling.protocols.FightInfoProto;
import com.ljsd.jieling.protocols.MessageTypeProto;
import com.ljsd.jieling.protocols.*;
import com.ljsd.jieling.thread.ThreadManager;
import com.ljsd.jieling.thread.task.GuildFightMatchingTask;
import com.ljsd.jieling.util.*;
@ -1216,4 +1218,100 @@ public class GuildFightLogic {
public static SGuildBossConfig getCurSGuildBossConfig() {
return curSGuildBossConfig;
}
//车迟玩法
private static int carProgress=-2 ;
public static Family.CarDelayProgressIndication carDelayProgressIndication;
public static void minuteCheckForCarFight() throws Exception {
TimeControllerOfFunction timeControllerOfFunction = GlobalDataManaager.getInstance().getTimeControllerOfFunctionByFunctinoType(FunctionIdEnum.Car_Delay);
if (null == timeControllerOfFunction) {
carProgress = -1;
carDelayProgressIndication= Family.CarDelayProgressIndication.newBuilder().setProgress(carProgress).build();
return;
}
int times = timeControllerOfFunction.getTimes();
long startTime = timeControllerOfFunction.getStartTime();
int size = STableManager.getConfig(SWorldBossConfig.class).size();
int id = times%size;
if(id == 0){
id = size;
}
Calendar calendar = Calendar.getInstance();
SWorldBossSetting sWorldBossSetting = STableManager.getConfig(SWorldBossSetting.class).get(1);
int[][] battleTime = sWorldBossSetting.getBattleTime();
int[][] grabTime = sWorldBossSetting.getGrabTime();
int hour = calendar.get(Calendar.HOUR_OF_DAY);
int minute = calendar.get(Calendar.MINUTE);
int endTime = 0;
int carProgressTmp =carProgress;
int sourceCompare = hour*100 + minute;
int battleCompareStart =battleTime[0][0]*100 + battleTime[0][1];
int battleCompaeEnd =battleTime[1][0]*100 + battleTime[1][1];
int grapCompareStart =grabTime[0][0]*100 + grabTime[0][1];
int grapCompaeEnd =grabTime[1][0]*100 + grabTime[1][1];
if(sourceCompare>=battleCompareStart && sourceCompare<=battleCompaeEnd){
if(carProgressTmp == 1){
return;
}
carProgressTmp = 1;
calendar.set(calendar.HOUR_OF_DAY,battleTime[1][0]);
calendar.set(calendar.MINUTE,battleTime[1][1]);
calendar.set(calendar.SECOND,0);
endTime = (int)(calendar.getTimeInMillis()/1000);
}else if(sourceCompare>=grapCompareStart && sourceCompare<=grapCompaeEnd){
if(carProgressTmp == 2){
return;
}
carProgressTmp = 2;
calendar.set(calendar.HOUR_OF_DAY,grabTime[1][0]);
calendar.set(calendar.MINUTE,grabTime[1][1]);
calendar.set(calendar.SECOND,0);
endTime = (int)(calendar.getTimeInMillis()/1000);
}else{
carProgressTmp = -1;
}
if(carProgressTmp!=carProgress){
int battleStartTime = 0;
int grapStartTime = 0;
Calendar instance = Calendar.getInstance();
instance.setTimeInMillis(startTime);
calendar.set(calendar.HOUR_OF_DAY,grabTime[0][0]);
calendar.set(calendar.MINUTE,grabTime[0][1]);
calendar.set(calendar.SECOND,0);
grapStartTime = (int)(calendar.getTimeInMillis()/1000);
calendar.set(calendar.HOUR_OF_DAY,battleTime[0][0]);
calendar.set(calendar.MINUTE,battleTime[0][1]);
calendar.set(calendar.SECOND,0);
battleStartTime = (int)(calendar.getTimeInMillis()/1000);
carProgress = carProgressTmp;
carDelayProgressIndication= Family.CarDelayProgressIndication.newBuilder().setBossIndexId(id).setProgress(carProgress).setEndTime(endTime).
setBattleStartTime(battleStartTime).setGrabStartTime(grapStartTime).
build();
sendAllProgressUpdate();
System.out.println(JsonFormat.printToString(carDelayProgressIndication));
}
}
public static void sendAllProgressUpdate(){
//向全服玩家广播进度变更信息
for(ISession session : OnlineUserManager.sessionMap.values()){
MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.CAR_DELAY_PROGRESS_INDICATION_VALUE,carDelayProgressIndication,true);
}
}
}

1
serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java
View File

@ -71,6 +71,7 @@ public class GuildLogic {
builder.addFamilyWalkIndicaiton(CBean2Proto.getFamilyWalkIndicaiton(userMember));
}
}
builder.setCarDelayProgressIndication(GuildFightLogic.carDelayProgressIndication);
MessageUtil.sendMessage(session,1,msgId,builder.build(),true);
}

5
serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java
View File

@ -41,7 +41,10 @@ public enum GameFightType {
GuildFight(FightType.GuildFight,new PVPFightHandler(),null),
GuildBossFight(FightType.GuildBossFight,new DefaultOfRedisCacheFightHandler(),RedisKey.GUILD_MONSTER_FIGHT),
DailyChallenge(FightType.StoryFight,new DefaultWithoutHandFightHandler(),null)
DailyChallenge(FightType.StoryFight,new DefaultWithoutHandFightHandler(),null),
CarBossChallenge(FightType.StoryFight,new DefaultWithoutHandFightHandler(),null),
CarPersonChallenge(FightType.StoryFight,new DefaultWithoutHandFightHandler(),null),
;

4
serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java
View File

@ -33,6 +33,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.*;
import java.util.stream.Collectors;
public class MissionLoigc {
private static final Logger LOGGER = LoggerFactory.getLogger(MissionLoigc.class);
@ -733,6 +734,9 @@ public class MissionLoigc {
count = cumulationData.rechargeTotal;
break;
case FINISH_MISSING_ROOM:
if(missionSubType[0] == 0){
cumulationData.finishMissionTimes.values().stream().collect(Collectors.summarizingInt(x->x));
}
count = cumulationData.finishMissionTimes.get(missionSubType[0]);
break;
case REFRESH_MISSING_ROOM:

1
serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java
View File

@ -22,6 +22,7 @@ public enum RankEnum {
RANDOM_CARD_PERFECT_RANK(11,RedisKey.RANDOM_CARD_PERFECT_RANK,RandomCardPerfectRank::new),//param1：时间 param2：英雄tempId param3:uid
GUILD_BOSS_RANK(12,RedisKey.GUILD_BOSS_RANK,GuildBossRank::new),//param1：时间 param2：英雄tempId param3:uid
GUILD_RED_PACKAGE_RANK(13,RedisKey.GUILD_RED_PACKAGE_RANK,GuildRedPackageRank::new),//param1：红包总价格 param2：无 param3:无
CAR_DEALY_RANK(14,RedisKey.CAR_DEALY_RANK,CarDealyRank::new),//param1：伤害 param2：无 param3:无
;
private int type;

12
serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java
View File

@ -63,6 +63,18 @@ public abstract class AbstractRank implements IRank {
String key = RedisKey.getKey(redisKey,rkey,false);
RedisUtil.getInstence().zsetAddOne(key,String.valueOf(uid), getScore(data));
}
/**
* 向排行榜增减分数
* @param uid
* @param rkey
* @param data
*/
public void incrementRankScore(int uid,String rkey,double... data){
String key = RedisKey.getKey(redisKey,rkey,false);
RedisUtil.getInstence().zsetAddOne(key,String.valueOf(uid), getScore(data));
}
public AbstractRank(int type,String redisKey){
this.type = type;
this.redisKey = redisKey;

18
serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CarDealyRank.java 100644
View File

@ -0,0 +1,18 @@
package com.ljsd.jieling.logic.rank.rankImpl;
public class CarDealyRank extends AbstractRank{
public CarDealyRank(int type, String redisKey) {
super(type, redisKey);
}
@Override
public int[] getDataByScore(Double score) {
return new int[0];
}
@Override
public double getScore(double... data) {
return data[0];
}
}

3
serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java
View File

@ -21,7 +21,6 @@ import com.ljsd.jieling.logic.activity.event.HourTaskEvent;
import com.ljsd.jieling.logic.activity.event.MinuteTaskEvent;
import com.ljsd.jieling.logic.activity.event.Poster;
import com.ljsd.jieling.logic.arena.ArenaLogic;
import com.ljsd.jieling.logic.championship.ChampionshipLogic;
import com.ljsd.jieling.logic.dao.GuilidManager;
import com.ljsd.jieling.logic.dao.root.GuildInfo;
import com.ljsd.jieling.logic.family.GuildFightLogic;
@ -78,7 +77,7 @@ public class MinuteTask extends Thread {
CoreLogic.getInstance().checkCoreCdk();
BuyGoodsLogic.minuteCheckReharge();
RedisUtil.getInstence().set(RedisKey.ONLINE_NUM+RedisKey.Delimiter_colon+GameApplication.serverId, String.valueOf(OnlineUserManager.sessionMap.entrySet().size()));
GuildFightLogic.minuteCheckForCarFight();
LOGGER.info("MinuteTask end...");
} catch (Exception e) {
LOGGER.error("e",e);

31
tablemanager/src/main/java/config/SWorldBossConfig.java 100644
View File

@ -0,0 +1,31 @@
package config;
import manager.STableManager;
import manager.Table;
import java.util.Map;
@Table(name ="WorldBossConfig")
public class SWorldBossConfig implements BaseConfig {
private int id;
private int monsterId;
@Override
public void init() throws Exception {
}
public int getId() {
return id;
}
public int getMonsterId() {
return monsterId;
}
}

37
tablemanager/src/main/java/config/SWorldBossRewardConfig.java 100644
View File

@ -0,0 +1,37 @@
package config;
import manager.STableManager;
import manager.Table;
import java.util.Map;
@Table(name ="WorldBossRewardConfig")
public class SWorldBossRewardConfig implements BaseConfig {
private int id;
private int[] section;
private int[][] reward;
@Override
public void init() throws Exception {
}
public int getId() {
return id;
}
public int[] getSection() {
return section;
}
public int[][] getReward() {
return reward;
}
}

65
tablemanager/src/main/java/config/SWorldBossSetting.java 100644
View File

@ -0,0 +1,65 @@
package config;
import manager.STableManager;
import manager.Table;
import java.util.Map;
@Table(name ="WorldBossSetting")
public class SWorldBossSetting implements BaseConfig {
private int id;
private int[][] battleTime;
private int[][] grabTime;
private int[] matchSection;
private int[] privilege;
private int scorePercent;
private int grabPercent;
private int battleRound;
@Override
public void init() throws Exception {
}
public int getid() {
return id;
}
public int[][] getBattleTime() {
return battleTime;
}
public int[][] getGrabTime() {
return grabTime;
}
public int[] getMatchSection() {
return matchSection;
}
public int[] getPrivilege() {
return privilege;
}
public int getScorePercent() {
return scorePercent;
}
public int getGrabPercent() {
return grabPercent;
}
public int getBattleRound() {
return battleRound;
}
}

30
test/src/main/java/db/MongoLearn.java 100644
View File

@ -0,0 +1,30 @@
package db;
import com.ljsd.jieling.logic.dao.root.User;
import com.mongodb.MongoClientURI;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper;
import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
import org.springframework.data.mongodb.core.query.Query;
import java.net.UnknownHostException;
import java.util.List;
public class MongoLearn {
public static void main(String[] args) throws UnknownHostException {
SimpleMongoDbFactory simpleMongoDbFactory = new SimpleMongoDbFactory(new MongoClientURI( "mongodb://60.1.1.14:27017/jieling_20215"));
DefaultDbRefResolver dbRefResolver = new DefaultDbRefResolver(simpleMongoDbFactory);
MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, new MongoMappingContext());
converter.setTypeMapper(new DefaultMongoTypeMapper(null));
MongoTemplate mongoTemplate = new MongoTemplate(simpleMongoDbFactory, converter);
Query querySize = new Query();
querySize.fields().include("playerManager.level");
List<User> userList = mongoTemplate.find(querySize, User.class);
System.out.println(userList.size());
}
}

384
test/src/main/java/db/MongoTest.java
View File

@ -29,22 +29,388 @@ import org.springframework.data.redis.core.query.QueryUtils;
import java.net.URLEncoder;
import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.*;
import java.util.function.Supplier;
import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
public class MongoTest {
public static void main(String[] args) throws UnknownHostException {
String encode = URLEncoder.encode("mongodb://rwuser:JkA!6VE@Gj@cMqu@139.9.84.15:8635/test?authSource=admin");
SimpleMongoDbFactory simpleMongoDbFactory = new SimpleMongoDbFactory(new MongoClientURI( "mongodb://rwuser:JkA!6VE%40Gj%40cMqu@139.9.84.15:8635/jieling_10021?authSource=admin"));
SimpleMongoDbFactory simpleMongoDbFactory = new SimpleMongoDbFactory(new MongoClientURI( "mongodb://rwuser:JkA!6VE%40Gj%40cMqu@139.9.84.15:8635/jieling_10011?authSource=admin"));
DefaultDbRefResolver dbRefResolver = new DefaultDbRefResolver(simpleMongoDbFactory);
MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, new MongoMappingContext());
converter.setTypeMapper(new DefaultMongoTypeMapper(null));
MongoTemplate mongoTemplate = new MongoTemplate(simpleMongoDbFactory, converter);
Query querySize = new Query();
Query query = new Query(Criteria.where("playerManager.rechargeInfo.saveAmt").gt(0));
query.with(new Sort(Sort.Direction.DESC,"playerManager.rechargeInfo.saveAmt"));
query.fields().include("playerManager.rechargeInfo.saveAmt");
query.fields().include("playerManager.maxForce");
List<User> users = null;
try {
users =mongoTemplate.find(query, User.class);
} catch (Exception e) {
e.printStackTrace();
}
Supplier<MongoTest> supplier = MongoTest::new;
String s =
"41#1007046|1579553355|10011|10011|10007648\n" +
"2#1007046|1416865334|10011|10011|10000116\n" +
"2#1007046|1579523423|10011|10011|10007517\n" +
"2#1007046|1580194278|10011|10011|10009016\n" +
"2#1007046|1451373741|10011|10011|10001103\n" +
"41#1007046|1589298208|10011|10011|10007589\n" +
"2#1007046|1591547208|10011|10011|10010143\n" +
"2#1007046|1581274762|10011|10011|10009991\n" +
"41#1007046|1589720244|10011|10011|10008518\n" +
"41#1007046|1590137662|10011|10011|10009159\n" +
"2#1007046|1589627395|10011|10011|10008371\n" +
"2#1007046|1591564969|10011|10011|10010160\n" +
"5#1007046|1430446172|10011|10011|10000399\n" +
"41#1007046|1580433468|10011|10011|10009491\n" +
"41#1007046|1580328796|10011|10011|10009237\n" +
"41#1007046|1579579174|10011|10011|10007748\n" +
"41#1007046|1589336773|10011|10011|10007733\n" +
"2#1007046|1589583413|10011|10011|10008307\n" +
"2#1007046|1589252743|10011|10011|10007392\n" +
"2#1007046|1416862229|10011|10011|10007475\n" +
"2#1007046|1589353791|10011|10011|10007788\n" +
"2#1007046|1472254088|10011|10011|10008170\n" +
"2#1007046|1365586915|10011|10011|10004108\n" +
"41#1007046|1579584041|10011|10011|10007775\n" +
"2#1007046|1452100200|10011|10011|10005064\n" +
"2#1007046|1589261867|10011|10011|10007394\n" +
"41#1007046|1590467348|10011|10011|10009642\n" +
"41#1007046|1588759282|10011|10011|10007385\n" +
"41#1007046|1589324963|10011|10011|10007686\n" +
"41#1007046|1579628472|10011|10011|10007920\n" +
"2#1007046|1591363662|10011|10011|10010249\n" +
"2#1007046|1416978527|10011|10011|10000123\n" +
"2#1007046|1365253611|10011|10011|10000039\n" +
"41#1007046|1591412440|10011|10011|10010076\n" +
"2#1007046|1581647746|10011|10011|10010217\n" +
"41#1007046|1580428472|10011|10011|10009916\n" +
"2#1007046|1589854372|10011|10011|10008739\n" +
"2#1007046|1589281649|10011|10011|10007531\n" +
"2#1007046|1589756197|10011|10011|10008573\n" +
"41#1007046|1581591110|10011|10011|10010184\n" +
"41#1007046|1589711973|10011|10011|10008495\n" +
"2#1007046|1451358170|10011|10011|10001298\n" +
"2#1007046|1579498827|10011|10011|10007405\n" +
"41#1007046|1590039538|10011|10011|10009022\n" +
"41#1007046|1589234131|10011|10011|10007560\n" +
"2#1007046|1592778963|10011|10011|10010402\n" +
"2#1007046|1451606479|10011|10011|10003258\n" +
"41#1007046|1589979672|10011|10011|10008953\n" +
"2#1007046|1590074130|10011|10011|10009071\n" +
"41#1007046|1590002678|10011|10011|10008982\n" +
"41#1007046|1589976549|10011|10011|10008950\n" +
"41#1007046|1589623151|10011|10011|10008367\n" +
"2#1007046|1589759451|10011|10011|10008575\n" +
"2#1007046|1580005765|10011|10011|10008671\n" +
"2#1007046|1581650182|10011|10011|10010219\n" +
"2#1007046|1365405120|10011|10011|10002052\n" +
"2#1007046|1589252868|10011|10011|10007406\n" +
"41#1007046|1590188859|10011|10011|10009244\n" +
"41#1007046|1590186037|10011|10011|10009234\n" +
"41#1007046|1589994621|10011|10011|10008973\n" +
"2#1007046|1591174590|10011|10011|10009952\n" +
"41#1007046|1581218096|10011|10011|10009953\n" +
"2#1007046|1589468625|10011|10011|10008082\n" +
"2#1007046|1581581926|10011|10011|10010180\n" +
"41#1007046|1580040749|10011|10011|10008753\n" +
"2#1007046|1590309698|10011|10011|10009503\n" +
"2#1007046|1581370480|10011|10011|10010039\n" +
"2#1007046|1589782855|10011|10011|10008618\n" +
"2#1007046|1567511638|10011|10011|10007299\n" +
"41#1007046|1589443264|10011|10011|10008019\n" +
"41#1007046|1579612738|10011|10011|10007871\n" +
"2#1007046|1591843416|10011|10011|10010251\n" +
"2#1007046|1589267115|10011|10011|10007458\n" +
"41#1007046|1591589239|10011|10011|10010179\n" +
"41#1007046|1589629798|10011|10011|10008374\n" +
"2#1007046|1591058215|10011|10011|10009888\n" +
"2#1007046|1581259252|10011|10011|10009980\n" +
"2#1007046|1580465427|10011|10011|10009563\n" +
"2#1007046|1579902495|10011|10011|10008480\n" +
"2#1007046|1451593897|10011|10011|10003124\n" +
"41#1007046|1589344797|10011|10011|10007754\n" +
"2#1007046|1589554713|10011|10011|10008264\n" +
"41#1007046|1590102331|10011|10011|10009105\n" +
"41#1007046|1581551488|10011|10011|10010151\n" +
"41#1007046|1579722380|10011|10011|10008163\n" +
"2#1007046|1589740005|10011|10011|10008546\n" +
"2#1007046|1580893218|10011|10011|10009792\n" +
"2#1007046|1579547256|10011|10011|10007616\n" +
"2#1007046|1368175494|10011|10011|10007040\n" +
"41#1007046|1590772554|10011|10011|10009762\n" +
"41#1007046|1589709434|10011|10011|10008493\n" +
"41#1007046|1581567401|10011|10011|10010167\n" +
"41#1007046|1580435300|10011|10011|10009498\n" +
"41#1007046|1580197937|10011|10011|10009026\n" +
"2#1007046|1590573978|10011|10011|10009682\n" +
"2#1007046|1589295579|10011|10011|10007577\n" +
"2#1007046|1580355520|10011|10011|10009315\n" +
"41#1007046|1589843452|10011|10011|10008712\n" +
"2#1007046|1453383702|10011|10011|10006251\n" +
"41#1007046|1589302973|10011|10011|10007603\n" +
"41#1007046|1580867158|10011|10011|10009773\n" +
"41#1007046|1580158668|10011|10011|10008978\n" +
"41#1007046|1579720184|10011|10011|10008155\n" +
"2#1007046|1580014751|10011|10011|10008687\n" +
"2#1007046|1453078161|10011|10011|10006104\n" +
"1#1006856|753048854|10011|10011|10007343\n" +
"41#1007046|1589557777|10011|10011|10008270\n" +
"41#1007046|1579765381|10011|10011|10008252\n" +
"2#1007046|1589446339|10011|10011|10008026\n" +
"41#1007046|1602693005|10011|10011|10010415\n" +
"41#1007046|1592937068|10011|10011|10010444\n" +
"41#1007046|1592799647|10011|10011|10010410\n" +
"41#1007046|1592413160|10011|10011|10010350\n" +
"41#1007046|1592354886|10011|10011|10010341\n" +
"41#1007046|1592110984|10011|10011|10010292\n" +
"41#1007046|1591673405|10011|10011|10010227\n" +
"41#1007046|1591672160|10011|10011|10010224\n" +
"41#1007046|1591649193|10011|10011|10010210\n" +
"41#1007046|1591610415|10011|10011|10010190\n" +
"41#1007046|1591583702|10011|10011|10010174\n" +
"41#1007046|1591575489|10011|10011|10010168\n" +
"41#1007046|1590533454|10011|10011|10009667\n" +
"41#1007046|1590431407|10011|10011|10009622\n" +
"41#1007046|1590372528|10011|10011|10009602\n" +
"41#1007046|1590338937|10011|10011|10009558\n" +
"41#1007046|1590322763|10011|10011|10009533\n" +
"41#1007046|1590318249|10011|10011|10009522\n" +
"41#1007046|1590317716|10011|10011|10009520\n" +
"41#1007046|1590305798|10011|10011|10009494\n" +
"41#1007046|1590300910|10011|10011|10009483\n" +
"41#1007046|1590274742|10011|10011|10009444\n" +
"41#1007046|1590267826|10011|10011|10009431\n" +
"41#1007046|1590263850|10011|10011|10009425\n" +
"41#1007046|1590249516|10011|10011|10009400\n" +
"41#1007046|1590233841|10011|10011|10009364\n" +
"41#1007046|1590218846|10011|10011|10009317\n" +
"41#1007046|1590153307|10011|10011|10009177\n" +
"41#1007046|1590101352|10011|10011|10009106\n" +
"41#1007046|1590080854|10011|10011|10009081\n" +
"41#1007046|1589903677|10011|10011|10008835\n" +
"41#1007046|1589885920|10011|10011|10008797\n" +
"41#1007046|1589878765|10011|10011|10008783\n" +
"41#1007046|1589854357|10011|10011|10008737\n" +
"41#1007046|1589853979|10011|10011|10008738\n" +
"41#1007046|1589800869|10011|10011|10008647\n" +
"41#1007046|1589770095|10011|10011|10008599\n" +
"41#1007046|1589739097|10011|10011|10008545\n" +
"41#1007046|1589730172|10011|10011|10008531\n" +
"41#1007046|1589715330|10011|10011|10008504\n" +
"41#1007046|1589712472|10011|10011|10008496\n" +
"41#1007046|1589699725|10011|10011|10008471\n" +
"41#1007046|1589673665|10011|10011|10008429\n" +
"41#1007046|1589612079|10011|10011|10008349\n" +
"41#1007046|1589588050|10011|10011|10008314\n" +
"41#1007046|1589516777|10011|10011|10008188\n" +
"41#1007046|1589516729|10011|10011|10008187\n" +
"41#1007046|1589462369|10011|10011|10008067\n" +
"41#1007046|1589456951|10011|10011|10008055\n" +
"41#1007046|1589455592|10011|10011|10008050\n" +
"41#1007046|1589432622|10011|10011|10007991\n" +
"41#1007046|1589391846|10011|10011|10007910\n" +
"41#1007046|1589370545|10011|10011|10007836\n" +
"41#1007046|1589358687|10011|10011|10007802\n" +
"41#1007046|1589314932|10011|10011|10007655\n" +
"41#1007046|1589297178|10011|10011|10007582\n" +
"41#1007046|1581652475|10011|10011|10010221\n" +
"41#1007046|1581616011|10011|10011|10010199\n" +
"41#1007046|1581540284|10011|10011|10010142\n" +
"41#1007046|1581499814|10011|10011|10010110\n" +
"41#1007046|1581208182|10011|10011|10009948\n" +
"41#1007046|1580730719|10011|10011|10009701\n" +
"41#1007046|1580624630|10011|10011|10009658\n" +
"41#1007046|1580544708|10011|10011|10009619\n" +
"41#1007046|1580508057|10011|10011|10009603\n" +
"41#1007046|1580432739|10011|10011|10009488\n" +
"41#1007046|1580364734|10011|10011|10009333\n" +
"41#1007046|1580344255|10011|10011|10009292\n" +
"41#1007046|1580334586|10011|10011|10009259\n" +
"41#1007046|1580305911|10011|10011|10009194\n" +
"41#1007046|1580259842|10011|10011|10009116\n" +
"41#1007046|1580167504|10011|10011|10008986\n" +
"41#1007046|1580136512|10011|10011|10008931\n" +
"41#1007046|1580111071|10011|10011|10008882\n" +
"41#1007046|1580086704|10011|10011|10008844\n" +
"41#1007046|1580069397|10011|10011|10008814\n" +
"41#1007046|1580068033|10011|10011|10008813\n" +
"41#1007046|1580054044|10011|10011|10008779\n" +
"41#1007046|1580022906|10011|10011|10008714\n" +
"41#1007046|1579998173|10011|10011|10008665\n" +
"41#1007046|1579985691|10011|10011|10008650\n" +
"41#1007046|1579956960|10011|10011|10008593\n" +
"41#1007046|1579943625|10011|10011|10008564\n" +
"41#1007046|1579931992|10011|10011|10008543\n" +
"41#1007046|1579914885|10011|10011|10008512\n" +
"41#1007046|1579890553|10011|10011|10008459\n" +
"41#1007046|1579810617|10011|10011|10008330\n" +
"41#1007046|1579791170|10011|10011|10008296\n" +
"41#1007046|1579746943|10011|10011|10008213\n" +
"41#1007046|1579744648|10011|10011|10008209\n" +
"41#1007046|1579729551|10011|10011|10008178\n" +
"41#1007046|1579684917|10011|10011|10008066\n" +
"41#1007046|1579611114|10011|10011|10007861\n" +
"41#1007046|1579602971|10011|10011|10007829\n" +
"41#1007046|1579602765|10011|10011|10007828\n" +
"41#1007046|1579584902|10011|10011|10007776\n" +
"41#1007046|1579583787|10011|10011|10007764\n" +
"41#1007046|1579560213|10011|10011|10007673\n" +
"41#1007046|1579558587|10011|10011|10007664\n" +
"41#1007046|1579556209|10011|10011|10007660\n" +
"41#1007046|1579547585|10011|10011|10007618\n" +
"41#1007046|1572434507|10011|10011|10007321\n" +
"2#1007046|1592786276|10011|10011|10010405\n" +
"2#1007046|1592628863|10011|10011|10010382\n" +
"2#1007046|1592212380|10011|10011|10010308\n" +
"2#1007046|1591682639|10011|10011|10010233\n" +
"2#1007046|1591629344|10011|10011|10010198\n" +
"2#1007046|1591562324|10011|10011|10010155\n" +
"2#1007046|1591357966|10011|10011|10010045\n" +
"2#1007046|1591255988|10011|10011|10009993\n" +
"2#1007046|1591162578|10011|10011|10009940\n" +
"2#1007046|1591017980|10011|10011|10009872\n" +
"2#1007046|1590978232|10011|10011|10009856\n" +
"2#1007046|1590943494|10011|10011|10009841\n" +
"2#1007046|1590905635|10011|10011|10009830\n" +
"2#1007046|1590897932|10011|10011|10009826\n" +
"2#1007046|1590857357|10011|10011|10009807\n" +
"2#1007046|1590788679|10011|10011|10009777\n" +
"2#1007046|1590788097|10011|10011|10009776\n" +
"2#1007046|1590484179|10011|10011|10009646\n" +
"2#1007046|1590375401|10011|10011|10009596\n" +
"2#1007046|1590315885|10011|10011|10009517\n" +
"2#1007046|1590302228|10011|10011|10009485\n" +
"2#1007046|1590228218|10011|10011|10009341\n" +
"2#1007046|1590228066|10011|10011|10009335\n" +
"2#1007046|1590166249|10011|10011|10009202\n" +
"2#1007046|1590163311|10011|10011|10009195\n" +
"2#1007046|1590146148|10011|10011|10009169\n" +
"2#1007046|1590140215|10011|10011|10009160\n" +
"2#1007046|1590111325|10011|10011|10009122\n" +
"2#1007046|1590090162|10011|10011|10009089\n" +
"2#1007046|1590070394|10011|10011|10009068\n" +
"2#1007046|1590039615|10011|10011|10009025\n" +
"2#1007046|1589918028|10011|10011|10008849\n" +
"2#1007046|1589905274|10011|10011|10008839\n" +
"2#1007046|1589900760|10011|10011|10008828\n" +
"2#1007046|1589896164|10011|10011|10008816\n" +
"2#1007046|1589893899|10011|10011|10008812\n" +
"2#1007046|1589892909|10011|10011|10008840\n" +
"2#1007046|1589842650|10011|10011|10008722\n" +
"2#1007046|1589824653|10011|10011|10008679\n" +
"2#1007046|1589809633|10011|10011|10008661\n" +
"2#1007046|1589803022|10011|10011|10008651\n" +
"2#1007046|1589677809|10011|10011|10008435\n" +
"2#1007046|1589673711|10011|10011|10008430\n" +
"2#1007046|1589622336|10011|10011|10008365\n" +
"2#1007046|1589559593|10011|10011|10008273\n" +
"2#1007046|1589515165|10011|10011|10008186\n" +
"2#1007046|1589446627|10011|10011|10008027\n" +
"2#1007046|1589442506|10011|10011|10008015\n" +
"2#1007046|1589423156|10011|10011|10007975\n" +
"2#1007046|1589408331|10011|10011|10007943\n" +
"2#1007046|1589383680|10011|10011|10007956\n" +
"2#1007046|1589347497|10011|10011|10007771\n" +
"2#1007046|1589335466|10011|10011|10007726\n" +
"2#1007046|1589277575|10011|10011|10007509\n" +
"2#1007046|1589275324|10011|10011|10007495\n" +
"2#1007046|1589258121|10011|10011|10007397\n" +
"2#1007046|1589254993|10011|10011|10007412\n" +
"2#1007046|1581655823|10011|10011|10010226\n" +
"2#1007046|1581162288|10011|10011|10009912\n" +
"2#1007046|1580576464|10011|10011|10009636\n" +
"2#1007046|1580573779|10011|10011|10009635\n" +
"2#1007046|1580483159|10011|10011|10009586\n" +
"2#1007046|1580455142|10011|10011|10009541\n" +
"2#1007046|1580391470|10011|10011|10009418\n" +
"2#1007046|1580370350|10011|10011|10009360\n" +
"2#1007046|1580308310|10011|10011|10009197\n" +
"2#1007046|1580033212|10011|10011|10008734\n" +
"2#1007046|1580015787|10011|10011|10008694\n" +
"2#1007046|1579975989|10011|10011|10008630\n" +
"2#1007046|1579859410|10011|10011|10008410\n" +
"2#1007046|1579762508|10011|10011|10008248\n" +
"2#1007046|1579737619|10011|10011|10008195\n" +
"2#1007046|1579727716|10011|10011|10008174\n" +
"2#1007046|1579709291|10011|10011|10008123\n" +
"2#1007046|1579706178|10011|10011|10008115\n" +
"2#1007046|1579693193|10011|10011|10008086\n" +
"2#1007046|1579679601|10011|10011|10008047\n" +
"2#1007046|1579675249|10011|10011|10008035\n" +
"2#1007046|1579643915|10011|10011|10007960\n" +
"2#1007046|1579643598|10011|10011|10007963\n" +
"2#1007046|1579618237|10011|10011|10007887\n" +
"2#1007046|1579611617|10011|10011|10007864\n" +
"2#1007046|1579578884|10011|10011|10007743\n" +
"2#1007046|1579575610|10011|10011|10007735\n" +
"2#1007046|1579567615|10011|10011|10007875\n" +
"2#1007046|1579554607|10011|10011|10007654\n" +
"2#1007046|1579544513|10011|10011|10007599\n" +
"2#1007046|1579520391|10011|10011|10007497\n" +
"2#1007046|1579516579|10011|10011|10007483\n" +
"2#1007046|1579512072|10011|10011|10007449\n" +
"2#1007046|1579512059|10011|10011|10007447\n" +
"2#1007046|1579510531|10011|10011|10007423\n" +
"2#1007046|1579509632|10011|10011|10007411\n" +
"2#1007046|1579507447|10011|10011|10007578\n" +
"2#1007046|1452374530|10011|10011|10005532\n" +
"2#1007046|1416936652|10011|10011|10007403\n" +
"2#1007046|1414071318|10011|10011|10007529\n" +
"2#1007046|1366237231|10011|10011|10005761\n" +
"2#1007046|1365566167|10011|10011|10003979\n" +
"2#1007046|1365279513|10011|10011|10000731\n" +
"2#1007046|1365263741|10011|10011|10000407\n" +
"2#1007046|1365260594|10011|10011|10000308\n" +
"2#1007046|1365257784|10011|10011|10000280\n" +
"2#1007046|1365254948|10011|10011|10000090\n" +
"2#1007046|1365250820|10011|10011|10000078\n" +
"2#1007046|1364877535|10011|10011|10008239\n" +
"2#1007046|1316437265|10011|10011|10010108\n" +
"2#1007046|1315235997|10011|10011|10001906\n" +
"2#1007046|1315179862|10011|10011|10007464\n" +
"1#1006856|565050818|10011|10011|10007446\n" +
"1#1006856|45334096|10011|10011|10010099\n" +
"1#1006856|1589487986|10011|10011|10008120\n" +
"1#1006856|1579482010|10011|10011|10007484\n" +
"1#1006856|1574897775|10011|10011|10007338\n" +
"1#1006856|1284394587|10011|10011|10007324\n" +
"1#1006856|1283941155|10011|10011|10007308\n" +
"41#1007046|1590093180|10011|10011|10009096\n" +
"41#1007046|1589981355|10011|10011|10008954\n" +
"41#1007046|1589461383|10011|10011|10008064\n" +
"41#1007046|1589335861|10011|10011|10007730\n" +
"41#1007046|1589285232|10011|10011|10007545\n" +
"41#1007046|1581528257|10011|10011|10010131\n" +
"2#1007046|1590353751|10011|10011|10009578\n" +
"2#1007046|1590304117|10011|10011|10009489\n" +
"2#1007046|1580435219|10011|10011|10009501\n" +
"2#1007046|1580169422|10011|10011|10008992\n" +
"2#1007046|1417149222|10011|10011|10007782\n";
String[] split = s.split("\n");
Map<Integer,Integer> userFOrce = new LinkedHashMap<>();
for(String row : split){
userFOrce.put(Integer.parseInt( row.split("\\|")[4]),0);
}
users.forEach(user -> {
if(userFOrce.containsKey(user.getId())){
userFOrce.put(user.getId(),user.getPlayerInfoManager().getMaxForce());
}
System.out.println("the uid=" + user.getId() + " --- " + "amount = " + user.getPlayerInfoManager().getRechargeInfo().getSaveAmt() + "-- force" +user.getPlayerInfoManager().getMaxForce());
});
userFOrce.forEach((k,v)->{
System.out.println(v);
});
/* Query querySize = new Query();
querySize.fields().include("playerManager.level");
long count = mongoTemplate.count(querySize, User.class);
System.out.println(count);
@ -53,8 +419,8 @@ public class MongoTest {
Query query = new Query();
query.with(new Sort(Sort.Direction.DESC,"playerManager.level"));
query.fields().include("playerManager.level");
List<User> users = mongoTemplate.find(query, User.class);
int level = 0;
List<User> users = mongoTemplate.find(query, User.class);*/
/* int level = 0;
Map<Integer,Integer> levelCount = new TreeMap<>();
for(int i = 0 ; i <nums;i++){
level+=users.get(i).getPlayerInfoManager().getLevel();
@ -68,7 +434,7 @@ public class MongoTest {
for(Map.Entry<Integer,Integer> item : levelCount.entrySet()){
System.out.println("level :=" + item.getKey() + " count:=" + item.getValue());
}
System.out.println("计算世界等级为{}"+(level/nums));
System.out.println("计算世界等级为{}"+(level/nums));*/
// MongoClientURI mongoClientURI = new MongoClientURI("mongodb://rwuser:JkA!6VE@Gj@cMqu@139.9.84.15:8635/test?authSource=admin");