diff --git a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java
index b0683707e..11575e8d9 100644
--- a/bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java
+++ b/bloodybattle/src/main/java/com/ljsd/jieling/protocols/Family.java
@@ -51778,6 +51778,24 @@ public final class Family {
* optional .com.ljsd.jieling.protocols.Drop drop = 3;
*/
com.ljsd.jieling.protocols.CommonProto.DropOrBuilder getDropOrBuilder();
+
+ // optional int32 historyMax = 4;
+ /**
+ * optional int32 historyMax = 4;
+ *
+ *
+ *历史最高伤害 + *+ */ + boolean hasHistoryMax(); + /** + *
optional int32 historyMax = 4;
+ *
+ * + *历史最高伤害 + *+ */ + int getHistoryMax(); } /** * Protobuf type {@code com.ljsd.jieling.protocols.ChallengeDeathPathResponse} @@ -51861,6 +51879,11 @@ public final class Family { bitField0_ |= 0x00000004; break; } + case 32: { + bitField0_ |= 0x00000008; + historyMax_ = input.readInt32(); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -51961,10 +51984,35 @@ public final class Family { return drop_; } + // optional int32 historyMax = 4; + public static final int HISTORYMAX_FIELD_NUMBER = 4; + private int historyMax_; + /** + *
optional int32 historyMax = 4;
+ *
+ * + *历史最高伤害 + *+ */ + public boolean hasHistoryMax() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + *
optional int32 historyMax = 4;
+ *
+ * + *历史最高伤害 + *+ */ + public int getHistoryMax() { + return historyMax_; + } + private void initFields() { fightData_ = com.ljsd.jieling.protocols.CommonProto.FightData.getDefaultInstance(); damage_ = 0; drop_ = com.ljsd.jieling.protocols.CommonProto.Drop.getDefaultInstance(); + historyMax_ = 0; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -51987,6 +52035,9 @@ public final class Family { if (((bitField0_ & 0x00000004) == 0x00000004)) { output.writeMessage(3, drop_); } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeInt32(4, historyMax_); + } getUnknownFields().writeTo(output); } @@ -52008,6 +52059,10 @@ public final class Family { size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, drop_); } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(4, historyMax_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -52140,6 +52195,8 @@ public final class Family { dropBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000004); + historyMax_ = 0; + bitField0_ = (bitField0_ & ~0x00000008); return this; } @@ -52188,6 +52245,10 @@ public final class Family { } else { result.drop_ = dropBuilder_.build(); } + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + result.historyMax_ = historyMax_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -52213,6 +52274,9 @@ public final class Family { if (other.hasDrop()) { mergeDrop(other.getDrop()); } + if (other.hasHistoryMax()) { + setHistoryMax(other.getHistoryMax()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -52507,6 +52571,55 @@ public final class Family { return dropBuilder_; } + // optional int32 historyMax = 4; + private int historyMax_ ; + /** + *
optional int32 historyMax = 4;
+ *
+ * + *历史最高伤害 + *+ */ + public boolean hasHistoryMax() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + *
optional int32 historyMax = 4;
+ *
+ * + *历史最高伤害 + *+ */ + public int getHistoryMax() { + return historyMax_; + } + /** + *
optional int32 historyMax = 4;
+ *
+ * + *历史最高伤害 + *+ */ + public Builder setHistoryMax(int value) { + bitField0_ |= 0x00000008; + historyMax_ = value; + onChanged(); + return this; + } + /** + *
optional int32 historyMax = 4;
+ *
+ * + *历史最高伤害 + *+ */ + public Builder clearHistoryMax() { + bitField0_ = (bitField0_ & ~0x00000008); + historyMax_ = 0; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:com.ljsd.jieling.protocols.ChallengeDeathPathResponse) } @@ -53760,13 +53873,14 @@ public final class Family { " \001(\005\022\026\n\016challengeCount\030\002 \001(\005\0228\n\005infos\030\003 " + "\003(\0132).com.ljsd.jieling.protocols.DeathPa" + "thInfo\"+\n\031ChallengeDeathPathRequest\022\016\n\006p" + - "athId\030\001 \001(\005\"\226\001\n\032ChallengeDeathPathRespon", + "athId\030\001 \001(\005\"\252\001\n\032ChallengeDeathPathRespon", "se\0228\n\tfightData\030\001 \001(\0132%.com.ljsd.jieling" + ".protocols.FightData\022\016\n\006damage\030\002 \001(\005\022.\n\004" + "drop\030\003 \001(\0132 .com.ljsd.jieling.protocols." + - "Drop\"`\n\025CarGrapRecordResponse\022G\n\020carChal" + - "lengeItem\030\001 \003(\0132-.com.ljsd.jieling.proto" + - "cols.CarGrapRecordItemB\002H\001" + "Drop\022\022\n\nhistoryMax\030\004 \001(\005\"`\n\025CarGrapRecor" + + "dResponse\022G\n\020carChallengeItem\030\001 \003(\0132-.co" + + "m.ljsd.jieling.protocols.CarGrapRecordIt" + + "emB\002H\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -54234,7 +54348,7 @@ public final class Family { internal_static_com_ljsd_jieling_protocols_ChallengeDeathPathResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_com_ljsd_jieling_protocols_ChallengeDeathPathResponse_descriptor, - new java.lang.String[] { "FightData", "Damage", "Drop", }); + new java.lang.String[] { "FightData", "Damage", "Drop", "HistoryMax", }); internal_static_com_ljsd_jieling_protocols_CarGrapRecordResponse_descriptor = getDescriptor().getMessageTypes().get(77); internal_static_com_ljsd_jieling_protocols_CarGrapRecordResponse_fieldAccessorTable = new diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java index 33a27ccb0..fc5526592 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java @@ -1,9 +1,6 @@ package com.ljsd.jieling.core; -import com.ljsd.jieling.core.function.ArenaFunction; -import com.ljsd.jieling.core.function.ChampionFunction; -import com.ljsd.jieling.core.function.EndlessFunction; -import com.ljsd.jieling.core.function.GuildBossFunction; +import com.ljsd.jieling.core.function.*; import com.ljsd.jieling.protocols.MessageTypeProto; import java.util.HashMap; @@ -63,7 +60,7 @@ public enum FunctionIdEnum { WorkShopRebuildEquip(104,null,MessageTypeProto.MessageType.WORKSHOP_REBUILD_REQUEST_VALUE), Expedition(64,null), Achieve(65,null), - Car_Delay(73,null), + Car_Delay(73,new CarDelayFunction()), ; private int functionType; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/function/CarDelayFunction.java b/serverlogic/src/main/java/com/ljsd/jieling/core/function/CarDelayFunction.java index aa5d09a27..81c0720eb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/function/CarDelayFunction.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/function/CarDelayFunction.java @@ -1,16 +1,72 @@ package com.ljsd.jieling.core.function; import com.ljsd.jieling.core.FunctionManager; +import com.ljsd.jieling.db.redis.RedisKey; +import com.ljsd.jieling.db.redis.RedisUtil; +import com.ljsd.jieling.globals.Global; +import com.ljsd.jieling.logic.dao.GuilidManager; import com.ljsd.jieling.logic.dao.TimeControllerOfFunction; +import com.ljsd.jieling.logic.dao.UserManager; +import com.ljsd.jieling.logic.dao.root.GuildInfo; +import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.family.GuildFightLogic; +import com.ljsd.jieling.logic.mail.MailLogic; +import config.SErrorCodeEerverConfig; +import config.SWorldBossRewardConfig; +import org.springframework.data.redis.core.ZSetOperations; +import util.StringUtil; +import util.TimeUtils; + +import java.util.*; public class CarDelayFunction implements FunctionManager { @Override public void startAction(TimeControllerOfFunction timeControllerOfFunction) throws Exception { - + List