From f48e9bfb0f4479524ba6d2d91a58a66c6e373166 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 7 Feb 2024 10:06:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=89=E6=B6=88=20=E9=9A=8F=E6=9C=BA?= =?UTF-8?q?=E6=B6=88=E9=99=A4N=20=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/entertainment/xxlPlat.go | 4 +- pb/battle_struct.pb.go | 752 +++++++++++++++++-------------- 2 files changed, 425 insertions(+), 331 deletions(-) diff --git a/modules/entertainment/xxlPlat.go b/modules/entertainment/xxlPlat.go index 48c4a1abd..ff3c6bf7d 100644 --- a/modules/entertainment/xxlPlat.go +++ b/modules/entertainment/xxlPlat.go @@ -525,10 +525,10 @@ func (this *MapData) SkillUp(pos int32, color int32, skillid int32, value int32, x = make(map[int]struct{}) switch skillid { - case 1: + case 1: // 随机一组数 randNum := utils.RandomNumbers(0, Total-1, int(value)*2) for _, v := range randNum { - if this.Plat[v].Special > 0 { + if this.Plat[v].Special == 0 { ids = append(ids, v) if len(ids) >= int(value) { break diff --git a/pb/battle_struct.pb.go b/pb/battle_struct.pb.go index d67fdf61b..6a4ffc342 100644 --- a/pb/battle_struct.pb.go +++ b/pb/battle_struct.pb.go @@ -440,14 +440,15 @@ type ComEndFight struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FightId string `protobuf:"bytes,1,opt,name=fightId,proto3" json:"fightId"` - WinSide int32 `protobuf:"varint,2,opt,name=winSide,proto3" json:"winSide"` - GiveUp bool `protobuf:"varint,3,opt,name=giveUp,proto3" json:"giveUp"` //是否主动认输的 - TotalRound int32 `protobuf:"varint,4,opt,name=totalRound,proto3" json:"totalRound"` //经历回合 - RedDeath int32 `protobuf:"varint,5,opt,name=RedDeath,proto3" json:"RedDeath"` //红方死亡统计 - BuleDeath int32 `protobuf:"varint,6,opt,name=buleDeath,proto3" json:"buleDeath"` //蓝方死亡统计 - Score int32 `protobuf:"varint,7,opt,name=score,proto3" json:"score"` //战斗获得了多少积分 - Grade int32 `protobuf:"varint,8,opt,name=grade,proto3" json:"grade"` //获得到了评分档次 + FightId string `protobuf:"bytes,1,opt,name=fightId,proto3" json:"fightId"` + WinSide int32 `protobuf:"varint,2,opt,name=winSide,proto3" json:"winSide"` + GiveUp bool `protobuf:"varint,3,opt,name=giveUp,proto3" json:"giveUp"` //是否主动认输的 + TotalRound int32 `protobuf:"varint,4,opt,name=totalRound,proto3" json:"totalRound"` //经历回合 + RedDeath int32 `protobuf:"varint,5,opt,name=RedDeath,proto3" json:"RedDeath"` //红方死亡统计 + BuleDeath int32 `protobuf:"varint,6,opt,name=buleDeath,proto3" json:"buleDeath"` //蓝方死亡统计 + Score int32 `protobuf:"varint,7,opt,name=score,proto3" json:"score"` //战斗获得了多少积分 + Grade int32 `protobuf:"varint,8,opt,name=grade,proto3" json:"grade"` //获得到了评分档次 + CompleteTasks []int32 `protobuf:"varint,9,rep,packed,name=completeTasks,proto3" json:"completeTasks"` //完成的任务事件ID } func (x *ComEndFight) Reset() { @@ -538,6 +539,13 @@ func (x *ComEndFight) GetGrade() int32 { return 0 } +func (x *ComEndFight) GetCompleteTasks() []int32 { + if x != nil { + return x.CompleteTasks + } + return nil +} + //技能信息 type ComSkillInfo struct { state protoimpl.MessageState @@ -1352,8 +1360,10 @@ type ComTeachTask struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` - Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count"` + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` + Count int32 `protobuf:"varint,2,opt,name=count,proto3" json:"count"` + Target int32 `protobuf:"varint,3,opt,name=target,proto3" json:"target"` + Complete bool `protobuf:"varint,4,opt,name=complete,proto3" json:"complete"` } func (x *ComTeachTask) Reset() { @@ -1402,6 +1412,67 @@ func (x *ComTeachTask) GetCount() int32 { return 0 } +func (x *ComTeachTask) GetTarget() int32 { + if x != nil { + return x.Target + } + return 0 +} + +func (x *ComTeachTask) GetComplete() bool { + if x != nil { + return x.Complete + } + return false +} + +type ComTeachTaskList struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Tasks []*ComTeachTask `protobuf:"bytes,1,rep,name=tasks,proto3" json:"tasks"` +} + +func (x *ComTeachTaskList) Reset() { + *x = ComTeachTaskList{} + if protoimpl.UnsafeEnabled { + mi := &file_battle_battle_struct_proto_msgTypes[17] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ComTeachTaskList) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ComTeachTaskList) ProtoMessage() {} + +func (x *ComTeachTaskList) ProtoReflect() protoreflect.Message { + mi := &file_battle_battle_struct_proto_msgTypes[17] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use ComTeachTaskList.ProtoReflect.Descriptor instead. +func (*ComTeachTaskList) Descriptor() ([]byte, []int) { + return file_battle_battle_struct_proto_rawDescGZIP(), []int{17} +} + +func (x *ComTeachTaskList) GetTasks() []*ComTeachTask { + if x != nil { + return x.Tasks + } + return nil +} + //剧情 type ComStory struct { state protoimpl.MessageState @@ -1415,7 +1486,7 @@ type ComStory struct { func (x *ComStory) Reset() { *x = ComStory{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[17] + mi := &file_battle_battle_struct_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1428,7 +1499,7 @@ func (x *ComStory) String() string { func (*ComStory) ProtoMessage() {} func (x *ComStory) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[17] + mi := &file_battle_battle_struct_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1441,7 +1512,7 @@ func (x *ComStory) ProtoReflect() protoreflect.Message { // Deprecated: Use ComStory.ProtoReflect.Descriptor instead. func (*ComStory) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{17} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{18} } func (x *ComStory) GetId() int32 { @@ -1471,7 +1542,7 @@ type ComGuide struct { func (x *ComGuide) Reset() { *x = ComGuide{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[18] + mi := &file_battle_battle_struct_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1484,7 +1555,7 @@ func (x *ComGuide) String() string { func (*ComGuide) ProtoMessage() {} func (x *ComGuide) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[18] + mi := &file_battle_battle_struct_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1497,7 +1568,7 @@ func (x *ComGuide) ProtoReflect() protoreflect.Message { // Deprecated: Use ComGuide.ProtoReflect.Descriptor instead. func (*ComGuide) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{18} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{19} } func (x *ComGuide) GetId() int32 { @@ -1529,7 +1600,7 @@ type ComCreateRoles struct { func (x *ComCreateRoles) Reset() { *x = ComCreateRoles{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[19] + mi := &file_battle_battle_struct_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1542,7 +1613,7 @@ func (x *ComCreateRoles) String() string { func (*ComCreateRoles) ProtoMessage() {} func (x *ComCreateRoles) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[19] + mi := &file_battle_battle_struct_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1555,7 +1626,7 @@ func (x *ComCreateRoles) ProtoReflect() protoreflect.Message { // Deprecated: Use ComCreateRoles.ProtoReflect.Descriptor instead. func (*ComCreateRoles) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{19} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{20} } func (x *ComCreateRoles) GetSide() int32 { @@ -1599,7 +1670,7 @@ type ComPlayEffect struct { func (x *ComPlayEffect) Reset() { *x = ComPlayEffect{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[20] + mi := &file_battle_battle_struct_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1612,7 +1683,7 @@ func (x *ComPlayEffect) String() string { func (*ComPlayEffect) ProtoMessage() {} func (x *ComPlayEffect) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[20] + mi := &file_battle_battle_struct_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1625,7 +1696,7 @@ func (x *ComPlayEffect) ProtoReflect() protoreflect.Message { // Deprecated: Use ComPlayEffect.ProtoReflect.Descriptor instead. func (*ComPlayEffect) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{20} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{21} } func (x *ComPlayEffect) GetEffectName() string { @@ -1654,7 +1725,7 @@ type ComEmitCountdown struct { func (x *ComEmitCountdown) Reset() { *x = ComEmitCountdown{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[21] + mi := &file_battle_battle_struct_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1667,7 +1738,7 @@ func (x *ComEmitCountdown) String() string { func (*ComEmitCountdown) ProtoMessage() {} func (x *ComEmitCountdown) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[21] + mi := &file_battle_battle_struct_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1680,7 +1751,7 @@ func (x *ComEmitCountdown) ProtoReflect() protoreflect.Message { // Deprecated: Use ComEmitCountdown.ProtoReflect.Descriptor instead. func (*ComEmitCountdown) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{21} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{22} } func (x *ComEmitCountdown) GetReserve() int32 { @@ -1703,7 +1774,7 @@ type ComEffectTips struct { func (x *ComEffectTips) Reset() { *x = ComEffectTips{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[22] + mi := &file_battle_battle_struct_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1716,7 +1787,7 @@ func (x *ComEffectTips) String() string { func (*ComEffectTips) ProtoMessage() {} func (x *ComEffectTips) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[22] + mi := &file_battle_battle_struct_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1729,7 +1800,7 @@ func (x *ComEffectTips) ProtoReflect() protoreflect.Message { // Deprecated: Use ComEffectTips.ProtoReflect.Descriptor instead. func (*ComEffectTips) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{22} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{23} } func (x *ComEffectTips) GetType() EffectTipsType { @@ -1758,7 +1829,7 @@ type ComChainEffect struct { func (x *ComChainEffect) Reset() { *x = ComChainEffect{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[23] + mi := &file_battle_battle_struct_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1771,7 +1842,7 @@ func (x *ComChainEffect) String() string { func (*ComChainEffect) ProtoMessage() {} func (x *ComChainEffect) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[23] + mi := &file_battle_battle_struct_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1784,7 +1855,7 @@ func (x *ComChainEffect) ProtoReflect() protoreflect.Message { // Deprecated: Use ComChainEffect.ProtoReflect.Descriptor instead. func (*ComChainEffect) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{23} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{24} } func (x *ComChainEffect) GetRoles() []int32 { @@ -1808,7 +1879,7 @@ type ComShieldInfo struct { func (x *ComShieldInfo) Reset() { *x = ComShieldInfo{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[24] + mi := &file_battle_battle_struct_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1821,7 +1892,7 @@ func (x *ComShieldInfo) String() string { func (*ComShieldInfo) ProtoMessage() {} func (x *ComShieldInfo) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[24] + mi := &file_battle_battle_struct_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1834,7 +1905,7 @@ func (x *ComShieldInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use ComShieldInfo.ProtoReflect.Descriptor instead. func (*ComShieldInfo) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{24} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{25} } func (x *ComShieldInfo) GetRid() int32 { @@ -1871,7 +1942,7 @@ type ComBuffEffect struct { func (x *ComBuffEffect) Reset() { *x = ComBuffEffect{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[25] + mi := &file_battle_battle_struct_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1884,7 +1955,7 @@ func (x *ComBuffEffect) String() string { func (*ComBuffEffect) ProtoMessage() {} func (x *ComBuffEffect) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[25] + mi := &file_battle_battle_struct_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1897,7 +1968,7 @@ func (x *ComBuffEffect) ProtoReflect() protoreflect.Message { // Deprecated: Use ComBuffEffect.ProtoReflect.Descriptor instead. func (*ComBuffEffect) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{25} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{26} } func (x *ComBuffEffect) GetRid() int32 { @@ -1925,7 +1996,7 @@ type ComSwitchScene struct { func (x *ComSwitchScene) Reset() { *x = ComSwitchScene{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[26] + mi := &file_battle_battle_struct_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1938,7 +2009,7 @@ func (x *ComSwitchScene) String() string { func (*ComSwitchScene) ProtoMessage() {} func (x *ComSwitchScene) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[26] + mi := &file_battle_battle_struct_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1951,7 +2022,7 @@ func (x *ComSwitchScene) ProtoReflect() protoreflect.Message { // Deprecated: Use ComSwitchScene.ProtoReflect.Descriptor instead. func (*ComSwitchScene) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{26} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{27} } func (x *ComSwitchScene) GetScene() string { @@ -1973,7 +2044,7 @@ type ComReplaceSkill struct { func (x *ComReplaceSkill) Reset() { *x = ComReplaceSkill{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[27] + mi := &file_battle_battle_struct_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1986,7 +2057,7 @@ func (x *ComReplaceSkill) String() string { func (*ComReplaceSkill) ProtoMessage() {} func (x *ComReplaceSkill) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[27] + mi := &file_battle_battle_struct_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1999,7 +2070,7 @@ func (x *ComReplaceSkill) ProtoReflect() protoreflect.Message { // Deprecated: Use ComReplaceSkill.ProtoReflect.Descriptor instead. func (*ComReplaceSkill) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{27} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{28} } func (x *ComReplaceSkill) GetTo() int32 { @@ -2031,7 +2102,7 @@ type ComExtraEffect struct { func (x *ComExtraEffect) Reset() { *x = ComExtraEffect{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[28] + mi := &file_battle_battle_struct_proto_msgTypes[29] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2044,7 +2115,7 @@ func (x *ComExtraEffect) String() string { func (*ComExtraEffect) ProtoMessage() {} func (x *ComExtraEffect) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[28] + mi := &file_battle_battle_struct_proto_msgTypes[29] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2057,7 +2128,7 @@ func (x *ComExtraEffect) ProtoReflect() protoreflect.Message { // Deprecated: Use ComExtraEffect.ProtoReflect.Descriptor instead. func (*ComExtraEffect) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{28} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{29} } func (x *ComExtraEffect) GetFrom() int32 { @@ -2101,7 +2172,7 @@ type ComTriggerPassive struct { func (x *ComTriggerPassive) Reset() { *x = ComTriggerPassive{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[29] + mi := &file_battle_battle_struct_proto_msgTypes[30] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2114,7 +2185,7 @@ func (x *ComTriggerPassive) String() string { func (*ComTriggerPassive) ProtoMessage() {} func (x *ComTriggerPassive) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[29] + mi := &file_battle_battle_struct_proto_msgTypes[30] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2127,7 +2198,7 @@ func (x *ComTriggerPassive) ProtoReflect() protoreflect.Message { // Deprecated: Use ComTriggerPassive.ProtoReflect.Descriptor instead. func (*ComTriggerPassive) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{29} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{30} } func (x *ComTriggerPassive) GetFrom() int32 { @@ -2157,7 +2228,7 @@ type ComUpdateScore struct { func (x *ComUpdateScore) Reset() { *x = ComUpdateScore{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[30] + mi := &file_battle_battle_struct_proto_msgTypes[31] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2170,7 +2241,7 @@ func (x *ComUpdateScore) String() string { func (*ComUpdateScore) ProtoMessage() {} func (x *ComUpdateScore) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[30] + mi := &file_battle_battle_struct_proto_msgTypes[31] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2183,7 +2254,7 @@ func (x *ComUpdateScore) ProtoReflect() protoreflect.Message { // Deprecated: Use ComUpdateScore.ProtoReflect.Descriptor instead. func (*ComUpdateScore) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{30} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{31} } func (x *ComUpdateScore) GetGroupId() int32 { @@ -2219,7 +2290,7 @@ type ComExtraScore struct { func (x *ComExtraScore) Reset() { *x = ComExtraScore{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[31] + mi := &file_battle_battle_struct_proto_msgTypes[32] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2232,7 +2303,7 @@ func (x *ComExtraScore) String() string { func (*ComExtraScore) ProtoMessage() {} func (x *ComExtraScore) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[31] + mi := &file_battle_battle_struct_proto_msgTypes[32] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2245,7 +2316,7 @@ func (x *ComExtraScore) ProtoReflect() protoreflect.Message { // Deprecated: Use ComExtraScore.ProtoReflect.Descriptor instead. func (*ComExtraScore) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{31} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{32} } func (x *ComExtraScore) GetExtraSocre() int32 { @@ -2275,7 +2346,7 @@ type ComExtraStage struct { func (x *ComExtraStage) Reset() { *x = ComExtraStage{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[32] + mi := &file_battle_battle_struct_proto_msgTypes[33] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2288,7 +2359,7 @@ func (x *ComExtraStage) String() string { func (*ComExtraStage) ProtoMessage() {} func (x *ComExtraStage) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[32] + mi := &file_battle_battle_struct_proto_msgTypes[33] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2301,7 +2372,7 @@ func (x *ComExtraStage) ProtoReflect() protoreflect.Message { // Deprecated: Use ComExtraStage.ProtoReflect.Descriptor instead. func (*ComExtraStage) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{32} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{33} } func (x *ComExtraStage) GetStage() int32 { @@ -2337,7 +2408,7 @@ type ComInBattleMaxScore struct { func (x *ComInBattleMaxScore) Reset() { *x = ComInBattleMaxScore{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[33] + mi := &file_battle_battle_struct_proto_msgTypes[34] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2350,7 +2421,7 @@ func (x *ComInBattleMaxScore) String() string { func (*ComInBattleMaxScore) ProtoMessage() {} func (x *ComInBattleMaxScore) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[33] + mi := &file_battle_battle_struct_proto_msgTypes[34] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2363,7 +2434,7 @@ func (x *ComInBattleMaxScore) ProtoReflect() protoreflect.Message { // Deprecated: Use ComInBattleMaxScore.ProtoReflect.Descriptor instead. func (*ComInBattleMaxScore) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{33} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{34} } func (x *ComInBattleMaxScore) GetGroupId() int32 { @@ -2393,7 +2464,7 @@ type ComBuffSpecialEffect struct { func (x *ComBuffSpecialEffect) Reset() { *x = ComBuffSpecialEffect{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[34] + mi := &file_battle_battle_struct_proto_msgTypes[35] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2406,7 +2477,7 @@ func (x *ComBuffSpecialEffect) String() string { func (*ComBuffSpecialEffect) ProtoMessage() {} func (x *ComBuffSpecialEffect) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[34] + mi := &file_battle_battle_struct_proto_msgTypes[35] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2419,7 +2490,7 @@ func (x *ComBuffSpecialEffect) ProtoReflect() protoreflect.Message { // Deprecated: Use ComBuffSpecialEffect.ProtoReflect.Descriptor instead. func (*ComBuffSpecialEffect) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{34} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{35} } func (x *ComBuffSpecialEffect) GetRid() int32 { @@ -2458,7 +2529,7 @@ type ComSyncProperty struct { func (x *ComSyncProperty) Reset() { *x = ComSyncProperty{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_struct_proto_msgTypes[35] + mi := &file_battle_battle_struct_proto_msgTypes[36] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2471,7 +2542,7 @@ func (x *ComSyncProperty) String() string { func (*ComSyncProperty) ProtoMessage() {} func (x *ComSyncProperty) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_struct_proto_msgTypes[35] + mi := &file_battle_battle_struct_proto_msgTypes[36] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2484,7 +2555,7 @@ func (x *ComSyncProperty) ProtoReflect() protoreflect.Message { // Deprecated: Use ComSyncProperty.ProtoReflect.Descriptor instead. func (*ComSyncProperty) Descriptor() ([]byte, []int) { - return file_battle_battle_struct_proto_rawDescGZIP(), []int{35} + return file_battle_battle_struct_proto_rawDescGZIP(), []int{36} } func (x *ComSyncProperty) GetRid() int32 { @@ -2549,7 +2620,7 @@ var file_battle_battle_struct_proto_rawDesc = []byte{ 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x1f, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x22, 0xdf, 0x01, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x45, + 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x22, 0x85, 0x02, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x45, 0x6e, 0x64, 0x46, 0x69, 0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, @@ -2563,214 +2634,223 @@ var file_battle_battle_struct_proto_rawDesc = []byte{ 0x28, 0x05, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x44, 0x65, 0x61, 0x74, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x18, 0x08, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x22, 0x98, 0x01, 0x0a, 0x0c, 0x43, 0x6f, - 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, - 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, - 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x02, 0x6c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x78, 0x43, 0x64, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x61, 0x78, 0x43, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x63, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x68, - 0x6f, 0x77, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, - 0x73, 0x68, 0x6f, 0x77, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x43, 0x61, - 0x6e, 0x45, 0x6d, 0x69, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x43, 0x61, 0x6e, - 0x45, 0x6d, 0x69, 0x74, 0x22, 0xbd, 0x01, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x53, 0x74, 0x61, 0x72, - 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x74, - 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, - 0x67, 0x65, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x52, 0x6f, 0x75, 0x6e, - 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x52, 0x6f, - 0x75, 0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, - 0x16, 0x0a, 0x06, 0x63, 0x61, 0x6e, 0x41, 0x74, 0x6b, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x06, 0x63, 0x61, 0x6e, 0x41, 0x74, 0x6b, 0x12, 0x2b, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, - 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6d, - 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, - 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x53, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, - 0x43, 0x44, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x2b, 0x0a, 0x09, - 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x0d, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, - 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x23, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, - 0x53, 0x74, 0x6f, 0x70, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, - 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x22, 0x89, - 0x01, 0x0a, 0x11, 0x43, 0x6f, 0x6d, 0x57, 0x61, 0x69, 0x74, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x53, - 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x75, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x04, 0x61, 0x75, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, - 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, - 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x1a, - 0x0a, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0xc0, 0x01, 0x0a, 0x0b, 0x43, - 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x41, 0x74, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, - 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x18, - 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, - 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, - 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, - 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x2b, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, - 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, - 0x6c, 0x6c, 0x41, 0x66, 0x74, 0x65, 0x72, 0x41, 0x74, 0x6b, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x4c, - 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x7e, 0x0a, - 0x10, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x41, 0x66, 0x74, 0x65, 0x72, 0x41, 0x74, - 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x66, - 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, - 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, - 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x24, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, - 0x73, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x43, 0x6d, 0x64, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x9a, 0x01, - 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x4d, 0x6f, 0x6e, 0x64, 0x69, 0x66, 0x79, 0x42, 0x75, 0x66, 0x66, - 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, - 0x12, 0x10, 0x0a, 0x03, 0x67, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x67, - 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x76, - 0x65, 0x72, 0x6c, 0x61, 0x70, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, - 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x70, 0x4e, 0x75, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x02, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, - 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x07, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x22, 0x40, 0x0a, 0x0a, 0x43, 0x6f, - 0x6d, 0x52, 0x65, 0x62, 0x69, 0x72, 0x74, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x68, 0x70, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x68, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x68, - 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x68, 0x70, 0x22, 0x8a, 0x02, 0x0a, - 0x0f, 0x43, 0x6f, 0x6d, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, - 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, - 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, - 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x61, 0x6f, 0x6a, 0x69, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x05, 0x62, 0x61, 0x6f, 0x6a, 0x69, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, - 0x64, 0x65, 0x44, 0x6d, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x68, 0x69, 0x64, - 0x65, 0x44, 0x6d, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x54, 0x79, - 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, - 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x02, 0x52, 0x03, 0x6e, 0x75, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x68, 0x70, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x68, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x68, 0x70, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x68, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, - 0x61, 0x6c, 0x48, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x61, 0x6c, - 0x48, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x6d, 0x67, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x03, 0x64, 0x6d, 0x67, 0x12, 0x23, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x0b, 0x20, 0x01, - 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, - 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x34, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, - 0x54, 0x65, 0x61, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, - 0x34, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, - 0x74, 0x6f, 0x72, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, - 0x6f, 0x72, 0x79, 0x49, 0x64, 0x22, 0x34, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x47, 0x75, 0x69, 0x64, - 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x64, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x67, 0x75, 0x69, 0x64, 0x65, 0x49, 0x64, 0x22, 0x7f, 0x0a, 0x0e, 0x43, - 0x6f, 0x6d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x73, 0x12, 0x12, 0x0a, - 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, - 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x08, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64, 0x12, 0x1a, 0x0a, - 0x08, 0x70, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x08, 0x70, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x72, 0x6f, 0x6c, - 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x4b, 0x0a, 0x0d, - 0x43, 0x6f, 0x6d, 0x50, 0x6c, 0x61, 0x79, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x1e, 0x0a, - 0x0a, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0a, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, - 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x50, 0x61, 0x74, 0x68, 0x22, 0x2c, 0x0a, 0x10, 0x43, 0x6f, 0x6d, - 0x45, 0x6d, 0x69, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x12, 0x18, 0x0a, - 0x07, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x22, 0x44, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x45, 0x66, - 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x12, 0x23, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, - 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, - 0x02, 0x74, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x22, 0x26, 0x0a, - 0x0e, 0x43, 0x6f, 0x6d, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, - 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, - 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x53, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x53, 0x68, 0x69, 0x65, - 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1a, - 0x0a, 0x08, 0x63, 0x75, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x08, 0x63, 0x75, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x39, 0x0a, 0x0d, 0x43, 0x6f, - 0x6d, 0x42, 0x75, 0x66, 0x66, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x72, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, - 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, - 0x75, 0x66, 0x66, 0x49, 0x64, 0x22, 0x26, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x53, 0x77, 0x69, 0x74, - 0x63, 0x68, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x65, 0x6e, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x22, 0x4e, 0x0a, - 0x0f, 0x43, 0x6f, 0x6d, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, - 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, - 0x12, 0x2b, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, - 0x66, 0x6f, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x66, 0x0a, - 0x0e, 0x43, 0x6f, 0x6d, 0x45, 0x78, 0x74, 0x72, 0x61, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, - 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, - 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, - 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x74, - 0x61, 0x72, 0x67, 0x65, 0x74, 0x22, 0x37, 0x0a, 0x11, 0x43, 0x6f, 0x6d, 0x54, 0x72, 0x69, 0x67, - 0x67, 0x65, 0x72, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, - 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x56, - 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x63, 0x6f, 0x72, 0x65, - 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, - 0x61, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, - 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x22, 0x43, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x45, 0x78, 0x74, - 0x72, 0x61, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, 0x74, 0x72, 0x61, - 0x53, 0x6f, 0x63, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x65, 0x78, 0x74, - 0x72, 0x61, 0x53, 0x6f, 0x63, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x74, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x74, 0x65, 0x22, 0x61, 0x0a, 0x0d, 0x43, - 0x6f, 0x6d, 0x45, 0x78, 0x74, 0x72, 0x61, 0x53, 0x74, 0x61, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, - 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, - 0x67, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x68, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x67, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x73, 0x68, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x67, 0x65, - 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x78, 0x74, 0x72, 0x61, 0x52, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x09, 0x65, 0x78, 0x74, 0x72, 0x61, 0x52, 0x61, 0x74, 0x65, 0x22, 0x45, - 0x0a, 0x13, 0x43, 0x6f, 0x6d, 0x49, 0x6e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4d, 0x61, 0x78, - 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, - 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, - 0x67, 0x72, 0x61, 0x64, 0x65, 0x22, 0x52, 0x0a, 0x14, 0x43, 0x6f, 0x6d, 0x42, 0x75, 0x66, 0x66, - 0x53, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x10, 0x0a, - 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, - 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x64, 0x64, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x61, 0x64, 0x64, 0x22, 0x61, 0x0a, 0x0f, 0x43, 0x6f, 0x6d, - 0x53, 0x79, 0x6e, 0x63, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x0e, - 0x0a, 0x02, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x02, 0x68, 0x70, 0x12, 0x14, - 0x0a, 0x05, 0x6d, 0x61, 0x78, 0x48, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, - 0x61, 0x78, 0x48, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x61, 0x6c, 0x48, 0x70, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x61, 0x6c, 0x48, 0x70, 0x2a, 0x93, 0x03, 0x0a, - 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, - 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, - 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, - 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, 0x10, 0x02, 0x12, - 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x69, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x4e, - 0x6f, 0x74, 0x5f, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, - 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, - 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, - 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, 0x0c, 0x0a, 0x08, - 0x44, 0x69, 0x73, 0x70, 0x65, 0x72, 0x73, 0x65, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x61, - 0x69, 0x6e, 0x5f, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x09, 0x12, 0x0f, 0x0a, 0x0b, 0x41, 0x64, - 0x64, 0x5f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0a, 0x12, 0x0f, 0x0a, 0x0b, 0x53, - 0x75, 0x62, 0x5f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0b, 0x12, 0x0c, 0x0a, 0x08, - 0x53, 0x74, 0x61, 0x6e, 0x64, 0x6f, 0x66, 0x66, 0x10, 0x0c, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x6e, - 0x64, 0x65, 0x61, 0x64, 0x10, 0x0d, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x6f, 0x69, 0x73, 0x6f, 0x6e, - 0x65, 0x64, 0x10, 0x0e, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x6c, 0x65, 0x65, 0x64, 0x10, 0x0f, 0x12, - 0x0c, 0x0a, 0x08, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x10, 0x10, 0x12, 0x0c, 0x0a, - 0x08, 0x42, 0x65, 0x61, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x10, 0x11, 0x12, 0x0c, 0x0a, 0x08, 0x44, - 0x69, 0x73, 0x65, 0x61, 0x73, 0x65, 0x64, 0x10, 0x12, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x6f, 0x73, - 0x74, 0x48, 0x6f, 0x6c, 0x64, 0x10, 0x13, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x6e, 0x64, 0x65, 0x72, - 0x53, 0x74, 0x61, 0x6e, 0x64, 0x10, 0x14, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x69, 0x6e, - 0x63, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x10, 0x15, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x74, - 0x65, 0x61, 0x6c, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x16, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x68, 0x69, - 0x66, 0x74, 0x44, 0x65, 0x62, 0x75, 0x66, 0x66, 0x10, 0x17, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x65, - 0x62, 0x69, 0x72, 0x74, 0x68, 0x10, 0x18, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x72, 0x6f, 0x69, 0x6c, - 0x10, 0x19, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, + 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x05, + 0x52, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x22, + 0x98, 0x01, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, + 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, + 0x78, 0x43, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x61, 0x78, 0x43, 0x64, + 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x63, 0x64, + 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x68, 0x6f, 0x77, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x68, 0x6f, 0x77, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, + 0x12, 0x18, 0x0a, 0x07, 0x43, 0x61, 0x6e, 0x45, 0x6d, 0x69, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x07, 0x43, 0x61, 0x6e, 0x45, 0x6d, 0x69, 0x74, 0x22, 0xbd, 0x01, 0x0a, 0x0e, 0x43, + 0x6f, 0x6d, 0x53, 0x74, 0x61, 0x72, 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, + 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, + 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x77, 0x6e, + 0x65, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6f, + 0x77, 0x6e, 0x65, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, + 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, + 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x61, 0x6e, 0x41, 0x74, 0x6b, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x61, 0x6e, 0x41, 0x74, 0x6b, 0x12, 0x2b, 0x0a, + 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, + 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x53, 0x0a, 0x10, 0x43, 0x6f, + 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x43, 0x44, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, + 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, + 0x6f, 0x6d, 0x12, 0x2b, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, + 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, + 0x23, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x53, 0x74, 0x6f, 0x70, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, + 0x66, 0x72, 0x6f, 0x6d, 0x22, 0x89, 0x01, 0x0a, 0x11, 0x43, 0x6f, 0x6d, 0x57, 0x61, 0x69, 0x74, + 0x49, 0x6e, 0x70, 0x75, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x75, + 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x61, 0x75, 0x74, 0x6f, 0x12, 0x12, + 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, + 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, + 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, + 0x72, 0x67, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, + 0x22, 0xc0, 0x01, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x41, 0x74, 0x6b, + 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, + 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69, 0x64, 0x12, 0x0e, + 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x14, + 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x2b, 0x0a, 0x07, + 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, + 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x41, 0x66, 0x74, 0x65, 0x72, 0x41, 0x74, 0x6b, + 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x6e, 0x69, + 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x6e, 0x69, 0x4e, + 0x61, 0x6d, 0x65, 0x22, 0x7e, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x41, + 0x66, 0x74, 0x65, 0x72, 0x41, 0x74, 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69, + 0x64, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, + 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x24, 0x0a, + 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, + 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x4c, + 0x69, 0x73, 0x74, 0x22, 0x9a, 0x01, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x4d, 0x6f, 0x6e, 0x64, 0x69, + 0x66, 0x79, 0x42, 0x75, 0x66, 0x66, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x67, 0x69, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x03, 0x67, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, + 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, + 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x70, 0x4e, 0x75, 0x6d, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x70, 0x4e, 0x75, 0x6d, + 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x02, 0x52, + 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, + 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, + 0x22, 0x40, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x52, 0x65, 0x62, 0x69, 0x72, 0x74, 0x68, 0x12, 0x0e, + 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x10, + 0x0a, 0x03, 0x6e, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x68, 0x70, + 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x68, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, + 0x68, 0x70, 0x22, 0x8a, 0x02, 0x0a, 0x0f, 0x43, 0x6f, 0x6d, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, + 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x61, + 0x6f, 0x6a, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x62, 0x61, 0x6f, 0x6a, 0x69, + 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x64, 0x65, 0x44, 0x6d, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x07, 0x68, 0x69, 0x64, 0x65, 0x44, 0x6d, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x6f, + 0x64, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, + 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x75, + 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x02, 0x52, 0x03, 0x6e, 0x75, 0x6d, 0x12, 0x10, 0x0a, 0x03, + 0x6e, 0x68, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x68, 0x70, 0x12, 0x10, + 0x0a, 0x03, 0x6d, 0x68, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x68, 0x70, + 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x61, 0x6c, 0x48, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x06, 0x73, 0x65, 0x61, 0x6c, 0x48, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x6d, 0x67, 0x18, + 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x64, 0x6d, 0x67, 0x12, 0x23, 0x0a, 0x04, 0x74, 0x69, + 0x70, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x45, 0x66, 0x66, 0x65, 0x63, + 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, + 0x68, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x54, 0x65, 0x61, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, + 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x1a, 0x0a, + 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x22, 0x37, 0x0a, 0x10, 0x43, 0x6f, 0x6d, + 0x54, 0x65, 0x61, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x23, 0x0a, + 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, + 0x6f, 0x6d, 0x54, 0x65, 0x61, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, + 0x6b, 0x73, 0x22, 0x34, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, + 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x49, 0x64, 0x22, 0x34, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x47, + 0x75, 0x69, 0x64, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x64, 0x65, 0x49, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x75, 0x69, 0x64, 0x65, 0x49, 0x64, 0x22, 0x7f, + 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x73, + 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, + 0x73, 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64, + 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x05, + 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, + 0x4b, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x50, 0x6c, 0x61, 0x79, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, + 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, + 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x50, 0x61, 0x74, 0x68, 0x22, 0x2c, 0x0a, 0x10, + 0x43, 0x6f, 0x6d, 0x45, 0x6d, 0x69, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, + 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x22, 0x44, 0x0a, 0x0d, 0x43, 0x6f, + 0x6d, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x12, 0x23, 0x0a, 0x04, 0x74, + 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x45, 0x66, 0x66, 0x65, + 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, + 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, + 0x22, 0x26, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x45, 0x66, 0x66, 0x65, + 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x05, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x53, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x53, + 0x68, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x39, 0x0a, + 0x0d, 0x43, 0x6f, 0x6d, 0x42, 0x75, 0x66, 0x66, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x10, + 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, + 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x22, 0x26, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x53, + 0x77, 0x69, 0x74, 0x63, 0x68, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, + 0x65, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x63, 0x65, 0x6e, 0x65, + 0x22, 0x4e, 0x0a, 0x0f, 0x43, 0x6f, 0x6d, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x53, 0x6b, + 0x69, 0x6c, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x02, 0x74, 0x6f, 0x12, 0x2b, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, + 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, + 0x22, 0x66, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x45, 0x78, 0x74, 0x72, 0x61, 0x45, 0x66, 0x66, 0x65, + 0x63, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, + 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, + 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x22, 0x37, 0x0a, 0x11, 0x43, 0x6f, 0x6d, 0x54, + 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x12, 0x12, 0x0a, + 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, + 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, + 0x64, 0x22, 0x56, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x63, + 0x6f, 0x72, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x14, 0x0a, + 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, + 0x61, 0x64, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x22, 0x43, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, + 0x45, 0x78, 0x74, 0x72, 0x61, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, + 0x74, 0x72, 0x61, 0x53, 0x6f, 0x63, 0x72, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, + 0x65, 0x78, 0x74, 0x72, 0x61, 0x53, 0x6f, 0x63, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, + 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x74, 0x65, 0x22, 0x61, + 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x45, 0x78, 0x74, 0x72, 0x61, 0x53, 0x74, 0x61, 0x67, 0x65, 0x12, + 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x73, 0x74, 0x61, 0x67, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x68, 0x6f, 0x77, 0x53, 0x74, 0x61, + 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x73, 0x68, 0x6f, 0x77, 0x53, 0x74, + 0x61, 0x67, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x78, 0x74, 0x72, 0x61, 0x52, 0x61, 0x74, 0x65, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x65, 0x78, 0x74, 0x72, 0x61, 0x52, 0x61, 0x74, + 0x65, 0x22, 0x45, 0x0a, 0x13, 0x43, 0x6f, 0x6d, 0x49, 0x6e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x4d, 0x61, 0x78, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, + 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, + 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x22, 0x52, 0x0a, 0x14, 0x43, 0x6f, 0x6d, 0x42, + 0x75, 0x66, 0x66, 0x53, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, + 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, + 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x64, + 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x61, 0x64, 0x64, 0x22, 0x61, 0x0a, 0x0f, + 0x43, 0x6f, 0x6d, 0x53, 0x79, 0x6e, 0x63, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, + 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x02, 0x52, 0x02, 0x68, + 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x78, 0x48, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x6d, 0x61, 0x78, 0x48, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x61, 0x6c, 0x48, + 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x61, 0x6c, 0x48, 0x70, 0x2a, + 0x93, 0x03, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, + 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, + 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, + 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, + 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x69, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0c, + 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x5f, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, + 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, + 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, + 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, + 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x70, 0x65, 0x72, 0x73, 0x65, 0x10, 0x08, 0x12, 0x0e, 0x0a, + 0x0a, 0x47, 0x61, 0x69, 0x6e, 0x5f, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x09, 0x12, 0x0f, 0x0a, + 0x0b, 0x41, 0x64, 0x64, 0x5f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0a, 0x12, 0x0f, + 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x5f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0b, 0x12, + 0x0c, 0x0a, 0x08, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x6f, 0x66, 0x66, 0x10, 0x0c, 0x12, 0x0a, 0x0a, + 0x06, 0x55, 0x6e, 0x64, 0x65, 0x61, 0x64, 0x10, 0x0d, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x6f, 0x69, + 0x73, 0x6f, 0x6e, 0x65, 0x64, 0x10, 0x0e, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x6c, 0x65, 0x65, 0x64, + 0x10, 0x0f, 0x12, 0x0c, 0x0a, 0x08, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x10, 0x10, + 0x12, 0x0c, 0x0a, 0x08, 0x42, 0x65, 0x61, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x10, 0x11, 0x12, 0x0c, + 0x0a, 0x08, 0x44, 0x69, 0x73, 0x65, 0x61, 0x73, 0x65, 0x64, 0x10, 0x12, 0x12, 0x0c, 0x0a, 0x08, + 0x4c, 0x6f, 0x73, 0x74, 0x48, 0x6f, 0x6c, 0x64, 0x10, 0x13, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x6e, + 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x10, 0x14, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, + 0x76, 0x69, 0x6e, 0x63, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x10, 0x15, 0x12, 0x0d, 0x0a, + 0x09, 0x53, 0x74, 0x65, 0x61, 0x6c, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x16, 0x12, 0x0f, 0x0a, 0x0b, + 0x53, 0x68, 0x69, 0x66, 0x74, 0x44, 0x65, 0x62, 0x75, 0x66, 0x66, 0x10, 0x17, 0x12, 0x0b, 0x0a, + 0x07, 0x52, 0x65, 0x62, 0x69, 0x72, 0x74, 0x68, 0x10, 0x18, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x72, + 0x6f, 0x69, 0x6c, 0x10, 0x19, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2786,7 +2866,7 @@ func file_battle_battle_struct_proto_rawDescGZIP() []byte { } var file_battle_battle_struct_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_battle_battle_struct_proto_msgTypes = make([]protoimpl.MessageInfo, 36) +var file_battle_battle_struct_proto_msgTypes = make([]protoimpl.MessageInfo, 37) var file_battle_battle_struct_proto_goTypes = []interface{}{ (EffectTipsType)(0), // 0: EffectTipsType (*DBPlayerBattleFormt)(nil), // 1: DBPlayerBattleFormt @@ -2806,45 +2886,47 @@ var file_battle_battle_struct_proto_goTypes = []interface{}{ (*ComRebirth)(nil), // 15: ComRebirth (*ComModifyHealth)(nil), // 16: ComModifyHealth (*ComTeachTask)(nil), // 17: ComTeachTask - (*ComStory)(nil), // 18: ComStory - (*ComGuide)(nil), // 19: ComGuide - (*ComCreateRoles)(nil), // 20: ComCreateRoles - (*ComPlayEffect)(nil), // 21: ComPlayEffect - (*ComEmitCountdown)(nil), // 22: ComEmitCountdown - (*ComEffectTips)(nil), // 23: ComEffectTips - (*ComChainEffect)(nil), // 24: ComChainEffect - (*ComShieldInfo)(nil), // 25: ComShieldInfo - (*ComBuffEffect)(nil), // 26: ComBuffEffect - (*ComSwitchScene)(nil), // 27: ComSwitchScene - (*ComReplaceSkill)(nil), // 28: ComReplaceSkill - (*ComExtraEffect)(nil), // 29: ComExtraEffect - (*ComTriggerPassive)(nil), // 30: ComTriggerPassive - (*ComUpdateScore)(nil), // 31: ComUpdateScore - (*ComExtraScore)(nil), // 32: ComExtraScore - (*ComExtraStage)(nil), // 33: ComExtraStage - (*ComInBattleMaxScore)(nil), // 34: ComInBattleMaxScore - (*ComBuffSpecialEffect)(nil), // 35: ComBuffSpecialEffect - (*ComSyncProperty)(nil), // 36: ComSyncProperty - (*DBHero)(nil), // 37: DBHero - (*BattleRole)(nil), // 38: BattleRole - (*BattleCmd)(nil), // 39: BattleCmd + (*ComTeachTaskList)(nil), // 18: ComTeachTaskList + (*ComStory)(nil), // 19: ComStory + (*ComGuide)(nil), // 20: ComGuide + (*ComCreateRoles)(nil), // 21: ComCreateRoles + (*ComPlayEffect)(nil), // 22: ComPlayEffect + (*ComEmitCountdown)(nil), // 23: ComEmitCountdown + (*ComEffectTips)(nil), // 24: ComEffectTips + (*ComChainEffect)(nil), // 25: ComChainEffect + (*ComShieldInfo)(nil), // 26: ComShieldInfo + (*ComBuffEffect)(nil), // 27: ComBuffEffect + (*ComSwitchScene)(nil), // 28: ComSwitchScene + (*ComReplaceSkill)(nil), // 29: ComReplaceSkill + (*ComExtraEffect)(nil), // 30: ComExtraEffect + (*ComTriggerPassive)(nil), // 31: ComTriggerPassive + (*ComUpdateScore)(nil), // 32: ComUpdateScore + (*ComExtraScore)(nil), // 33: ComExtraScore + (*ComExtraStage)(nil), // 34: ComExtraStage + (*ComInBattleMaxScore)(nil), // 35: ComInBattleMaxScore + (*ComBuffSpecialEffect)(nil), // 36: ComBuffSpecialEffect + (*ComSyncProperty)(nil), // 37: ComSyncProperty + (*DBHero)(nil), // 38: DBHero + (*BattleRole)(nil), // 39: BattleRole + (*BattleCmd)(nil), // 40: BattleCmd } var file_battle_battle_struct_proto_depIdxs = []int32{ - 37, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero - 38, // 1: ComInitFight.roles:type_name -> BattleRole + 38, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero + 39, // 1: ComInitFight.roles:type_name -> BattleRole 7, // 2: ComStartAction.skillInfo:type_name -> ComSkillInfo 7, // 3: ComSkillCDAction.skillInfo:type_name -> ComSkillInfo 13, // 4: ComSkillAtk.comList:type_name -> ComSkillAfterAtk - 39, // 5: ComSkillAfterAtk.comList:type_name -> BattleCmd + 40, // 5: ComSkillAfterAtk.comList:type_name -> BattleCmd 0, // 6: ComModifyHealth.tips:type_name -> EffectTipsType - 38, // 7: ComCreateRoles.roles:type_name -> BattleRole - 0, // 8: ComEffectTips.type:type_name -> EffectTipsType - 7, // 9: ComReplaceSkill.skillInfo:type_name -> ComSkillInfo - 10, // [10:10] is the sub-list for method output_type - 10, // [10:10] is the sub-list for method input_type - 10, // [10:10] is the sub-list for extension type_name - 10, // [10:10] is the sub-list for extension extendee - 0, // [0:10] is the sub-list for field type_name + 17, // 7: ComTeachTaskList.tasks:type_name -> ComTeachTask + 39, // 8: ComCreateRoles.roles:type_name -> BattleRole + 0, // 9: ComEffectTips.type:type_name -> EffectTipsType + 7, // 10: ComReplaceSkill.skillInfo:type_name -> ComSkillInfo + 11, // [11:11] is the sub-list for method output_type + 11, // [11:11] is the sub-list for method input_type + 11, // [11:11] is the sub-list for extension type_name + 11, // [11:11] is the sub-list for extension extendee + 0, // [0:11] is the sub-list for field type_name } func init() { file_battle_battle_struct_proto_init() } @@ -3061,7 +3143,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComStory); i { + switch v := v.(*ComTeachTaskList); i { case 0: return &v.state case 1: @@ -3073,7 +3155,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComGuide); i { + switch v := v.(*ComStory); i { case 0: return &v.state case 1: @@ -3085,7 +3167,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComCreateRoles); i { + switch v := v.(*ComGuide); i { case 0: return &v.state case 1: @@ -3097,7 +3179,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComPlayEffect); i { + switch v := v.(*ComCreateRoles); i { case 0: return &v.state case 1: @@ -3109,7 +3191,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComEmitCountdown); i { + switch v := v.(*ComPlayEffect); i { case 0: return &v.state case 1: @@ -3121,7 +3203,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComEffectTips); i { + switch v := v.(*ComEmitCountdown); i { case 0: return &v.state case 1: @@ -3133,7 +3215,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComChainEffect); i { + switch v := v.(*ComEffectTips); i { case 0: return &v.state case 1: @@ -3145,7 +3227,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComShieldInfo); i { + switch v := v.(*ComChainEffect); i { case 0: return &v.state case 1: @@ -3157,7 +3239,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComBuffEffect); i { + switch v := v.(*ComShieldInfo); i { case 0: return &v.state case 1: @@ -3169,7 +3251,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComSwitchScene); i { + switch v := v.(*ComBuffEffect); i { case 0: return &v.state case 1: @@ -3181,7 +3263,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComReplaceSkill); i { + switch v := v.(*ComSwitchScene); i { case 0: return &v.state case 1: @@ -3193,7 +3275,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComExtraEffect); i { + switch v := v.(*ComReplaceSkill); i { case 0: return &v.state case 1: @@ -3205,7 +3287,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComTriggerPassive); i { + switch v := v.(*ComExtraEffect); i { case 0: return &v.state case 1: @@ -3217,7 +3299,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComUpdateScore); i { + switch v := v.(*ComTriggerPassive); i { case 0: return &v.state case 1: @@ -3229,7 +3311,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComExtraScore); i { + switch v := v.(*ComUpdateScore); i { case 0: return &v.state case 1: @@ -3241,7 +3323,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComExtraStage); i { + switch v := v.(*ComExtraScore); i { case 0: return &v.state case 1: @@ -3253,7 +3335,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComInBattleMaxScore); i { + switch v := v.(*ComExtraStage); i { case 0: return &v.state case 1: @@ -3265,7 +3347,7 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ComBuffSpecialEffect); i { + switch v := v.(*ComInBattleMaxScore); i { case 0: return &v.state case 1: @@ -3277,6 +3359,18 @@ func file_battle_battle_struct_proto_init() { } } file_battle_battle_struct_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ComBuffSpecialEffect); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_battle_battle_struct_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ComSyncProperty); i { case 0: return &v.state @@ -3295,7 +3389,7 @@ func file_battle_battle_struct_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_battle_battle_struct_proto_rawDesc, NumEnums: 1, - NumMessages: 36, + NumMessages: 37, NumExtensions: 0, NumServices: 0, }, From abc98613354bebeb04ad6283c5e4b9b57aaa2629 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 7 Feb 2024 11:54:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_equippos.json | 30 +++++++++++++++++++ bin/json/game_monsterformat.json | 3 +- bin/json/game_repeatall.json | 34 +++++++++++++++++++++- bin/json/game_skillafteratk.json | 49 ++++++++++++++++++++++++++++++++ bin/json/game_skillatk.json | 33 +++++++++++++++++++++ bin/json/game_skillbuff.json | 38 +++++++++++++++++++++++++ bin/json/game_skillpassive.json | 26 +++++++++++++++++ 7 files changed, 211 insertions(+), 2 deletions(-) diff --git a/bin/json/game_equippos.json b/bin/json/game_equippos.json index f7389ab3d..cb486062b 100644 --- a/bin/json/game_equippos.json +++ b/bin/json/game_equippos.json @@ -1,4 +1,34 @@ [ + { + "pos": 0, + "suitnum": 4, + "leadlibrary": [ + 56, + 59, + 53, + 57, + 60, + 54, + 62, + 65, + 68, + 71, + 74 + ], + "addlibrary": [ + 56, + 59, + 53, + 57, + 60, + 54, + 62, + 65, + 68, + 71, + 74 + ] + }, { "pos": 1, "suitnum": 4, diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 64860dbe2..538220b83 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -1899,7 +1899,8 @@ "star": 3, "equip": [], "newskill": [ - 100000004 + 100000004, + 100000007 ], "lv": 30, "hppro": 100, diff --git a/bin/json/game_repeatall.json b/bin/json/game_repeatall.json index 0637a088a..54a0362c3 100644 --- a/bin/json/game_repeatall.json +++ b/bin/json/game_repeatall.json @@ -1 +1,33 @@ -[] \ No newline at end of file +[ + { + "key": 101, + "optionName": { + "key": "optionName_01", + "text": "薅羊毛" + }, + "model": "彩蛋-薅羊毛-羊", + "actionType": 1, + "actionParam": "1#explore", + "num": 1, + "triggerWeight": [ + 100, + 0 + ], + "triggerOne": [ + 7000050 + ], + "triggerTwo": [ + { + "a": "item", + "t": "10000001", + "n": 1 + } + ], + "triggerThree": 0, + "cdText": { + "key": "cdText_01", + "text": "羊毛需要一点时间生长" + }, + "cdtime": 10 + } +] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 7ed3f995f..40604dc7b 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -41841,6 +41841,55 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 200000007, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "TriggerAnim": "", + "Type": 2, + "Argu": [ + 400000007, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 200000008, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "TriggerAnim": "", + "Type": 3, + "Argu": [ + 390001562, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 211021011, "EmitPR": 1000, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 7260a44a8..853fd4534 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -62035,6 +62035,39 @@ "buffid": [], "map": "" }, + { + "id": 100000007, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Priority": 0, + "Name": { + "key": "skill_skill_atk_Name_100000007", + "text": "" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 200000007 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_100000007_1", + "text": "伤害增加" + }, + "buffid": [], + "map": "" + }, { "id": 185001001, "level": 1, diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 062e06ad3..60bc4a127 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -9730,6 +9730,44 @@ "forbidFloat": 0, "ReplaceBuffID": 0 }, + { + "Id": 390001562, + "Name": { + "key": "skill_skill_buff_Name_390001562", + "text": "[color=#37d8a9]伤害提升[/color]" + }, + "Desc": { + "key": "skill_skill_buff_Desc_390001562", + "text": "造成伤害提升。" + }, + "BuffType": 33, + "EffectArgu": [ + 0, + 500 + ], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 3 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 10, + "SameID": false, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "", + "buffpos": "根节点", + "AddTrigger": 0, + "TriggerEffect": "", + "TriggerPos": "", + "TriggerAnim": "", + "forbidFloat": 0, + "ReplaceBuffID": 0 + }, { "Id": 391000000, "Name": { diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index e208422e6..7d304aac2 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -3988,6 +3988,32 @@ 200001702 ] }, + { + "Id": 400000007, + "Name": { + "key": "skill_skill_passive_Name_400000007", + "text": "" + }, + "icon": "", + "When": 21, + "FromCheck": "Target=3", + "TargetCheck": "Target=3", + "MainSkillCheck": "", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "TriggerAnim": "", + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 0, + "MaxEmitTimesInRound": 1, + "Callback": [ + 200000008 + ] + }, { "Id": 400001901, "Name": { From f5a253f6abbb84a81a341c3f75ba978f03dd3d6f Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 7 Feb 2024 14:58:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B2=A1=E5=88=9B=E8=A7=92=20=E4=B8=8D?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=8E=A0=E5=A4=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/plunder/api_getlist.go | 11 ++++++----- modules/plunder/model_plunder.go | 5 +++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/modules/plunder/api_getlist.go b/modules/plunder/api_getlist.go index 9eb100664..c0767fd2c 100644 --- a/modules/plunder/api_getlist.go +++ b/modules/plunder/api_getlist.go @@ -113,11 +113,12 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PlunderGetListRe if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { uinfo := comm.GetUserBaseInfo(user) if !reflect.DeepEqual(uinfo, list.Uinfo) { + list.Uinfo = uinfo update["uinfo"] = uinfo // 同步岛屿上的信息 var lock *redis.RedisMutex lock, err = this.module.modelLand.landMutexLock(list.Landid) - lock.Lock() + err = lock.Lock() if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, @@ -128,16 +129,16 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PlunderGetListRe } defer lock.Unlock() - for _, v := range land.Uinfo { - if v == list.Uinfo { - v = uinfo + for pos, v := range land.Uinfo { + if v.Uid == uinfo.Uid { + land.Uinfo[pos] = uinfo this.module.modelLand.changePlunderLandData(list.Landid, map[string]interface{}{ "uinfo": land.Uinfo, }) break } } - list.Uinfo = uinfo + } } if len(update) > 0 { diff --git a/modules/plunder/model_plunder.go b/modules/plunder/model_plunder.go index 12815d4b5..867034ab0 100644 --- a/modules/plunder/model_plunder.go +++ b/modules/plunder/model_plunder.go @@ -1,6 +1,7 @@ package plunder import ( + "fmt" "go_dreamfactory/comm" "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/mgo" @@ -75,6 +76,10 @@ func (this *modelPlunder) getPlunderData(session comm.IUserSession) (info *pb.DB this.module.Errorln(err) return } + if user.Name == "" { // 临时处理没创角不让进 后面走功能开启配置 + err = fmt.Errorf("getPlunderData need create ") + return + } info = &pb.DBPlunder{ Id: primitive.NewObjectID().Hex(), Uid: session.GetUserId(), From 6e45a0924d00e3fdaf63a59dfd79874ff35e3200 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 7 Feb 2024 16:34:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_buriedcondi.json | 10 +- bin/json/game_mainstage.json | 8 +- bin/json/game_monsterformat.json | 802 +++++++++++++++---------------- bin/json/game_moontask.json | 52 +- bin/json/game_opencond.json | 138 +++--- bin/json/game_rdtasknpc.json | 16 +- bin/json/game_worldtask.json | 16 +- 7 files changed, 521 insertions(+), 521 deletions(-) diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 1f927fc86..1b0f94dd4 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -34108,7 +34108,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1114", - "text": "辉月等级达到2级" + "text": "辉月等级达到1级" }, "type": 242, "valid": 0, @@ -34138,7 +34138,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1115", - "text": "辉月等级达到3级" + "text": "辉月等级达到2级" }, "type": 242, "valid": 0, @@ -34168,7 +34168,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1116", - "text": "辉月等级达到4级" + "text": "辉月等级达到3级" }, "type": 242, "valid": 0, @@ -34198,7 +34198,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1117", - "text": "辉月等级达到5级" + "text": "辉月等级达到4级" }, "type": 242, "valid": 0, @@ -34228,7 +34228,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1118", - "text": "辉月等级达到6级" + "text": "辉月等级达到5级" }, "type": 242, "valid": 0, diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 285ab14ed..47f356cdc 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -20392,7 +20392,7 @@ "scene_effect": [ "shandian" ], - "scene_effectfilter": "", + "scene_effectfilter": "camera_filter_10", "is_near": false, "openlevel": 1, "EditorStage": 0, @@ -20478,7 +20478,7 @@ "scene_effect": [ "shandian" ], - "scene_effectfilter": "", + "scene_effectfilter": "camera_filter_10", "is_near": false, "openlevel": 1, "EditorStage": 0, @@ -20612,7 +20612,7 @@ "scene_effect": [ "shandian" ], - "scene_effectfilter": "", + "scene_effectfilter": "camera_filter_10", "is_near": false, "openlevel": 1, "EditorStage": 0, @@ -20746,7 +20746,7 @@ "scene_effect": [ "shandian" ], - "scene_effectfilter": "", + "scene_effectfilter": "camera_filter_10", "is_near": false, "openlevel": 1, "EditorStage": 0, diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 538220b83..3a818cdbd 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -4740,7 +4740,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.5, + "hppro": 1.5, "atkpro": 3, "defpro": 1, "skill1": 1, @@ -4761,7 +4761,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.5, + "hppro": 1.5, "atkpro": 3, "defpro": 1, "skill1": 1, @@ -4782,7 +4782,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2.5, + "hppro": 1.5, "atkpro": 3, "defpro": 1, "skill1": 1, @@ -4845,7 +4845,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2, + "hppro": 2.5, "atkpro": 3, "defpro": 1, "skill1": 1, @@ -4866,7 +4866,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2, + "hppro": 2.5, "atkpro": 3, "defpro": 1, "skill1": 1, @@ -4887,7 +4887,7 @@ "equip": [], "newskill": [], "lv": 60, - "hppro": 2, + "hppro": 2.5, "atkpro": 3, "defpro": 1, "skill1": 1, @@ -141034,7 +141034,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141055,7 +141055,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141076,7 +141076,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141097,7 +141097,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141118,7 +141118,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141139,7 +141139,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141160,7 +141160,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141181,7 +141181,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141202,7 +141202,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141223,7 +141223,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141244,7 +141244,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141265,7 +141265,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141286,7 +141286,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141307,7 +141307,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.8, + "atkpro": 0.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -141328,7 +141328,7 @@ "newskill": [], "lv": 10, "hppro": 0.3, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141349,7 +141349,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141370,7 +141370,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141391,7 +141391,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141412,7 +141412,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141433,7 +141433,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141454,7 +141454,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141475,7 +141475,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141496,7 +141496,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141517,7 +141517,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141538,7 +141538,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141559,7 +141559,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141580,7 +141580,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141601,7 +141601,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141622,7 +141622,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 1.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141643,7 +141643,7 @@ "newskill": [], "lv": 15, "hppro": 0.4, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141664,7 +141664,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141685,7 +141685,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141706,7 +141706,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141727,7 +141727,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141748,7 +141748,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141769,7 +141769,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141790,7 +141790,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141811,7 +141811,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141832,7 +141832,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141853,7 +141853,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141874,7 +141874,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141895,7 +141895,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141916,7 +141916,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 0.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -141937,7 +141937,7 @@ "newskill": [], "lv": 20, "hppro": 0.5, - "atkpro": 1.5, + "atkpro": 0.3, "defpro": 0.3, "skill1": 1, "skill2": 1, @@ -144813,7 +144813,7 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, "defpro": 0.8, "skill1": 1, @@ -144834,9 +144834,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -144855,9 +144855,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -144876,9 +144876,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -144897,9 +144897,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -144918,9 +144918,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -144939,9 +144939,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -144960,9 +144960,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -144981,9 +144981,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145002,9 +145002,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145023,9 +145023,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145044,9 +145044,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145065,9 +145065,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145086,9 +145086,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 2, + "hppro": 0.3, "atkpro": 1, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145107,9 +145107,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145128,9 +145128,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145149,9 +145149,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145170,9 +145170,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145191,9 +145191,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145212,9 +145212,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145233,9 +145233,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145254,9 +145254,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145275,9 +145275,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145296,9 +145296,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145317,9 +145317,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145338,9 +145338,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145359,9 +145359,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145380,9 +145380,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145401,9 +145401,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 2.5, + "hppro": 0.3, "atkpro": 1.2, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145422,9 +145422,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145443,9 +145443,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145464,9 +145464,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145485,9 +145485,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145506,9 +145506,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145527,9 +145527,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145548,9 +145548,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145569,9 +145569,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145590,9 +145590,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145611,9 +145611,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145632,9 +145632,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145653,9 +145653,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145674,9 +145674,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145695,9 +145695,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 1.5, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145716,9 +145716,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 3, + "hppro": 0.3, "atkpro": 1.3, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -145737,9 +145737,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 1.5, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148593,7 +148593,7 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, "defpro": 0.8, "skill1": 1, @@ -148614,9 +148614,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148635,9 +148635,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148656,9 +148656,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148677,9 +148677,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148698,9 +148698,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148719,9 +148719,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148740,9 +148740,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148761,9 +148761,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148782,9 +148782,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148803,9 +148803,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148824,9 +148824,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148845,9 +148845,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148866,9 +148866,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.3, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148887,9 +148887,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148908,9 +148908,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148929,9 +148929,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148950,9 +148950,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148971,9 +148971,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -148992,9 +148992,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149013,9 +149013,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149034,9 +149034,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149055,9 +149055,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149076,9 +149076,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149097,9 +149097,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149118,9 +149118,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149139,9 +149139,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149160,9 +149160,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 1.5, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149181,9 +149181,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 2, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149202,9 +149202,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 1.5, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149223,9 +149223,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149244,9 +149244,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149265,9 +149265,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149286,9 +149286,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149307,9 +149307,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149328,9 +149328,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149349,9 +149349,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149370,9 +149370,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149391,9 +149391,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149412,9 +149412,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149433,9 +149433,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149454,9 +149454,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149475,9 +149475,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 2, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149496,9 +149496,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 4, + "hppro": 0.3, "atkpro": 0.9, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -149517,9 +149517,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 2, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152373,9 +152373,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152394,9 +152394,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152415,9 +152415,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152436,9 +152436,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152457,9 +152457,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152478,9 +152478,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152499,9 +152499,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152520,9 +152520,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152541,9 +152541,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152562,9 +152562,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152583,9 +152583,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152604,9 +152604,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152625,9 +152625,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152646,7 +152646,7 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 2, + "hppro": 0.3, "atkpro": 0.4, "defpro": 0.3, "skill1": 1, @@ -152667,9 +152667,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152688,9 +152688,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152709,9 +152709,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152730,9 +152730,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152751,9 +152751,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152772,9 +152772,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152793,9 +152793,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152814,9 +152814,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152835,9 +152835,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152856,9 +152856,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152877,9 +152877,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152898,9 +152898,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152919,9 +152919,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152940,9 +152940,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 1.5, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -152961,7 +152961,7 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 3, + "hppro": 0.3, "atkpro": 0.4, "defpro": 0.3, "skill1": 1, @@ -152982,9 +152982,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 1.5, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153003,9 +153003,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153024,9 +153024,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153045,9 +153045,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153066,9 +153066,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153087,9 +153087,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153108,9 +153108,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153129,9 +153129,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153150,9 +153150,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153171,9 +153171,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153192,9 +153192,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153213,9 +153213,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153234,9 +153234,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153255,9 +153255,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 2, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -153276,7 +153276,7 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 4, + "hppro": 0.3, "atkpro": 0.5, "defpro": 0.3, "skill1": 1, @@ -156153,9 +156153,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156174,9 +156174,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156195,9 +156195,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156216,9 +156216,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156237,9 +156237,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156258,9 +156258,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156279,9 +156279,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156300,9 +156300,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156321,9 +156321,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156342,9 +156342,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156363,9 +156363,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156384,9 +156384,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156405,9 +156405,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156426,9 +156426,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 3, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156447,9 +156447,9 @@ "equip": [], "newskill": [], "lv": 10, - "hppro": 1, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156468,9 +156468,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156489,9 +156489,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156510,9 +156510,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156531,9 +156531,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156552,9 +156552,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156573,9 +156573,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156594,9 +156594,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156615,9 +156615,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156636,9 +156636,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156657,9 +156657,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156678,9 +156678,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156699,9 +156699,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156720,9 +156720,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 2, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.5, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156741,9 +156741,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 1.5, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 3, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156762,9 +156762,9 @@ "equip": [], "newskill": [], "lv": 15, - "hppro": 2, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.5, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156783,9 +156783,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156804,9 +156804,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156825,9 +156825,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156846,9 +156846,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156867,9 +156867,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156888,9 +156888,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156909,9 +156909,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156930,9 +156930,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156951,9 +156951,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156972,9 +156972,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -156993,9 +156993,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -157014,9 +157014,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 0.6, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -157035,9 +157035,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 3, + "hppro": 0.3, "atkpro": 0.5, - "defpro": 0.5, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -157056,9 +157056,9 @@ "equip": [], "newskill": [], "lv": 20, - "hppro": 2, + "hppro": 0.3, "atkpro": 0.6, - "defpro": 3, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, diff --git a/bin/json/game_moontask.json b/bin/json/game_moontask.json index a1ef71852..788fcc2e2 100644 --- a/bin/json/game_moontask.json +++ b/bin/json/game_moontask.json @@ -33,7 +33,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 127 }, { "Id": 3, @@ -51,7 +51,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10036 }, { "Id": 4, @@ -69,7 +69,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10013 }, { "Id": 5, @@ -105,7 +105,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 102 }, { "Id": 7, @@ -123,7 +123,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10042 }, { "Id": 8, @@ -141,7 +141,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10042 }, { "Id": 9, @@ -159,7 +159,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 115 }, { "Id": 10, @@ -177,7 +177,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 115 }, { "Id": 11, @@ -195,7 +195,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10022 }, { "Id": 12, @@ -213,7 +213,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10020 }, { "Id": 13, @@ -231,7 +231,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10021 }, { "Id": 14, @@ -249,7 +249,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 11012 }, { "Id": 15, @@ -285,7 +285,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10013 }, { "Id": 17, @@ -303,7 +303,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 102 }, { "Id": 18, @@ -321,7 +321,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 168 }, { "Id": 19, @@ -339,7 +339,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 168 }, { "Id": 20, @@ -357,7 +357,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 155 }, { "Id": 21, @@ -375,7 +375,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10001 }, { "Id": 22, @@ -393,7 +393,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 906 }, { "Id": 23, @@ -411,7 +411,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 102 }, { "Id": 24, @@ -429,7 +429,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 906 }, { "Id": 25, @@ -447,7 +447,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 102 }, { "Id": 26, @@ -465,7 +465,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 906 }, { "Id": 27, @@ -483,7 +483,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10015 }, { "Id": 28, @@ -501,7 +501,7 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10015 }, { "Id": 29, @@ -519,6 +519,6 @@ "n": 50 } ], - "JumpFunction": 0 + "JumpFunction": 10015 } ] \ No newline at end of file diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 6c0d80b89..5f42f8f7a 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -8,7 +8,7 @@ "opencondi": [ 18000001 ], - "wkqbx": 2, + "wkqbx": 0, "img": "ty_icon_shz", "prompt": { "key": "opencond_opencond_prompt_1", @@ -33,7 +33,7 @@ "opencondi": [ 18000002 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_1", @@ -58,7 +58,7 @@ "opencondi": [ 18000003 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_1", @@ -83,7 +83,7 @@ "opencondi": [ 18000004 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_1", @@ -108,7 +108,7 @@ "opencondi": [ 18000005 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_1", @@ -133,7 +133,7 @@ "opencondi": [ 18000006 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_1", @@ -158,7 +158,7 @@ "opencondi": [ 18000007 ], - "wkqbx": 2, + "wkqbx": 0, "img": "zc_icon_08_ct", "prompt": { "key": "opencond_opencond_prompt_2", @@ -183,7 +183,7 @@ "opencondi": [ 18000008 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sd", "prompt": { "key": "opencond_opencond_prompt_3", @@ -208,7 +208,7 @@ "opencondi": [ 18000009 ], - "wkqbx": 2, + "wkqbx": 0, "img": "zc_shuru02", "prompt": { "key": "opencond_opencond_prompt_4", @@ -233,7 +233,7 @@ "opencondi": [ 18000010 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sd", "prompt": { "key": "opencond_opencond_prompt_5", @@ -258,7 +258,7 @@ "opencondi": [ 18000011 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_6", @@ -308,7 +308,7 @@ "opencondi": [ 18000022 ], - "wkqbx": 2, + "wkqbx": 3, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_8", @@ -333,7 +333,7 @@ "opencondi": [ 18000014 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_rw", "prompt": { "key": "opencond_opencond_prompt_9", @@ -358,7 +358,7 @@ "opencondi": [ 18000015 ], - "wkqbx": 2, + "wkqbx": 0, "img": "zc_icon_05_ct", "prompt": { "key": "opencond_opencond_prompt_10", @@ -383,7 +383,7 @@ "opencondi": [ 18000016 ], - "wkqbx": 2, + "wkqbx": 0, "img": "ty_icon_zh", "prompt": { "key": "opencond_opencond_prompt_11", @@ -408,7 +408,7 @@ "opencondi": [ 18000017 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_12", @@ -458,7 +458,7 @@ "opencondi": [ 18000019 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_14", @@ -483,7 +483,7 @@ "opencondi": [ 18000020 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_15", @@ -608,7 +608,7 @@ "opencondi": [ 18000025 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_20", @@ -633,7 +633,7 @@ "opencondi": [ 18000026 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_21", @@ -658,7 +658,7 @@ "opencondi": [ 18000027 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_22", @@ -683,7 +683,7 @@ "opencondi": [ 18000028 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_23", @@ -708,7 +708,7 @@ "opencondi": [ 18000029 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_24", @@ -733,7 +733,7 @@ "opencondi": [ 18000030 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_25", @@ -758,7 +758,7 @@ "opencondi": [ 18000031 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_26", @@ -783,7 +783,7 @@ "opencondi": [ 18000032 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_27", @@ -883,7 +883,7 @@ "opencondi": [ 18000036 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_31", @@ -1033,7 +1033,7 @@ "opencondi": [ 18000042 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_37", @@ -1083,7 +1083,7 @@ "opencondi": [ 18000044 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_39", @@ -1133,7 +1133,7 @@ "opencondi": [ 18000046 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_41", @@ -1158,7 +1158,7 @@ "opencondi": [ 18000047 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_42", @@ -1183,7 +1183,7 @@ "opencondi": [ 18000048 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_43", @@ -1208,7 +1208,7 @@ "opencondi": [ 18000049 ], - "wkqbx": 2, + "wkqbx": 0, "img": "", "prompt": { "key": "", @@ -1233,7 +1233,7 @@ "opencondi": [ 18000050 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_44", @@ -1308,7 +1308,7 @@ "opencondi": [ 18000053 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_47", @@ -1508,7 +1508,7 @@ "opencondi": [ 18000061 ], - "wkqbx": 2, + "wkqbx": 0, "img": "zc_shuru01", "prompt": { "key": "opencond_opencond_prompt_55", @@ -1533,7 +1533,7 @@ "opencondi": [ 18000062 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_56", @@ -1558,7 +1558,7 @@ "opencondi": [ 18000063 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_57", @@ -1583,7 +1583,7 @@ "opencondi": [ 18000064 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_58", @@ -1914,7 +1914,7 @@ "opencondi": [ 18000077 ], - "wkqbx": 3, + "wkqbx": 2, "img": "ty_qp_jx", "prompt": { "key": "opencond_opencond_prompt_71", @@ -2214,7 +2214,7 @@ "opencondi": [ 18000089 ], - "wkqbx": 2, + "wkqbx": 0, "img": "cgt_icon_hfsj", "prompt": { "key": "opencond_opencond_prompt_83", @@ -2239,7 +2239,7 @@ "opencondi": [ 18000090 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_84", @@ -2264,7 +2264,7 @@ "opencondi": [ 18000022 ], - "wkqbx": 2, + "wkqbx": 3, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_84", @@ -2289,7 +2289,7 @@ "opencondi": [ 18000092 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_85", @@ -2316,7 +2316,7 @@ "opencondi": [ 18000093 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_86", @@ -2341,7 +2341,7 @@ "opencondi": [ 18000094 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "opencond_opencond_prompt_87", @@ -2366,7 +2366,7 @@ "opencondi": [ 18000095 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2391,7 +2391,7 @@ "opencondi": [ 18000096 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2416,7 +2416,7 @@ "opencondi": [ 18000097 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2441,7 +2441,7 @@ "opencondi": [ 18000098 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2466,7 +2466,7 @@ "opencondi": [ 18000099 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2491,7 +2491,7 @@ "opencondi": [ 18000100 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2516,7 +2516,7 @@ "opencondi": [ 18000101 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2541,7 +2541,7 @@ "opencondi": [ 18000102 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2566,7 +2566,7 @@ "opencondi": [ 18000103 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2591,7 +2591,7 @@ "opencondi": [ 18000104 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2616,7 +2616,7 @@ "opencondi": [ 18000105 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2641,7 +2641,7 @@ "opencondi": [ 18000106 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2666,7 +2666,7 @@ "opencondi": [ 18000107 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2691,7 +2691,7 @@ "opencondi": [ 18000108 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2716,7 +2716,7 @@ "opencondi": [ 18000109 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2741,7 +2741,7 @@ "opencondi": [ 18000110 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2766,7 +2766,7 @@ "opencondi": [ 18000111 ], - "wkqbx": 2, + "wkqbx": 0, "img": "icon_sytj", "prompt": { "key": "", @@ -2841,7 +2841,7 @@ "opencondi": [ 18000114 ], - "wkqbx": 2, + "wkqbx": 0, "img": "zm_icon_shzl", "prompt": { "key": "", @@ -2891,7 +2891,7 @@ "opencondi": [ 18000116 ], - "wkqbx": 2, + "wkqbx": 0, "img": "", "prompt": { "key": "", @@ -2941,7 +2941,7 @@ "opencondi": [ 18000118 ], - "wkqbx": 2, + "wkqbx": 0, "img": "", "prompt": { "key": "", @@ -2966,7 +2966,7 @@ "opencondi": [ 18000119 ], - "wkqbx": 2, + "wkqbx": 0, "img": "", "prompt": { "key": "", @@ -2991,7 +2991,7 @@ "opencondi": [ 12070430 ], - "wkqbx": 2, + "wkqbx": 0, "img": "", "prompt": { "key": "", @@ -3041,7 +3041,7 @@ "opencondi": [ 18000118 ], - "wkqbx": 2, + "wkqbx": 0, "img": "", "prompt": { "key": "", diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 63e215416..7cda86564 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -481,7 +481,7 @@ }, { "id": 10030, - "heroid": 45001, + "heroid": 45002, "Levelid": 0, "datas": [ "GameMain", @@ -8496,7 +8496,7 @@ }, { "id": 320310, - "heroid": 25001, + "heroid": 35002, "Levelid": 0, "datas": [ "GameMain", @@ -8508,7 +8508,7 @@ }, { "id": 320320, - "heroid": 25001, + "heroid": 13001, "Levelid": 0, "datas": [ "GameMain", @@ -8520,7 +8520,7 @@ }, { "id": 320330, - "heroid": 25001, + "heroid": 33005, "Levelid": 0, "datas": [ "GameMain", @@ -8532,7 +8532,7 @@ }, { "id": 320340, - "heroid": 25001, + "heroid": 53001, "Levelid": 0, "datas": [ "GameMain", @@ -8556,7 +8556,7 @@ }, { "id": 320360, - "heroid": 25001, + "heroid": 14003, "Levelid": 0, "datas": [ "GameMain", @@ -8568,7 +8568,7 @@ }, { "id": 320370, - "heroid": 25001, + "heroid": 14003, "Levelid": 0, "datas": [ "GameMain", @@ -8580,7 +8580,7 @@ }, { "id": 320380, - "heroid": 25001, + "heroid": 35002, "Levelid": 0, "datas": [ "GameMain", diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 85ac3ef4f..4b4355d3f 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -9030,7 +9030,7 @@ "auto_accept": 2, "tasktips": false, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 35002, "lock_add": false, "finish": [], "finishparameter": "", @@ -9073,7 +9073,7 @@ "auto_accept": 2, "tasktips": false, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 13001, "lock_add": false, "finish": [], "finishparameter": "", @@ -9116,7 +9116,7 @@ "auto_accept": 2, "tasktips": false, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 33005, "lock_add": false, "finish": [], "finishparameter": "", @@ -9159,7 +9159,7 @@ "auto_accept": 2, "tasktips": false, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 53001, "lock_add": false, "finish": [], "finishparameter": "", @@ -9202,7 +9202,7 @@ "auto_accept": 2, "tasktips": false, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 25001, "lock_add": false, "finish": [], "finishparameter": "", @@ -9245,7 +9245,7 @@ "auto_accept": 2, "tasktips": false, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 14003, "lock_add": false, "finish": [], "finishparameter": "", @@ -9288,7 +9288,7 @@ "auto_accept": 2, "tasktips": false, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 14003, "lock_add": false, "finish": [], "finishparameter": "", @@ -9331,7 +9331,7 @@ "auto_accept": 2, "tasktips": false, "deliver_task": 1, - "deliver_task_npc": 0, + "deliver_task_npc": 35002, "lock_add": false, "finish": [], "finishparameter": "",