From e07f9357bfa3539ec96cb7f42bf441af4b794f26 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 21 Sep 2023 14:53:07 +0800
Subject: [PATCH 1/5] =?UTF-8?q?#35313=20=E7=BC=BA=E9=99=B7=20=E3=80=90?=
=?UTF-8?q?=E6=A2=A6=E5=B7=A5=E5=9C=BA=E7=B3=BB=E7=BB=9F=E3=80=91=20<-?=
=?UTF-8?q?=E5=90=8E=E7=AB=AF->=20=E3=80=90=E7=8E=A9=E5=AE=B6=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF=E3=80=91=E5=82=A8=E9=92=B1=E7=BD=90=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=E6=9C=AA=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
comm/const.go | 1 +
modules/user/module.go | 1 +
2 files changed, 2 insertions(+)
diff --git a/comm/const.go b/comm/const.go
index 347dea09a..947093777 100644
--- a/comm/const.go
+++ b/comm/const.go
@@ -533,6 +533,7 @@ const (
Merchantmoney = "merchantmoney" //商队虚拟币
Integral = "integral" //充值积分
Profit = "profit"
+ Deposit = "deposit"
)
const (
Gold int32 = 1 //金币
diff --git a/modules/user/module.go b/modules/user/module.go
index 62d812b17..fb94a58fd 100644
--- a/modules/user/module.go
+++ b/modules/user/module.go
@@ -697,6 +697,7 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha
comm.Merchantmoney: change.Merchantmoney,
comm.Integral: change.Integral,
comm.Profit: change.Profit,
+ comm.Deposit: change.Deposit,
}
//user ex
From a821f8aa6a5f721061b9da3eae48b6ebbfdd985d Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 21 Sep 2023 15:09:07 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E9=81=93=E5=85=B7=E5=8A=A0=E6=88=90?=
=?UTF-8?q?=E8=BE=BE=E4=B8=8A=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/dragon/api_lvitem.go | 5 +-
pb/comm.pb.go | 314 +++++++++++++++++------------------
pb/errorcode.pb.go | 112 +++++++------
3 files changed, 212 insertions(+), 219 deletions(-)
diff --git a/modules/dragon/api_lvitem.go b/modules/dragon/api_lvitem.go
index 30164394d..6bc27fccc 100644
--- a/modules/dragon/api_lvitem.go
+++ b/modules/dragon/api_lvitem.go
@@ -64,9 +64,8 @@ func (this *apiComp) LvItem(session comm.IUserSession, req *pb.DragonLvItemReq)
if curLvConf, err = this.module.configure.GetDragonLvItemConf(req.Attribute, dragon.Lvitem[req.Attribute]); err == nil {
if upLvConf, err = this.module.configure.GetDragonLvItemConf(req.Attribute, dragon.Lvitem[req.Attribute]+1); err == nil {
errdata = &pb.ErrorData{
- Code: pb.ErrorCode_ConfigNoFound,
- Title: pb.ErrorCode_ConfigNoFound.ToString(),
- Message: err.Error(),
+ Code: pb.ErrorCode_DragonMaxLvItem,
+ Title: pb.ErrorCode_DragonMaxLvItem.ToString(),
}
return
}
diff --git a/pb/comm.pb.go b/pb/comm.pb.go
index d8a6fc330..f42b021ff 100644
--- a/pb/comm.pb.go
+++ b/pb/comm.pb.go
@@ -411,9 +411,8 @@ type RPCMessageReply struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- ServiceId string `protobuf:"bytes,1,opt,name=ServiceId,proto3" json:"ServiceId"`
- ErrorData *ErrorData `protobuf:"bytes,2,opt,name=ErrorData,proto3" json:"ErrorData"`
- Reply []*UserMessage `protobuf:"bytes,3,rep,name=Reply,proto3" json:"Reply"`
+ ErrorData *ErrorData `protobuf:"bytes,1,opt,name=ErrorData,proto3" json:"ErrorData"`
+ Reply []*UserMessage `protobuf:"bytes,2,rep,name=Reply,proto3" json:"Reply"`
}
func (x *RPCMessageReply) Reset() {
@@ -448,13 +447,6 @@ func (*RPCMessageReply) Descriptor() ([]byte, []int) {
return file_comm_proto_rawDescGZIP(), []int{4}
}
-func (x *RPCMessageReply) GetServiceId() string {
- if x != nil {
- return x.ServiceId
- }
- return ""
-}
-
func (x *RPCMessageReply) GetErrorData() *ErrorData {
if x != nil {
return x.ErrorData
@@ -2094,64 +2086,51 @@ var file_comm_proto_rawDesc = []byte{
0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2e, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x07, 0x4d,
- 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x7d, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x4d, 0x65, 0x73,
- 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x65, 0x72,
- 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x53, 0x65,
- 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72,
- 0x44, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72,
- 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74,
- 0x61, 0x12, 0x22, 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
- 0x32, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x05,
- 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x69, 0x0a, 0x0d, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x75,
- 0x69, 0x6c, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65,
- 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55,
- 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06,
- 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73,
- 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x49, 0x64,
- 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x49, 0x64,
- 0x22, 0x37, 0x0a, 0x0f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x42, 0x75, 0x69, 0x6c, 0x64,
- 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69,
- 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72,
- 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x5f, 0x0a, 0x13, 0x41, 0x67, 0x65,
- 0x6e, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71,
- 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49,
- 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73,
- 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x18,
- 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73,
- 0x61, 0x67, 0x65, 0x52, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x99, 0x01, 0x0a, 0x0f, 0x42,
- 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x26,
- 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73,
- 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73,
- 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79,
- 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79,
- 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x04,
- 0x44, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f,
- 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79,
- 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x75, 0x0a, 0x13, 0x42, 0x72, 0x6f, 0x61, 0x64, 0x43,
- 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a,
- 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
- 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62,
- 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54,
- 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28,
- 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x36, 0x0a,
- 0x0e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12,
- 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73,
- 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0xae, 0x01, 0x0a, 0x12, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65,
- 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02,
- 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d,
- 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
- 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65,
- 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
- 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61,
- 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72,
- 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0xaf, 0x01, 0x0a, 0x13, 0x4e, 0x6f, 0x74, 0x69, 0x63,
- 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e,
+ 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x5f, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x4d, 0x65, 0x73,
+ 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x28, 0x0a, 0x09, 0x45, 0x72, 0x72,
+ 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x45,
+ 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44,
+ 0x61, 0x74, 0x61, 0x12, 0x22, 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x18, 0x02, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+ 0x52, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x69, 0x0a, 0x0d, 0x41, 0x67, 0x65, 0x6e, 0x74,
+ 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72,
+ 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16,
+ 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+ 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72,
+ 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72,
+ 0x49, 0x64, 0x22, 0x37, 0x0a, 0x0f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x42, 0x75, 0x69,
+ 0x6c, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73,
+ 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73,
+ 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x5f, 0x0a, 0x13, 0x41,
+ 0x67, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52,
+ 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f,
+ 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53,
+ 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c,
+ 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65,
+ 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x99, 0x01, 0x0a,
+ 0x0f, 0x42, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71,
+ 0x12, 0x26, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49,
+ 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65,
+ 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e,
+ 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e,
+ 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18,
+ 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28,
+ 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67,
+ 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41,
+ 0x6e, 0x79, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x75, 0x0a, 0x13, 0x42, 0x72, 0x6f, 0x61,
+ 0x64, 0x43, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12,
+ 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53,
+ 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75,
+ 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+ 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22,
+ 0x36, 0x0a, 0x0e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x65, 0x52, 0x65,
+ 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
+ 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65,
+ 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0xae, 0x01, 0x0a, 0x12, 0x4e, 0x6f, 0x74, 0x69,
+ 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x0e,
0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24,
0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18,
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69,
@@ -2161,105 +2140,116 @@ var file_comm_proto_rawDesc = []byte{
0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10,
0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64,
0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53,
- 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0xae, 0x01, 0x0a, 0x12, 0x4e, 0x6f, 0x74,
- 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12,
- 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12,
- 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73,
- 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18,
- 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a,
- 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a,
- 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49,
- 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79,
- 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0x3f, 0x0a, 0x09, 0x53, 0x6b, 0x69,
- 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49,
- 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44,
- 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0x36, 0x0a, 0x0a, 0x55, 0x73,
- 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x01, 0x4e, 0x22, 0x42, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x12, 0x0c,
- 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01,
- 0x54, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18,
- 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x4e, 0x12, 0x0c, 0x0a, 0x01, 0x4f, 0x18, 0x04, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x01, 0x4f, 0x22, 0x39, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x50, 0x61,
- 0x72, 0x61, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63,
- 0x6f, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e,
- 0x64, 0x22, 0x54, 0x0a, 0x0a, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12,
- 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
- 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12,
- 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x1a, 0x0a, 0x06, 0x55, 0x49, 0x64, 0x52, 0x65,
- 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
- 0x75, 0x69, 0x64, 0x22, 0x1d, 0x0a, 0x07, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12,
- 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
- 0x6d, 0x65, 0x22, 0x0a, 0x0a, 0x08, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x71, 0x22, 0x0b,
- 0x0a, 0x09, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x22, 0x29, 0x0a, 0x0f, 0x52,
- 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x31, 0x12, 0x16,
+ 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0xaf, 0x01, 0x0a, 0x13, 0x4e, 0x6f, 0x74,
+ 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71,
+ 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70,
+ 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49,
+ 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73,
+ 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64,
+ 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e,
+ 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a,
+ 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+ 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61,
+ 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0xae, 0x01, 0x0a, 0x12, 0x4e,
+ 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x52, 0x65,
+ 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49,
+ 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
+ 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65,
+ 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49,
+ 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12,
+ 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12,
+ 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+ 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77,
+ 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0x3f, 0x0a, 0x09, 0x53,
+ 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c,
+ 0x6c, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
+ 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0x36, 0x0a, 0x0a,
+ 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x01, 0x4e, 0x22, 0x42, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f,
+ 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c,
+ 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01,
+ 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x4e, 0x12, 0x0c, 0x0a, 0x01, 0x4f, 0x18,
+ 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x4f, 0x22, 0x39, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b,
+ 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73,
+ 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x63,
+ 0x6f, 0x6e, 0x64, 0x22, 0x54, 0x0a, 0x0a, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61,
+ 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72,
+ 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
+ 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x1a, 0x0a, 0x06, 0x55, 0x49, 0x64,
+ 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x1d, 0x0a, 0x07, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71,
+ 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+ 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x0a, 0x0a, 0x08, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x71,
+ 0x22, 0x0b, 0x0a, 0x09, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x22, 0x29, 0x0a,
+ 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x31,
+ 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x22, 0x41, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47,
+ 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70,
+ 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72,
+ 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x22, 0x59, 0x0a, 0x0f, 0x52,
+ 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x33, 0x12, 0x16,
0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
- 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x22, 0x41, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e,
- 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72,
+ 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16,
+ 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+ 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x71, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e,
+ 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x34, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72,
0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x22, 0x59, 0x0a, 0x0f, 0x52, 0x50, 0x43,
- 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x33, 0x12, 0x16, 0x0a, 0x06,
+ 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72,
+ 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
+ 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x18, 0x04, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x22, 0x41, 0x0a, 0x0f, 0x52, 0x50, 0x43,
+ 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x42, 0x31, 0x12, 0x16, 0x0a, 0x06,
0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61,
0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06,
- 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61,
- 0x72, 0x61, 0x6d, 0x33, 0x22, 0x71, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72,
- 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x34, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
- 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12,
- 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
- 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
- 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12,
- 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
- 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x22, 0x41, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65,
- 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x42, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61,
- 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61,
- 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x03,
- 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x22, 0x51, 0x0a, 0x0b, 0x52, 0x50,
- 0x43, 0x52, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74,
- 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74,
- 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d,
- 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x22, 0xa1, 0x03,
- 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x42, 0x49, 0x6e, 0x66, 0x6f, 0x12,
- 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73,
- 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
- 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6f,
- 0x77, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65,
- 0x72, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x72, 0x6f, 0x73, 0x73,
- 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x49,
- 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
- 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x73,
- 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d,
- 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d,
- 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73,
- 0x74, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x72, 0x65, 0x64, 0x69, 0x73,
- 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64,
- 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65,
- 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x72, 0x65, 0x64, 0x69, 0x73,
- 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d,
- 0x72, 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x18, 0x0a,
- 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
- 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x6f, 0x6e, 0x67, 0x6f,
- 0x64, 0x62, 0x55, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x4d, 0x6f, 0x6e,
- 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f,
- 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73,
- 0x65, 0x2a, 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75,
- 0x74, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12,
- 0x07, 0x0a, 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10,
- 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04,
- 0x43, 0x72, 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
- 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x22, 0x51, 0x0a, 0x0b,
+ 0x52, 0x50, 0x43, 0x52, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75,
+ 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a,
+ 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72,
+ 0x61, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x22,
+ 0xa1, 0x03, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x42, 0x49, 0x6e, 0x66,
+ 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, 0x12, 0x1e, 0x0a,
+ 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a,
+ 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77,
+ 0x6e, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x72, 0x6f,
+ 0x73, 0x73, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x72, 0x6f, 0x73,
+ 0x73, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x73, 0x65, 0x72,
+ 0x76, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c,
+ 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74,
+ 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74,
+ 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x49, 0x73, 0x43, 0x6c,
+ 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x72, 0x65, 0x64,
+ 0x69, 0x73, 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x72,
+ 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09,
+ 0x72, 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x72, 0x65, 0x64,
+ 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x0d, 0x72, 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12,
+ 0x18, 0x0a, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x6f, 0x6e,
+ 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x4d,
+ 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6d, 0x6f, 0x6e,
+ 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x18, 0x0d, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, 0x62,
+ 0x61, 0x73, 0x65, 0x2a, 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69,
+ 0x62, 0x75, 0x74, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10,
+ 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65,
+ 0x66, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08,
+ 0x0a, 0x04, 0x43, 0x72, 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+ 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index 8d5993160..52abf6531 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -409,6 +409,7 @@ const (
ErrorCode_DragonTrainCding ErrorCode = 4405 // 训练cd 中
ErrorCode_DragonTrainMaxCount ErrorCode = 4406 // 当日训练次数上限
ErrorCode_DragonNotAdultDdragon ErrorCode = 4407 // 成龙才能训练
+ ErrorCode_DragonMaxLvItem ErrorCode = 4408 // 道具加成上限
//reputation
ErrorCode_ReputationTalentFull ErrorCode = 4501 //天赋满级
ErrorCode_ReputationNoPreNodeLv ErrorCode = 4502 //前置节点等级不满足
@@ -800,6 +801,7 @@ var (
4405: "DragonTrainCding",
4406: "DragonTrainMaxCount",
4407: "DragonNotAdultDdragon",
+ 4408: "DragonMaxLvItem",
4501: "ReputationTalentFull",
4502: "ReputationNoPreNodeLv",
4601: "OldtimesReceived",
@@ -1181,6 +1183,7 @@ var (
"DragonTrainCding": 4405,
"DragonTrainMaxCount": 4406,
"DragonNotAdultDdragon": 4407,
+ "DragonMaxLvItem": 4408,
"ReputationTalentFull": 4501,
"ReputationNoPreNodeLv": 4502,
"OldtimesReceived": 4601,
@@ -1245,7 +1248,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
var file_errorcode_proto_rawDesc = []byte{
0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x2a, 0xad, 0x46, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+ 0x6f, 0x2a, 0xc3, 0x46, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
@@ -1757,59 +1760,60 @@ var file_errorcode_proto_rawDesc = []byte{
0x13, 0x44, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x54, 0x72, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x78, 0x43,
0x6f, 0x75, 0x6e, 0x74, 0x10, 0xb6, 0x22, 0x12, 0x1a, 0x0a, 0x15, 0x44, 0x72, 0x61, 0x67, 0x6f,
0x6e, 0x4e, 0x6f, 0x74, 0x41, 0x64, 0x75, 0x6c, 0x74, 0x44, 0x64, 0x72, 0x61, 0x67, 0x6f, 0x6e,
- 0x10, 0xb7, 0x22, 0x12, 0x19, 0x0a, 0x14, 0x52, 0x65, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f,
- 0x6e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c, 0x6c, 0x10, 0x95, 0x23, 0x12, 0x1a,
- 0x0a, 0x15, 0x52, 0x65, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x50, 0x72,
- 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x4c, 0x76, 0x10, 0x96, 0x23, 0x12, 0x15, 0x0a, 0x10, 0x4f, 0x6c,
- 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xf9,
- 0x23, 0x12, 0x15, 0x0a, 0x10, 0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x46, 0x69, 0x6e,
- 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xfa, 0x23, 0x12, 0x16, 0x0a, 0x11, 0x4f, 0x6c, 0x64, 0x74,
- 0x69, 0x6d, 0x65, 0x73, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x4f, 0x76, 0x65, 0x72, 0x10, 0xfb, 0x23,
- 0x12, 0x1f, 0x0a, 0x1a, 0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x50, 0x72, 0x65, 0x4c,
- 0x65, 0x76, 0x65, 0x6c, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xfc,
- 0x23, 0x12, 0x1a, 0x0a, 0x15, 0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x4e, 0x6f, 0x41,
- 0x6c, 0x6c, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xfd, 0x23, 0x12, 0x1b, 0x0a,
- 0x16, 0x50, 0x61, 0x73, 0x73, 0x6f, 0x6e, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x75, 0x6d, 0x4e, 0x6f,
- 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xdd, 0x24, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x61,
- 0x73, 0x73, 0x6f, 0x6e, 0x48, 0x65, 0x72, 0x6f, 0x55, 0x6e, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61,
- 0x62, 0x6c, 0x65, 0x10, 0xde, 0x24, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x73, 0x73, 0x6f, 0x6e,
- 0x53, 0x65, 0x61, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x45, 0x72, 0x72, 0x10, 0xdf, 0x24, 0x12,
- 0x13, 0x0a, 0x0e, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x4f, 0x70, 0x65,
- 0x6e, 0x10, 0xc1, 0x25, 0x12, 0x21, 0x0a, 0x1c, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
- 0x67, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74,
- 0x48, 0x65, 0x72, 0x6f, 0x10, 0xa5, 0x26, 0x12, 0x21, 0x0a, 0x1c, 0x53, 0x74, 0x6f, 0x6e, 0x65,
- 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x53, 0x65, 0x6c,
- 0x65, 0x63, 0x74, 0x42, 0x55, 0x66, 0x66, 0x10, 0xa6, 0x26, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x74,
- 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x45, 0x72,
- 0x72, 0x10, 0xa7, 0x26, 0x12, 0x1e, 0x0a, 0x19, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
- 0x67, 0x65, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x46, 0x61, 0x69, 0x6c, 0x65,
- 0x64, 0x10, 0xa8, 0x26, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
- 0x67, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
- 0x10, 0xa9, 0x26, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67,
- 0x65, 0x47, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x6f, 0x6d, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10,
- 0xaa, 0x26, 0x12, 0x1e, 0x0a, 0x19, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
- 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x42, 0x6f, 0x78, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10,
- 0xab, 0x26, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65,
- 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xac, 0x26, 0x12, 0x17, 0x0a,
- 0x12, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65,
- 0x4d, 0x61, 0x78, 0x10, 0xad, 0x26, 0x12, 0x16, 0x0a, 0x11, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68,
- 0x65, 0x6e, 0x67, 0x65, 0x43, 0x61, 0x6e, 0x74, 0x42, 0x75, 0x79, 0x10, 0xae, 0x26, 0x12, 0x1b,
- 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x48, 0x65, 0x72, 0x6f,
- 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x10, 0xaf, 0x26, 0x12, 0x1b, 0x0a, 0x16, 0x53,
- 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x62, 0x75, 0x66, 0x66, 0x52, 0x65, 0x73,
- 0x65, 0x74, 0x45, 0x72, 0x72, 0x10, 0xb0, 0x26, 0x12, 0x11, 0x0a, 0x0c, 0x41, 0x63, 0x74, 0x69,
- 0x76, 0x69, 0x74, 0x79, 0x4f, 0x76, 0x65, 0x72, 0x10, 0x89, 0x27, 0x12, 0x15, 0x0a, 0x10, 0x41,
- 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x55, 0x6e, 0x4f, 0x70, 0x65, 0x6e, 0x65, 0x64, 0x10,
- 0x8a, 0x27, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65,
- 0x70, 0x61, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0x8b, 0x27, 0x12, 0x16, 0x0a, 0x11,
- 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4e, 0x6f, 0x74, 0x49, 0x6e, 0x74, 0x69, 0x6d,
- 0x65, 0x10, 0x8c, 0x27, 0x12, 0x14, 0x0a, 0x0f, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
- 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x8d, 0x27, 0x12, 0x17, 0x0a, 0x12, 0x41, 0x63,
- 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x43, 0x61, 0x6e, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
- 0x10, 0x8e, 0x27, 0x12, 0x1c, 0x0a, 0x17, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68,
- 0x65, 0x65, 0x70, 0x52, 0x61, 0x6e, 0x6b, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x65, 0x64, 0x10, 0xed,
- 0x27, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x33,
+ 0x10, 0xb7, 0x22, 0x12, 0x14, 0x0a, 0x0f, 0x44, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x4d, 0x61, 0x78,
+ 0x4c, 0x76, 0x49, 0x74, 0x65, 0x6d, 0x10, 0xb8, 0x22, 0x12, 0x19, 0x0a, 0x14, 0x52, 0x65, 0x70,
+ 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x46, 0x75, 0x6c,
+ 0x6c, 0x10, 0x95, 0x23, 0x12, 0x1a, 0x0a, 0x15, 0x52, 0x65, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69,
+ 0x6f, 0x6e, 0x4e, 0x6f, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x4c, 0x76, 0x10, 0x96, 0x23,
+ 0x12, 0x15, 0x0a, 0x10, 0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x52, 0x65, 0x63, 0x65,
+ 0x69, 0x76, 0x65, 0x64, 0x10, 0xf9, 0x23, 0x12, 0x15, 0x0a, 0x10, 0x4f, 0x6c, 0x64, 0x74, 0x69,
+ 0x6d, 0x65, 0x73, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xfa, 0x23, 0x12, 0x16,
+ 0x0a, 0x11, 0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x4f,
+ 0x76, 0x65, 0x72, 0x10, 0xfb, 0x23, 0x12, 0x1f, 0x0a, 0x1a, 0x4f, 0x6c, 0x64, 0x74, 0x69, 0x6d,
+ 0x65, 0x73, 0x50, 0x72, 0x65, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69,
+ 0x73, 0x68, 0x65, 0x64, 0x10, 0xfc, 0x23, 0x12, 0x1a, 0x0a, 0x15, 0x4f, 0x6c, 0x64, 0x74, 0x69,
+ 0x6d, 0x65, 0x73, 0x4e, 0x6f, 0x41, 0x6c, 0x6c, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64,
+ 0x10, 0xfd, 0x23, 0x12, 0x1b, 0x0a, 0x16, 0x50, 0x61, 0x73, 0x73, 0x6f, 0x6e, 0x48, 0x65, 0x72,
+ 0x6f, 0x4e, 0x75, 0x6d, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xdd, 0x24,
+ 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x61, 0x73, 0x73, 0x6f, 0x6e, 0x48, 0x65, 0x72, 0x6f, 0x55, 0x6e,
+ 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x10, 0xde, 0x24, 0x12, 0x17, 0x0a, 0x12,
+ 0x50, 0x61, 0x73, 0x73, 0x6f, 0x6e, 0x53, 0x65, 0x61, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x45,
+ 0x72, 0x72, 0x10, 0xdf, 0x24, 0x12, 0x13, 0x0a, 0x0e, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65,
+ 0x72, 0x4e, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x10, 0xc1, 0x25, 0x12, 0x21, 0x0a, 0x1c, 0x53, 0x74,
+ 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
+ 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x10, 0xa5, 0x26, 0x12, 0x21, 0x0a,
+ 0x1c, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61,
+ 0x74, 0x65, 0x64, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x42, 0x55, 0x66, 0x66, 0x10, 0xa6, 0x26,
+ 0x12, 0x18, 0x0a, 0x13, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x50, 0x6f,
+ 0x72, 0x74, 0x61, 0x6c, 0x45, 0x72, 0x72, 0x10, 0xa7, 0x26, 0x12, 0x1e, 0x0a, 0x19, 0x53, 0x74,
+ 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x6f, 0x6f,
+ 0x6d, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xa8, 0x26, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x74,
+ 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64,
+ 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xa9, 0x26, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x74, 0x6f,
+ 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x47, 0x6f, 0x74, 0x6f, 0x52, 0x6f, 0x6f, 0x6d, 0x46,
+ 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xaa, 0x26, 0x12, 0x1e, 0x0a, 0x19, 0x53, 0x74, 0x6f, 0x6e,
+ 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x42, 0x6f, 0x78, 0x46,
+ 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xab, 0x26, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x74, 0x6f, 0x6e,
+ 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
+ 0x10, 0xac, 0x26, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67,
+ 0x65, 0x53, 0x74, 0x6f, 0x72, 0x65, 0x4d, 0x61, 0x78, 0x10, 0xad, 0x26, 0x12, 0x16, 0x0a, 0x11,
+ 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x61, 0x6e, 0x74, 0x42, 0x75,
+ 0x79, 0x10, 0xae, 0x26, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e,
+ 0x67, 0x65, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x10, 0xaf,
+ 0x26, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x62,
+ 0x75, 0x66, 0x66, 0x52, 0x65, 0x73, 0x65, 0x74, 0x45, 0x72, 0x72, 0x10, 0xb0, 0x26, 0x12, 0x11,
+ 0x0a, 0x0c, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4f, 0x76, 0x65, 0x72, 0x10, 0x89,
+ 0x27, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x55, 0x6e, 0x4f,
+ 0x70, 0x65, 0x6e, 0x65, 0x64, 0x10, 0x8a, 0x27, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x63, 0x74, 0x69,
+ 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x70, 0x61, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10,
+ 0x8b, 0x27, 0x12, 0x16, 0x0a, 0x11, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x4e, 0x6f,
+ 0x74, 0x49, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x10, 0x8c, 0x27, 0x12, 0x14, 0x0a, 0x0f, 0x41, 0x63,
+ 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x8d, 0x27,
+ 0x12, 0x17, 0x0a, 0x12, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x43, 0x61, 0x6e, 0x74,
+ 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0x8e, 0x27, 0x12, 0x1c, 0x0a, 0x17, 0x43, 0x61, 0x70,
+ 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x6e, 0x6b, 0x43, 0x6c, 0x6f,
+ 0x73, 0x65, 0x65, 0x64, 0x10, 0xed, 0x27, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
+ 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
From 8c53d55b8f8e6cdc6b848b63de0d463b2b45db4f Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 21 Sep 2023 15:11:12 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pb/comm.pb.go | 314 ++++++++++++++++++++++++++------------------------
1 file changed, 162 insertions(+), 152 deletions(-)
diff --git a/pb/comm.pb.go b/pb/comm.pb.go
index f42b021ff..d8a6fc330 100644
--- a/pb/comm.pb.go
+++ b/pb/comm.pb.go
@@ -411,8 +411,9 @@ type RPCMessageReply struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- ErrorData *ErrorData `protobuf:"bytes,1,opt,name=ErrorData,proto3" json:"ErrorData"`
- Reply []*UserMessage `protobuf:"bytes,2,rep,name=Reply,proto3" json:"Reply"`
+ ServiceId string `protobuf:"bytes,1,opt,name=ServiceId,proto3" json:"ServiceId"`
+ ErrorData *ErrorData `protobuf:"bytes,2,opt,name=ErrorData,proto3" json:"ErrorData"`
+ Reply []*UserMessage `protobuf:"bytes,3,rep,name=Reply,proto3" json:"Reply"`
}
func (x *RPCMessageReply) Reset() {
@@ -447,6 +448,13 @@ func (*RPCMessageReply) Descriptor() ([]byte, []int) {
return file_comm_proto_rawDescGZIP(), []int{4}
}
+func (x *RPCMessageReply) GetServiceId() string {
+ if x != nil {
+ return x.ServiceId
+ }
+ return ""
+}
+
func (x *RPCMessageReply) GetErrorData() *ErrorData {
if x != nil {
return x.ErrorData
@@ -2086,51 +2094,64 @@ var file_comm_proto_rawDesc = []byte{
0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2e, 0x0a, 0x07, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x07, 0x4d,
- 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x5f, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x4d, 0x65, 0x73,
- 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x28, 0x0a, 0x09, 0x45, 0x72, 0x72,
- 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x45,
- 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44,
- 0x61, 0x74, 0x61, 0x12, 0x22, 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x18, 0x02, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
- 0x52, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x69, 0x0a, 0x0d, 0x41, 0x67, 0x65, 0x6e, 0x74,
- 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72,
- 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
- 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16,
- 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
- 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72,
- 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72,
- 0x49, 0x64, 0x22, 0x37, 0x0a, 0x0f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x42, 0x75, 0x69,
- 0x6c, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73,
- 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73,
- 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x5f, 0x0a, 0x13, 0x41,
- 0x67, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52,
- 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f,
- 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53,
- 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c,
- 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65,
- 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x99, 0x01, 0x0a,
- 0x0f, 0x42, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71,
- 0x12, 0x26, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49,
- 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65,
- 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e,
- 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e,
- 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18,
- 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28,
- 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67,
- 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41,
- 0x6e, 0x79, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x75, 0x0a, 0x13, 0x42, 0x72, 0x6f, 0x61,
- 0x64, 0x43, 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12,
- 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53,
- 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75,
- 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20,
- 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
- 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22,
- 0x36, 0x0a, 0x0e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x65, 0x52, 0x65,
- 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
- 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65,
- 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0xae, 0x01, 0x0a, 0x12, 0x4e, 0x6f, 0x74, 0x69,
- 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x0e,
+ 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x7d, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x4d, 0x65, 0x73,
+ 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x65, 0x72,
+ 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x53, 0x65,
+ 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72,
+ 0x44, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72,
+ 0x6f, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x44, 0x61, 0x74,
+ 0x61, 0x12, 0x22, 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
+ 0x32, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x05,
+ 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x69, 0x0a, 0x0d, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x75,
+ 0x69, 0x6c, 0x64, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65,
+ 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55,
+ 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06,
+ 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73,
+ 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x49, 0x64,
+ 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x57, 0x6f, 0x72, 0x6b, 0x65, 0x72, 0x49, 0x64,
+ 0x22, 0x37, 0x0a, 0x0f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x42, 0x75, 0x69, 0x6c, 0x64,
+ 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69,
+ 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72,
+ 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x5f, 0x0a, 0x13, 0x41, 0x67, 0x65,
+ 0x6e, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71,
+ 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49,
+ 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73,
+ 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x18,
+ 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x65, 0x73, 0x73,
+ 0x61, 0x67, 0x65, 0x52, 0x05, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x99, 0x01, 0x0a, 0x0f, 0x42,
+ 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x26,
+ 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73,
+ 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73,
+ 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79,
+ 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79,
+ 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x04,
+ 0x44, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79,
+ 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x75, 0x0a, 0x13, 0x42, 0x72, 0x6f, 0x61, 0x64, 0x43,
+ 0x61, 0x73, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a,
+ 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x08, 0x4d, 0x61, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x75, 0x62,
+ 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x75, 0x62, 0x54,
+ 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x04, 0x44, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x44, 0x61, 0x74, 0x61, 0x22, 0x36, 0x0a,
+ 0x0e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12,
+ 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73,
+ 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0xae, 0x01, 0x0a, 0x12, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65,
+ 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02,
+ 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d,
+ 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
+ 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65,
+ 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+ 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61,
+ 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72,
+ 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0xaf, 0x01, 0x0a, 0x13, 0x4e, 0x6f, 0x74, 0x69, 0x63,
+ 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x0e,
0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24,
0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18,
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69,
@@ -2140,116 +2161,105 @@ var file_comm_proto_rawDesc = []byte{
0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10,
0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64,
0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53,
- 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0xaf, 0x01, 0x0a, 0x13, 0x4e, 0x6f, 0x74,
- 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71,
- 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70,
- 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49,
- 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73,
- 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64,
- 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e,
- 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a,
- 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
- 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61,
- 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0xae, 0x01, 0x0a, 0x12, 0x4e,
- 0x6f, 0x74, 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x52, 0x65,
- 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49,
- 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
- 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65,
- 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49,
- 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12,
- 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12,
- 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
- 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77,
- 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0x3f, 0x0a, 0x09, 0x53,
- 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c,
- 0x6c, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
- 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x18, 0x02, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0x36, 0x0a, 0x0a,
- 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x01, 0x4e, 0x22, 0x42, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f,
- 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c,
- 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01,
- 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x4e, 0x12, 0x0c, 0x0a, 0x01, 0x4f, 0x18,
- 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x4f, 0x22, 0x39, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b,
- 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73,
- 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x63,
- 0x6f, 0x6e, 0x64, 0x22, 0x54, 0x0a, 0x0a, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61,
- 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72,
- 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
- 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x1a, 0x0a, 0x06, 0x55, 0x49, 0x64,
- 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x1d, 0x0a, 0x07, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71,
- 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
- 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x0a, 0x0a, 0x08, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x71,
- 0x22, 0x0b, 0x0a, 0x09, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x22, 0x29, 0x0a,
- 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x31,
- 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x22, 0x41, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47,
- 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70,
- 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72,
- 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x22, 0x59, 0x0a, 0x0f, 0x52,
- 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x33, 0x12, 0x16,
+ 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0xae, 0x01, 0x0a, 0x12, 0x4e, 0x6f, 0x74,
+ 0x69, 0x63, 0x65, 0x55, 0x73, 0x65, 0x72, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12,
+ 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x70, 0x12,
+ 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73,
+ 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18,
+ 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a,
+ 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a,
+ 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49,
+ 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79,
+ 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0x3f, 0x0a, 0x09, 0x53, 0x6b, 0x69,
+ 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49,
+ 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44,
+ 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0x36, 0x0a, 0x0a, 0x55, 0x73,
+ 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x01, 0x4e, 0x22, 0x42, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x12, 0x0c,
+ 0x0a, 0x01, 0x41, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01,
+ 0x54, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18,
+ 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x4e, 0x12, 0x0c, 0x0a, 0x01, 0x4f, 0x18, 0x04, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x01, 0x4f, 0x22, 0x39, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x50, 0x61,
+ 0x72, 0x61, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63,
+ 0x6f, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e,
+ 0x64, 0x22, 0x54, 0x0a, 0x0a, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12,
+ 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
+ 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12,
+ 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x1a, 0x0a, 0x06, 0x55, 0x49, 0x64, 0x52, 0x65,
+ 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+ 0x75, 0x69, 0x64, 0x22, 0x1d, 0x0a, 0x07, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12,
+ 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
+ 0x6d, 0x65, 0x22, 0x0a, 0x0a, 0x08, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x71, 0x22, 0x0b,
+ 0x0a, 0x09, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x22, 0x29, 0x0a, 0x0f, 0x52,
+ 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x31, 0x12, 0x16,
0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
- 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16,
- 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
- 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x71, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e,
- 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x34, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72,
+ 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x22, 0x41, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e,
+ 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72,
0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72,
- 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
- 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x18, 0x04, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x22, 0x41, 0x0a, 0x0f, 0x52, 0x50, 0x43,
- 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x42, 0x31, 0x12, 0x16, 0x0a, 0x06,
+ 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x22, 0x59, 0x0a, 0x0f, 0x52, 0x50, 0x43,
+ 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x33, 0x12, 0x16, 0x0a, 0x06,
0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61,
0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02,
- 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x22, 0x51, 0x0a, 0x0b,
- 0x52, 0x50, 0x43, 0x52, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75,
- 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a,
- 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72,
- 0x61, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x22,
- 0xa1, 0x03, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x42, 0x49, 0x6e, 0x66,
- 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, 0x12, 0x1e, 0x0a,
- 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a,
- 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77,
- 0x6e, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x72, 0x6f,
- 0x73, 0x73, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x72, 0x6f, 0x73,
- 0x73, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x73, 0x65, 0x72,
- 0x76, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c,
- 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74,
- 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74,
- 0x69, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x49, 0x73, 0x43, 0x6c,
- 0x75, 0x73, 0x74, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x72, 0x65, 0x64,
- 0x69, 0x73, 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x72,
- 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09,
- 0x72, 0x65, 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x72, 0x65, 0x64,
- 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x0d, 0x72, 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12,
- 0x18, 0x0a, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x6f, 0x6e,
- 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x4d,
- 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6d, 0x6f, 0x6e,
- 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x18, 0x0d, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, 0x62,
- 0x61, 0x73, 0x65, 0x2a, 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69,
- 0x62, 0x75, 0x74, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10,
- 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65,
- 0x66, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08,
- 0x0a, 0x04, 0x43, 0x72, 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
- 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06,
+ 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61,
+ 0x72, 0x61, 0x6d, 0x33, 0x22, 0x71, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72,
+ 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x34, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
+ 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12,
+ 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
+ 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12,
+ 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x22, 0x41, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65,
+ 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x42, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61,
+ 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61,
+ 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x03,
+ 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x22, 0x51, 0x0a, 0x0b, 0x52, 0x50,
+ 0x43, 0x52, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74,
+ 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74,
+ 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d,
+ 0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x22, 0xa1, 0x03,
+ 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x42, 0x49, 0x6e, 0x66, 0x6f, 0x12,
+ 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73,
+ 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6f,
+ 0x77, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65,
+ 0x72, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x05, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x72, 0x6f, 0x73, 0x73,
+ 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x49,
+ 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
+ 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x73,
+ 0x65, 0x72, 0x76, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d,
+ 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d,
+ 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x72, 0x65, 0x64, 0x69, 0x73, 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73,
+ 0x74, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x72, 0x65, 0x64, 0x69, 0x73,
+ 0x49, 0x73, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64,
+ 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65,
+ 0x64, 0x69, 0x73, 0x41, 0x64, 0x64, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x72, 0x65, 0x64, 0x69, 0x73,
+ 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d,
+ 0x72, 0x65, 0x64, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x18, 0x0a,
+ 0x07, 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
+ 0x72, 0x65, 0x64, 0x69, 0x73, 0x44, 0x62, 0x12, 0x1e, 0x0a, 0x0a, 0x4d, 0x6f, 0x6e, 0x67, 0x6f,
+ 0x64, 0x62, 0x55, 0x72, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x4d, 0x6f, 0x6e,
+ 0x67, 0x6f, 0x64, 0x62, 0x55, 0x72, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f,
+ 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x0f, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x64, 0x62, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73,
+ 0x65, 0x2a, 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75,
+ 0x74, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12,
+ 0x07, 0x0a, 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10,
+ 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04,
+ 0x43, 0x72, 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
From 79f9aeb43acab92644b0f5babdac5dd73452915f Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 21 Sep 2023 15:15:19 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modules/dragon/api_lvitem.go | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/modules/dragon/api_lvitem.go b/modules/dragon/api_lvitem.go
index 6bc27fccc..06a8fbe32 100644
--- a/modules/dragon/api_lvitem.go
+++ b/modules/dragon/api_lvitem.go
@@ -62,10 +62,11 @@ func (this *apiComp) LvItem(session comm.IUserSession, req *pb.DragonLvItemReq)
dragon.Lvitem[req.Attribute] = 1
}
if curLvConf, err = this.module.configure.GetDragonLvItemConf(req.Attribute, dragon.Lvitem[req.Attribute]); err == nil {
- if upLvConf, err = this.module.configure.GetDragonLvItemConf(req.Attribute, dragon.Lvitem[req.Attribute]+1); err == nil {
+ if upLvConf, err = this.module.configure.GetDragonLvItemConf(req.Attribute, dragon.Lvitem[req.Attribute]+1); err != nil {
errdata = &pb.ErrorData{
- Code: pb.ErrorCode_DragonMaxLvItem,
- Title: pb.ErrorCode_DragonMaxLvItem.ToString(),
+ Code: pb.ErrorCode_DragonMaxLvItem,
+ Title: pb.ErrorCode_DragonMaxLvItem.ToString(),
+ Message: err.Error(),
}
return
}
From 959a05940582578ebd7aab4d27601a4b3e7b385b Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Thu, 21 Sep 2023 15:30:17 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=95=86=E9=98=9F=20=E6=B6=A8=E8=B7=8C?=
=?UTF-8?q?=E5=B9=85=E5=BA=A6=E5=8D=83=E5=88=86=E6=AF=94=E8=B5=B0=E5=8C=BA?=
=?UTF-8?q?=E9=97=B4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/game_bubblegroup.json | 6 +-
bin/json/game_buzkashimount.json | 12 +-
bin/json/game_caravanreward.json | 4 +-
bin/json/game_caravanthing.json | 160 ++++++++++++++----
bin/json/game_dispatch_task.json | 6 +-
bin/json/game_gamesummary.json | 16 +-
bin/json/game_item.json | 10 +-
bin/json/game_navigation.json | 18 --
bin/json/game_newsmithy.json | 54 +++---
bin/json/game_opencond.json | 2 +-
bin/json/game_pandamasmryl.json | 4 +-
bin/json/game_ruledesc.json | 2 +-
bin/json/game_skillafteratk.json | 72 +++++++-
bin/json/game_skillatk.json | 26 ++-
bin/json/game_skillpassive.json | 35 +++-
bin/json/game_smithyidtool.json | 70 ++++----
bin/json/game_smithytool.json | 70 ++++----
bin/json/game_topuiconfig.json | 4 +-
bin/json/game_worldbattle.json | 50 +++---
modules/caravan/module.go | 24 +--
.../structs/Game.CaravanThingData.go | 17 +-
21 files changed, 420 insertions(+), 242 deletions(-)
diff --git a/bin/json/game_bubblegroup.json b/bin/json/game_bubblegroup.json
index 308460e63..d790151ee 100644
--- a/bin/json/game_bubblegroup.json
+++ b/bin/json/game_bubblegroup.json
@@ -145,7 +145,7 @@
},
{
"KeyId": 13,
- "GroupID": 25004,
+ "GroupID": 250041,
"Type": 1,
"TaskIDMin": 0,
"TaskIDMax": 0,
@@ -157,7 +157,7 @@
},
{
"KeyId": 14,
- "GroupID": 25004,
+ "GroupID": 250041,
"Type": 1,
"TaskIDMin": 0,
"TaskIDMax": 0,
@@ -169,7 +169,7 @@
},
{
"KeyId": 15,
- "GroupID": 25004,
+ "GroupID": 250041,
"Type": 1,
"TaskIDMin": 0,
"TaskIDMax": 0,
diff --git a/bin/json/game_buzkashimount.json b/bin/json/game_buzkashimount.json
index f17f4c45c..a4246789c 100644
--- a/bin/json/game_buzkashimount.json
+++ b/bin/json/game_buzkashimount.json
@@ -11,7 +11,7 @@
"text": "夜煞的蛋，撒点胡椒和盐，味道应该会很很不错！"
},
"Color": 5,
- "Img": "tx_by_54101",
+ "Img": "tx_by_54101_3",
"access": [
10041
],
@@ -43,7 +43,7 @@
"text": "弱小无助但能吃
\"你不会指望幼龙能载人飞行吧?\""
},
"Color": 5,
- "Img": "tx_by_54101",
+ "Img": "tx_by_54101_3",
"access": [
10041
],
@@ -75,7 +75,7 @@
"text": "无牙/没牙仔（Toothless）品种为夜煞。夜煞是龙族非常稀有且最危险聪明的龙，与其它龙的造型很不一样，类似蝙蝠，身体附有黑色鳞片。体积娇小，表情动作灵巧可爱，双翼比例在龙的排行中最大。翼面多达三对，因此飞行时间更长，速度更快更灵活。"
},
"Color": 5,
- "Img": "tx_by_54101",
+ "Img": "tx_by_54101_3",
"access": [
10041
],
@@ -107,7 +107,7 @@
"text": "风里飞的蛋，撒点胡椒和盐，味道应该会很很不错！"
},
"Color": 3,
- "Img": "tx_by_54102",
+ "Img": "tx_by_54102_3",
"access": [
10041
],
@@ -139,7 +139,7 @@
"text": "弱小无助但能吃
\"你不会指望幼龙能载人飞行吧?\""
},
"Color": 3,
- "Img": "tx_by_54102",
+ "Img": "tx_by_54102_3",
"access": [
10041
],
@@ -171,7 +171,7 @@
"text": "它是龙族最漂亮、精力最充沛的一员，皮肤色彩斑斓，有鹦鹉一样的习性、鸸鹋的步态和雷克斯暴龙的姿势，是鸟类的祖先。纳得的性格暴躁，经常发脾气。"
},
"Color": 3,
- "Img": "tx_by_54102",
+ "Img": "tx_by_54102_3",
"access": [
10041
],
diff --git a/bin/json/game_caravanreward.json b/bin/json/game_caravanreward.json
index 812f305a6..cd290a098 100644
--- a/bin/json/game_caravanreward.json
+++ b/bin/json/game_caravanreward.json
@@ -61,7 +61,7 @@
{
"a": "attr",
"t": "gold",
- "n": 550000
+ "n": 500000
}
]
},
@@ -72,7 +72,7 @@
{
"a": "attr",
"t": "gold",
- "n": 600000
+ "n": 500000
}
]
},
diff --git a/bin/json/game_caravanthing.json b/bin/json/game_caravanthing.json
index 41f2c8664..916d78af3 100644
--- a/bin/json/game_caravanthing.json
+++ b/bin/json/game_caravanthing.json
@@ -24,7 +24,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 840,
"pricemax": 1960,
"goodsnum": 25,
@@ -55,7 +58,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 300,
"pricemax": 700,
"goodsnum": 100,
@@ -86,7 +92,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 1110,
"pricemax": 2590,
"goodsnum": 15,
@@ -117,7 +126,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 240,
"pricemax": 560,
"goodsnum": 190,
@@ -148,7 +160,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 420,
"pricemax": 980,
"goodsnum": 70,
@@ -179,7 +194,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 540,
"pricemax": 1260,
"goodsnum": 70,
@@ -210,7 +228,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 360,
"pricemax": 840,
"goodsnum": 85,
@@ -241,7 +262,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 1050,
"pricemax": 2450,
"goodsnum": 10,
@@ -272,7 +296,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 660,
"pricemax": 1540,
"goodsnum": 35,
@@ -303,7 +330,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 1200,
"pricemax": 2800,
"goodsnum": 6,
@@ -334,7 +364,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 810,
"pricemax": 1890,
"goodsnum": 25,
@@ -365,7 +398,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 360,
"pricemax": 840,
"goodsnum": 80,
@@ -396,7 +432,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 720,
"pricemax": 1680,
"goodsnum": 50,
@@ -427,7 +466,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 600,
"pricemax": 1400,
"goodsnum": 35,
@@ -458,7 +500,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 420,
"pricemax": 980,
"goodsnum": 70,
@@ -489,7 +534,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 150,
"pricemax": 350,
"goodsnum": 300,
@@ -520,7 +568,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 60,
"pricemax": 140,
"goodsnum": 750,
@@ -551,7 +602,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 960,
"pricemax": 2240,
"goodsnum": 15,
@@ -582,7 +636,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 120,
"pricemax": 280,
"goodsnum": 375,
@@ -613,7 +670,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 270,
"pricemax": 630,
"goodsnum": 200,
@@ -644,7 +704,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 900,
"pricemax": 2100,
"goodsnum": 15,
@@ -675,7 +738,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 750,
"pricemax": 1750,
"goodsnum": 30,
@@ -706,7 +772,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 480,
"pricemax": 1120,
"goodsnum": 60,
@@ -737,7 +806,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 180,
"pricemax": 420,
"goodsnum": 250,
@@ -768,7 +840,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 780,
"pricemax": 1820,
"goodsnum": 28,
@@ -799,7 +874,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 1200,
"pricemax": 2800,
"goodsnum": 15,
@@ -830,7 +908,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 390,
"pricemax": 910,
"goodsnum": 100,
@@ -861,7 +942,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 90,
"pricemax": 210,
"goodsnum": 500,
@@ -892,7 +976,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 900,
"pricemax": 2100,
"goodsnum": 16,
@@ -923,7 +1010,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 1080,
"pricemax": 2520,
"goodsnum": 12,
@@ -954,7 +1044,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 870,
"pricemax": 2030,
"goodsnum": 25,
@@ -985,7 +1078,10 @@
30,
70
],
- "FluctuationRange": 500,
+ "FluctuationRange": [
+ 30,
+ 100
+ ],
"pricemin": 60,
"pricemax": 140,
"goodsnum": 750,
diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json
index ec786a968..d23e5cd92 100644
--- a/bin/json/game_dispatch_task.json
+++ b/bin/json/game_dispatch_task.json
@@ -1020,7 +1020,7 @@
"tasktime": 1800,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_36",
- "text": "请接受委托的人把从蛇那里拿到的蛋糕送到美肚鲨那里，不要把骇客蛛埋进去。——沃尔夫"
+ "text": "请接受委托的人把从蛇那里拿到的蛋糕送到美肚鲨那里，
不要把骇客蛛埋进去。——沃尔夫"
},
"taskneed": 3,
"taskreq": [
@@ -1412,7 +1412,7 @@
"tasktime": 1800,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_43",
- "text": "我之前很担心食人鱼大师的伙食，但现在更担心自己！救命！有没有免疫臭气的大师与我换岗！——快螳螂
我可以借你防毒面具。——骇客蛛"
+ "text": "我之前很担心食人鱼大师的伙食，但现在更担心自己！救命！有没有免疫臭气的大师与我换岗！——快螳螂[br]我可以借你防毒面具。——骇客蛛[/br]"
},
"taskneed": 3,
"taskreq": [
@@ -2476,7 +2476,7 @@
"tasktime": 3600,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_74",
- "text": "㇈ 丿……㇇！㇃ㄣ！
大概意思是……来人帮忙！
看来他被诺斯的小家伙们耍了，可怜的沙沙。——邦尼兔"
+ "text": "㇈ 丿……㇇！㇃ㄣ！大概意思是……来人帮忙[br]看来他被诺斯的小家伙们耍了，可怜的沙沙。——邦尼兔[/br]"
},
"taskneed": 4,
"taskreq": [
diff --git a/bin/json/game_gamesummary.json b/bin/json/game_gamesummary.json
index c559f655d..ad7f70e38 100644
--- a/bin/json/game_gamesummary.json
+++ b/bin/json/game_gamesummary.json
@@ -48,7 +48,7 @@
"jumpId": 10015,
"introduce": {
"key": "gamesummary_node_introdunce_2",
- "text": "靴猫继续把玩着手中的剑，他在等，等候那些跃跃欲试站在台上的人，等着那个最强的勇者。"
+ "text": "靴猫继续把玩着手中的剑，他等候那些跃跃欲试站在台上的人，等着那个最强者出现。"
},
"bg": "hkz_wftj_jjc",
"icon": "hkz_tx_jjc",
@@ -114,7 +114,7 @@
"jumpId": 10025,
"introduce": {
"key": "gamesummary_node_introdunce_4",
- "text": "夜半三更，又传来大厨咬牙切齿的诅咒声。自从被精灵戏耍遭到放逐后，她便日夜赌咒要将精灵赶尽杀绝。"
+ "text": "大厨咬牙切齿地诅咒着。自从被精灵戏耍遭到放逐后，她便赌咒要将精灵赶尽杀绝。"
},
"bg": "hkz_wftj_sl01",
"icon": "wjyz_img014",
@@ -152,7 +152,7 @@
"jumpId": 10026,
"introduce": {
"key": "gamesummary_node_introdunce_5",
- "text": "波波星人夺走了戈格星人的孩子！焦急和恼怒吞噬了戈格星人的理智，自此他便对波波星人穷追不舍。"
+ "text": "孩子被波波星人夺走了！焦急的戈格星人自此便对波波星人穷追猛打。"
},
"bg": "hkz_wftj_sl03",
"icon": "wjyz_img017",
@@ -190,7 +190,7 @@
"jumpId": 10024,
"introduce": {
"key": "gamesummary_node_introdunce_6",
- "text": "盘踞在城堡中看守财富和公主的巨龙，最讨厌一些不速之客擅闯她的领地。累累的白骨是她给闯入者们的警示。"
+ "text": "巨龙最讨厌一些不速之客擅闯城堡。累累的白骨是她给闯入者们的警示。"
},
"bg": "hkz_wftj_sl04",
"icon": "wjyz_img015",
@@ -314,7 +314,7 @@
"jumpId": 10021,
"introduce": {
"key": "gamesummary_node_introdunce_9",
- "text": "森林泰坦现身于龟裂的大地之上，她张开双臂，数不胜数的藤蔓滑落入地生根，蜿蜒千里。"
+ "text": "森林泰坦现身于龟裂的大地之上，她张开双臂，无数藤蔓滑落入地生根，蜿蜒千里。"
},
"bg": "hkz_wftj_wjyz01",
"icon": "wjyz_img013",
@@ -357,7 +357,7 @@
"jumpId": 10013,
"introduce": {
"key": "gamesummary_node_introdunce_10",
- "text": "美丽梦幻与诡异兼具，这便是沙人建造的梦境回廊。进入的守护者们或超越自我，或沉迷其中不愿醒来。"
+ "text": "梦幻与诡异兼具，这便是沙人建造的梦境回廊。是超越自我，还是沉迷其中不愿醒来？"
},
"bg": "hkz_wftj_jyfb",
"icon": "hkz_tx_jyfb",
@@ -466,7 +466,7 @@
"jumpId": 10018,
"introduce": {
"key": "gamesummary_node_introdunce_13",
- "text": "天下万物，相生相克。掌握了相克的原理，以弱胜强者不在少数。这里是师傅为研究属性克制者而修建的地方。"
+ "text": "掌握了相克的原理，以弱胜强者不在少数。这里是师傅为研究属性克制者而修建的地方。"
},
"bg": "hkz_wftj_zyt",
"icon": "hkz_tx_zyt",
@@ -499,7 +499,7 @@
"jumpId": 11001,
"introduce": {
"key": "gamesummary_node_introdunce_14",
- "text": "去往神秘的远方，探索未知的宇宙，交易珍稀的宝藏！巨怪们踏上了列车，开始了漫长的旅途。"
+ "text": "去往神秘的远方，探索未知宇宙，交易珍稀的宝藏！巨怪们踏上了列车，开始了旅途。"
},
"bg": "hkz_wftj_jgsd",
"icon": "hkz_tx_jgsd",
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index ef61a73e2..f6349896b 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -9055,7 +9055,7 @@
"id": "13000007",
"name": {
"key": "item_item_name_183",
- "text": "工匠的遗物"
+ "text": "铁匠的笔记"
},
"usetype": 2,
"color": 3,
@@ -9080,15 +9080,15 @@
"img": "wp_icon_10017",
"intr": {
"key": "item_item_intr_183",
- "text": "可以在铁匠铺内，用于工具台升级。"
+ "text": "可以在铁匠铺内，用于铁匠手册升级。"
},
"describe": {
"key": "item_item_describe_183",
- "text": "一位传说级的工匠遗留的工具，外表朴实，使用时却十分得心应手，用于铁匠铺工具台升级。"
+ "text": "某人写下的笔记，纸张皱褶，字迹潦草，但各类图纸画得极为专业。如果试图辨认笔记内容，就要仔细看上半天，才能从字缝里看出来，满本都写着两个字：升级！"
},
"dialogue": {
"key": "item_item_dialogue_183",
- "text": "【奇怪，用起来的时候，总感觉有人站在我身后。】"
+ "text": "【希卡普，你看，这是我多年来的开店经验！现在我就把它们……希卡普？人呢？】"
},
"sale": [
{
@@ -9128,7 +9128,7 @@
"img": "wp_icon_10018",
"intr": {
"key": "item_item_intr_184",
- "text": "可以在铁匠铺内，用于工具台升级。"
+ "text": "可以在铁匠铺内，用于铁匠手册升级。"
},
"describe": {
"key": "item_item_describe_184",
diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json
index 2ccb26fd4..42a70f552 100644
--- a/bin/json/game_navigation.json
+++ b/bin/json/game_navigation.json
@@ -304,23 +304,5 @@
],
"functionicon": "cgt_icon_hfsj",
"jumpId": 10019
- },
- {
- "Id": 18,
- "scene": "CaravanScene",
- "scenename": {
- "key": "navigation_Sheet1_scenename_18",
- "text": "巨怪列车"
- },
- "sceneicon": "ty_qp_zhb",
- "functionname": {
- "key": "navigation_Sheet1_functionname_18",
- "text": "巨怪商队"
- },
- "npcName": [
- "列车长"
- ],
- "functionicon": "cgt_icon_hfsj",
- "jumpId": 11001
}
]
\ No newline at end of file
diff --git a/bin/json/game_newsmithy.json b/bin/json/game_newsmithy.json
index 347ca69e1..cb827ff51 100644
--- a/bin/json/game_newsmithy.json
+++ b/bin/json/game_newsmithy.json
@@ -10,7 +10,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_1",
- "text": "完美惩戒一阶图纸"
+ "text": "一阶惩戒图纸"
},
"star": 1,
"drawing_png": "tj_gjtz1_1",
@@ -48,7 +48,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_2",
- "text": "完美惩戒二阶图纸"
+ "text": "二阶惩戒图纸"
},
"star": 2,
"drawing_png": "tj_gjtz1_2",
@@ -87,7 +87,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_3",
- "text": "完美惩戒三阶图纸"
+ "text": "三阶惩戒图纸"
},
"star": 2,
"drawing_png": "tj_gjtz1_2",
@@ -125,7 +125,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_4",
- "text": "史诗惩戒一阶图纸"
+ "text": "四阶惩戒图纸"
},
"star": 3,
"drawing_png": "tj_gjtz1_3",
@@ -176,7 +176,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_5",
- "text": "史诗惩戒二阶图纸"
+ "text": "五阶惩戒图纸"
},
"star": 3,
"drawing_png": "tj_gjtz1_3",
@@ -226,7 +226,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_6",
- "text": "传说惩戒一阶图纸"
+ "text": "六阶惩戒图纸"
},
"star": 4,
"drawing_png": "tj_gjtz1_4",
@@ -277,7 +277,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_7",
- "text": "传说惩戒二阶图纸"
+ "text": "七阶惩戒图纸"
},
"star": 4,
"drawing_png": "tj_gjtz1_4",
@@ -327,7 +327,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_8",
- "text": "完美惩戒一阶图纸"
+ "text": "八阶惩戒图纸"
},
"star": 4,
"drawing_png": "tj_gjtz1_4",
@@ -384,7 +384,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_9",
- "text": "闪耀惩戒二阶图纸"
+ "text": "九阶惩戒图纸"
},
"star": 4,
"drawing_png": "tj_gjtz1_4",
@@ -440,7 +440,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_10",
- "text": "完美战斗一阶图纸"
+ "text": "一阶战斗图纸"
},
"star": 1,
"drawing_png": "tj_fytz_1_1",
@@ -478,7 +478,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_11",
- "text": "完美战斗二阶图纸"
+ "text": "二阶战斗图纸"
},
"star": 2,
"drawing_png": "tj_fytz_1_2",
@@ -517,7 +517,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_12",
- "text": "完美战斗三阶图纸"
+ "text": "三阶战斗图纸"
},
"star": 2,
"drawing_png": "tj_fytz_1_2",
@@ -555,7 +555,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_13",
- "text": "史诗战斗一阶图纸"
+ "text": "四阶战斗图纸"
},
"star": 3,
"drawing_png": "tj_fytz_1_3",
@@ -606,7 +606,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_14",
- "text": "史诗战斗二阶图纸"
+ "text": "五阶战斗图纸"
},
"star": 3,
"drawing_png": "tj_fytz_1_3",
@@ -656,7 +656,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_15",
- "text": "传说战斗一阶图纸"
+ "text": "六阶战斗图纸"
},
"star": 4,
"drawing_png": "tj_fytz_1_4",
@@ -707,7 +707,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_16",
- "text": "传说战斗二阶图纸"
+ "text": "七阶战斗图纸"
},
"star": 4,
"drawing_png": "tj_fytz_1_4",
@@ -757,7 +757,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_17",
- "text": "完美战斗一阶图纸"
+ "text": "八阶战斗图纸"
},
"star": 4,
"drawing_png": "tj_fytz_1_4",
@@ -814,7 +814,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_18",
- "text": "闪耀战斗二阶图纸"
+ "text": "九阶战斗图纸"
},
"star": 4,
"drawing_png": "tj_fytz_1_4",
@@ -870,7 +870,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_19",
- "text": "完美全能一阶图纸"
+ "text": "一阶全能图纸"
},
"star": 1,
"drawing_png": "tj_fztz_1_1",
@@ -908,7 +908,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_20",
- "text": "完美全能二阶图纸"
+ "text": "二阶全能图纸"
},
"star": 2,
"drawing_png": "tj_fztz_1_2",
@@ -947,7 +947,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_21",
- "text": "完美全能三阶图纸"
+ "text": "三阶全能图纸"
},
"star": 2,
"drawing_png": "tj_fztz_1_2",
@@ -985,7 +985,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_22",
- "text": "史诗全能一阶图纸"
+ "text": "四阶全能图纸"
},
"star": 3,
"drawing_png": "tj_fztz_1_3",
@@ -1036,7 +1036,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_23",
- "text": "史诗全能二阶图纸"
+ "text": "五阶全能图纸"
},
"star": 3,
"drawing_png": "tj_fztz_1_3",
@@ -1086,7 +1086,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_24",
- "text": "传说全能一阶图纸"
+ "text": "六阶全能图纸"
},
"star": 4,
"drawing_png": "tj_fztz_1_4",
@@ -1137,7 +1137,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_25",
- "text": "传说全能二阶图纸"
+ "text": "七阶全能图纸"
},
"star": 4,
"drawing_png": "tj_fztz_1_4",
@@ -1187,7 +1187,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_26",
- "text": "完美全能一阶图纸"
+ "text": "八阶全能图纸"
},
"star": 4,
"drawing_png": "tj_fztz_1_4",
@@ -1244,7 +1244,7 @@
},
"drawing_name": {
"key": "newsmithy_make_drawing_name_27",
- "text": "闪耀全能二阶图纸"
+ "text": "九阶全能图纸"
},
"star": 4,
"drawing_png": "tj_fztz_1_4",
diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index 2fcca27d1..3aef84274 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -1977,7 +1977,7 @@
"main": [
{
"key": 1,
- "param": 4
+ "param": 1
}
],
"wkqbx": 2,
diff --git a/bin/json/game_pandamasmryl.json b/bin/json/game_pandamasmryl.json
index f78c31b15..dfe9bf8a0 100644
--- a/bin/json/game_pandamasmryl.json
+++ b/bin/json/game_pandamasmryl.json
@@ -16,7 +16,7 @@
"energy": 20,
"p": 500,
"before_training": 25003,
- "after_training": 25004,
+ "after_training": 250041,
"buff_group": 1000001
},
{
@@ -36,7 +36,7 @@
"energy": 20,
"p": 500,
"before_training": 25003,
- "after_training": 25004,
+ "after_training": 250041,
"buff_group": 1000001
}
]
\ No newline at end of file
diff --git a/bin/json/game_ruledesc.json b/bin/json/game_ruledesc.json
index 35a834977..91926b76f 100644
--- a/bin/json/game_ruledesc.json
+++ b/bin/json/game_ruledesc.json
@@ -161,7 +161,7 @@
},
"content": {
"key": "ruledesc_ruledesc_content_15",
- "text": "这里可以查看你获得的所有守护者们，选择守护者点击右侧按钮可以查看详细界面并且强化他们。
在强化界面，可以有各种方式强化守护者。
守护者等级强化：
点击守护者经验条下方的加号按钮可以进入守护者升级界面，使用护身符可以快速提升守护者等级。
守护者升星：
当守护者等级达到当前星级最大值（三星最大等级为30级，四星为40级，5星为50级，6星60级），可以使用荣耀徽章提升守护者星级，并解锁最高等级上限。守护者最高为6星。荣耀徽章可以通过合成或分解操作，进行不同星级之间的转换。
守护者技能等级强化：
点击技能图标上方的按钮，可以进入守护者技能升级界面，使用不同等级的功夫卷轴可以强化不同稀有度的守护者的技能等级。技能等级提升为随机提升该守护者未满级的技能等级。
守护者觉醒：
可以在觉醒界面使用守护之心强化你的守护者。觉醒道具守护之心主要为招募重复守护者获得。
守护者回响：
可以在回响界面使用回响强化道具强化你的守护者。回响强化道具可以再猎魂与宝箱中获得。"
+ "text": "这里可以查看你获得的所有守护者们，选择守护者点击右侧按钮可以查看详细界面并且强化他们。
在强化界面，可以有各种方式强化守护者。
守护者等级强化：
点击守护者经验条下方的加号按钮可以进入守护者升级界面，使用护身符可以快速提升守护者等级。
守护者星级强化：
当守护者等级达到当前星级最大值（三星最大等级为30级，四星为40级，5星为50级，6星60级），可以使用荣耀徽章提升守护者星级，并解锁最高等级上限。守护者最高为6星。荣耀徽章可以通过合成或分解操作，进行不同星级之间的转换。
守护者技能等级强化：
点击技能图标上方的按钮，可以进入守护者技能升级界面，使用不同等级的功夫卷轴可以强化不同稀有度的守护者的技能等级。技能等级提升为随机提升该守护者未满级的技能等级。
守护者觉醒：
可以在觉醒界面使用守护之心强化你的守护者。觉醒道具守护之心主要在招募重复守护者获得。
守护者回响：
可以在回响界面使用回响强化道具强化你的守护者。回响强化道具可以在猎魂与宝箱中获得。"
}
},
{
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index dbd3e38a9..f4339d9f4 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -5189,7 +5189,7 @@
1000,
1,
2,
- 50
+ 1000
],
"FollowSK": [],
"SucFollowSK": [],
@@ -5233,7 +5233,7 @@
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
- 435001211,
+ 435001213,
-1,
-1
],
@@ -24807,6 +24807,8 @@
1,
-1,
2,
+ -1,
+ 3,
-1
],
"FollowSK": [],
@@ -24878,6 +24880,8 @@
1,
-1,
2,
+ -1,
+ 3,
-1
],
"FollowSK": [],
@@ -24949,6 +24953,8 @@
1,
-1,
2,
+ -1,
+ 3,
-1
],
"FollowSK": [],
@@ -25020,6 +25026,8 @@
1,
-1,
2,
+ -1,
+ 3,
-1
],
"FollowSK": [],
@@ -25107,12 +25115,12 @@
"From": 3,
"Where": [],
"Order": "",
- "Limit": 1,
+ "Limit": 10,
"ExecuteCnt": 1,
"Type": 7,
"Argu": [
390001004,
- -1,
+ 1,
1
],
"FollowSK": [],
@@ -56578,7 +56586,7 @@
"Type": 7,
"Argu": [
1,
- -1,
+ 1,
1
],
"FollowSK": [],
@@ -57919,7 +57927,7 @@
{
"Id": 945003212,
"EmitPR": 1000,
- "From": 9,
+ "From": 13,
"Where": [],
"Order": "",
"Limit": 10,
@@ -57927,7 +57935,8 @@
"Type": 5,
"Argu": [
2,
- 300
+ 2,
+ 150
],
"FollowSK": [],
"SucFollowSK": [],
@@ -58036,7 +58045,7 @@
{
"Id": 913003313,
"EmitPR": 1000,
- "From": 8,
+ "From": 4,
"Where": [],
"Order": "",
"Limit": 1,
@@ -58174,6 +58183,53 @@
"RevisiCondition": "",
"RevisiParams": []
},
+ {
+ "Id": 913003319,
+ "EmitPR": 1000,
+ "From": 3,
+ "Where": [],
+ "Order": "",
+ "Limit": 10,
+ "ExecuteCnt": 1,
+ "Type": 2,
+ "Argu": [
+ 491300332,
+ -1,
+ -1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "DpsRevisiType": 0,
+ "DpsCondition": "",
+ "RevisiCondition": "",
+ "RevisiParams": []
+ },
+ {
+ "Id": 913003320,
+ "EmitPR": 1000,
+ "From": 12,
+ "Where": [],
+ "Order": "",
+ "Limit": 10,
+ "ExecuteCnt": 1,
+ "Type": 3,
+ "Argu": [
+ 390001105,
+ 500,
+ 1,
+ 1
+ ],
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "DpsRevisiType": 0,
+ "DpsCondition": "",
+ "RevisiCondition": "",
+ "RevisiParams": []
+ },
{
"Id": 935005311,
"EmitPR": 1000,
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index 908a77c43..480d44432 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -3357,7 +3357,9 @@
235001214
]
},
- "passSkill": [],
+ "passSkill": [
+ 235001215
+ ],
"Desc": {
"key": "skill_skill_atk_Desc_135001211_1",
"text": "吸收当前自身附着的所有神力并攻击敌方1个目标，造成攻击力510%的伤害。每个被吸收的神力恢复自身10%的最大生命值的生命。攻击前获得2回合可吸收自身10%最大生命值伤害的[color=#37d8a9]护盾[/color] ，每个被吸收的神力额外提升5%最大生命值的[color=#37d8a9]护盾[/color] 。"
@@ -3390,7 +3392,9 @@
235001221
]
},
- "passSkill": [],
+ "passSkill": [
+ 235001215
+ ],
"Desc": {
"key": "skill_skill_atk_Desc_135001211_2",
"text": "伤害提升至540%。"
@@ -3423,7 +3427,9 @@
235001231
]
},
- "passSkill": [],
+ "passSkill": [
+ 235001215
+ ],
"Desc": {
"key": "skill_skill_atk_Desc_135001211_3",
"text": "伤害提升至570%。"
@@ -3456,7 +3462,9 @@
235001241
]
},
- "passSkill": [],
+ "passSkill": [
+ 235001215
+ ],
"Desc": {
"key": "skill_skill_atk_Desc_135001211_4",
"text": "伤害提升至600%。"
@@ -3489,7 +3497,9 @@
235001214
]
},
- "passSkill": [],
+ "passSkill": [
+ 235001215
+ ],
"Desc": {
"key": "skill_skill_atk_Desc_135001211_5",
"text": "冷却时间减少1回合。"
@@ -38272,13 +38282,13 @@
"Target": 0,
"ChildSkill": {
"Id": [
- 913003318
+ 913003319
]
},
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_913003432_1",
- "text": "每回合吸收被封印目标4%的最大血量"
+ "text": "2技能50%附加1回合眩晕"
},
"buffid": [],
"map": ""
@@ -45339,7 +45349,7 @@
"passSkill": [],
"Desc": {
"key": "skill_skill_atk_Desc_943006433_1",
- "text": "目标血量低于50%时额外附加1回合复苏"
+ "text": "自身释放恢复类技能时若目标低于50%时额外附加1回合复苏"
},
"buffid": [],
"map": ""
diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json
index ad2d390a1..47689a226 100644
--- a/bin/json/game_skillpassive.json
+++ b/bin/json/game_skillpassive.json
@@ -7877,11 +7877,11 @@
},
{
"Id": 494300631,
- "When": 16,
+ "When": 7,
"FromCheck": "",
"TargetCheck": "Target=1,Hpproless=500",
- "MainSkillCheck": "SkillPos=3",
- "AfterSkillCheck": "",
+ "MainSkillCheck": "",
+ "AfterSkillCheck": "SkillID=243006211",
"BuffCheck": "",
"DpsCheck": "",
"AddCon": [],
@@ -7919,7 +7919,7 @@
"Id": 494400531,
"When": 28,
"FromCheck": "Target=3",
- "TargetCheck": "Target=2",
+ "TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "Succ=1",
@@ -7939,7 +7939,7 @@
"Id": 494400532,
"When": 29,
"FromCheck": "Target=3",
- "TargetCheck": "Target=2",
+ "TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "Succ=1",
@@ -8806,7 +8806,7 @@
"TargetCheck": "Target=3",
"MainSkillCheck": "SkillPos=2",
"AfterSkillCheck": "",
- "BuffCheck": "BuffID=390001119,BuffID=390001120,BuffID=390001121,Succ=1",
+ "BuffCheck": "Effect=9,Succ=1",
"DpsCheck": "",
"AddCon": [],
"PasPr": 1000,
@@ -8838,7 +8838,6 @@
"Callback": [
934002311
]
-<<<<<<< HEAD
},
{
"Id": 481300223,
@@ -8899,7 +8898,25 @@
"Callback": [
814003214
]
-=======
->>>>>>> 61db84522abaac01acc58fffb57e5601d35ad929
+ },
+ {
+ "Id": 491300332,
+ "When": 16,
+ "FromCheck": "",
+ "TargetCheck": "Target=2",
+ "MainSkillCheck": "SkillPos=2",
+ "AfterSkillCheck": "",
+ "BuffCheck": "",
+ "DpsCheck": "",
+ "AddCon": [],
+ "PasPr": 1000,
+ "PasCorrection": 0,
+ "Type": "CallSkillPas",
+ "MaxEmitTimesInRoundByRole": 0,
+ "MaxEmitTimes": 0,
+ "MaxEmitTimesInRound": 0,
+ "Callback": [
+ 913003320
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_smithyidtool.json b/bin/json/game_smithyidtool.json
index 2d136a9f8..027651f3a 100644
--- a/bin/json/game_smithyidtool.json
+++ b/bin/json/game_smithyidtool.json
@@ -13,7 +13,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_1",
- "text": "销售精英等级.{0}"
+ "text": "标价的艺术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_1",
@@ -36,7 +36,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_2",
- "text": "销售精英等级.{0}"
+ "text": "标价的艺术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_2",
@@ -59,7 +59,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_3",
- "text": "销售精英等级.{0}"
+ "text": "标价的艺术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_3",
@@ -82,7 +82,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_4",
- "text": "销售精英等级.{0}"
+ "text": "标价的艺术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_4",
@@ -105,7 +105,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_5",
- "text": "销售精英等级.{0}"
+ "text": "标价的艺术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_5",
@@ -122,7 +122,7 @@
"up_material": [],
"name_text": {
"key": "newsmithy_tool_name_text_6",
- "text": "销售精英等级.{0}"
+ "text": "标价的艺术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_6",
@@ -145,11 +145,11 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_7",
- "text": "节能环保等级.{0}"
+ "text": "节能宣传册 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_7",
- "text": "所有打造炉温消耗减少{0}%"
+ "text": "所有锻造炉温消耗减少{0}%"
},
"content_png": "tj_icon_jnsc",
"value": 0
@@ -168,11 +168,11 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_8",
- "text": "节能环保等级.{0}"
+ "text": "节能宣传册 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_8",
- "text": "所有打造炉温消耗减少{0}%"
+ "text": "所有锻造炉温消耗减少{0}%"
},
"content_png": "tj_icon_jnsc",
"value": 100
@@ -191,11 +191,11 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_9",
- "text": "节能环保等级.{0}"
+ "text": "节能宣传册 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_9",
- "text": "所有打造炉温消耗减少{0}%"
+ "text": "所有锻造炉温消耗减少{0}%"
},
"content_png": "tj_icon_jnsc",
"value": 200
@@ -214,11 +214,11 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_10",
- "text": "节能环保等级.{0}"
+ "text": "节能宣传册 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_10",
- "text": "所有打造炉温消耗减少{0}%"
+ "text": "所有锻造炉温消耗减少{0}%"
},
"content_png": "tj_icon_jnsc",
"value": 300
@@ -237,11 +237,11 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_11",
- "text": "节能环保等级.{0}"
+ "text": "节能宣传册 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_11",
- "text": "所有打造炉温消耗减少{0}%"
+ "text": "所有锻造炉温消耗减少{0}%"
},
"content_png": "tj_icon_jnsc",
"value": 400
@@ -254,7 +254,7 @@
"up_material": [],
"name_text": {
"key": "newsmithy_tool_name_text_12",
- "text": "节能环保等级.{0}"
+ "text": "节能宣传册 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_12",
@@ -277,7 +277,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_13",
- "text": "推广引流等级.{0}"
+ "text": "店铺传单 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_13",
@@ -300,7 +300,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_14",
- "text": "推广引流等级.{0}"
+ "text": "店铺传单 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_14",
@@ -317,7 +317,7 @@
"up_material": [],
"name_text": {
"key": "newsmithy_tool_name_text_15",
- "text": "推广引流等级.{0}"
+ "text": "店铺传单 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_15",
@@ -340,7 +340,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_16",
- "text": "倾销货物等级.{0}"
+ "text": "铁匠推销法 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_16",
@@ -363,7 +363,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_17",
- "text": "倾销货物等级.{0}"
+ "text": "铁匠推销法 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_17",
@@ -386,7 +386,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_18",
- "text": "倾销货物等级.{0}"
+ "text": "铁匠推销法 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_18",
@@ -403,7 +403,7 @@
"up_material": [],
"name_text": {
"key": "newsmithy_tool_name_text_19",
- "text": "倾销货物等级.{0}"
+ "text": "铁匠推销法 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_19",
@@ -426,7 +426,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_20",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_20",
@@ -449,7 +449,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_21",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_21",
@@ -472,7 +472,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_22",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_22",
@@ -495,7 +495,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_23",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_23",
@@ -518,7 +518,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_24",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_24",
@@ -541,7 +541,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_25",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_25",
@@ -564,7 +564,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_26",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_26",
@@ -587,7 +587,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_27",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_27",
@@ -610,7 +610,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_28",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_28",
@@ -633,7 +633,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_29",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_29",
@@ -650,7 +650,7 @@
"up_material": [],
"name_text": {
"key": "newsmithy_tool_name_text_30",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_30",
diff --git a/bin/json/game_smithytool.json b/bin/json/game_smithytool.json
index 2d136a9f8..027651f3a 100644
--- a/bin/json/game_smithytool.json
+++ b/bin/json/game_smithytool.json
@@ -13,7 +13,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_1",
- "text": "销售精英等级.{0}"
+ "text": "标价的艺术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_1",
@@ -36,7 +36,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_2",
- "text": "销售精英等级.{0}"
+ "text": "标价的艺术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_2",
@@ -59,7 +59,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_3",
- "text": "销售精英等级.{0}"
+ "text": "标价的艺术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_3",
@@ -82,7 +82,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_4",
- "text": "销售精英等级.{0}"
+ "text": "标价的艺术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_4",
@@ -105,7 +105,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_5",
- "text": "销售精英等级.{0}"
+ "text": "标价的艺术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_5",
@@ -122,7 +122,7 @@
"up_material": [],
"name_text": {
"key": "newsmithy_tool_name_text_6",
- "text": "销售精英等级.{0}"
+ "text": "标价的艺术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_6",
@@ -145,11 +145,11 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_7",
- "text": "节能环保等级.{0}"
+ "text": "节能宣传册 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_7",
- "text": "所有打造炉温消耗减少{0}%"
+ "text": "所有锻造炉温消耗减少{0}%"
},
"content_png": "tj_icon_jnsc",
"value": 0
@@ -168,11 +168,11 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_8",
- "text": "节能环保等级.{0}"
+ "text": "节能宣传册 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_8",
- "text": "所有打造炉温消耗减少{0}%"
+ "text": "所有锻造炉温消耗减少{0}%"
},
"content_png": "tj_icon_jnsc",
"value": 100
@@ -191,11 +191,11 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_9",
- "text": "节能环保等级.{0}"
+ "text": "节能宣传册 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_9",
- "text": "所有打造炉温消耗减少{0}%"
+ "text": "所有锻造炉温消耗减少{0}%"
},
"content_png": "tj_icon_jnsc",
"value": 200
@@ -214,11 +214,11 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_10",
- "text": "节能环保等级.{0}"
+ "text": "节能宣传册 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_10",
- "text": "所有打造炉温消耗减少{0}%"
+ "text": "所有锻造炉温消耗减少{0}%"
},
"content_png": "tj_icon_jnsc",
"value": 300
@@ -237,11 +237,11 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_11",
- "text": "节能环保等级.{0}"
+ "text": "节能宣传册 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_11",
- "text": "所有打造炉温消耗减少{0}%"
+ "text": "所有锻造炉温消耗减少{0}%"
},
"content_png": "tj_icon_jnsc",
"value": 400
@@ -254,7 +254,7 @@
"up_material": [],
"name_text": {
"key": "newsmithy_tool_name_text_12",
- "text": "节能环保等级.{0}"
+ "text": "节能宣传册 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_12",
@@ -277,7 +277,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_13",
- "text": "推广引流等级.{0}"
+ "text": "店铺传单 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_13",
@@ -300,7 +300,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_14",
- "text": "推广引流等级.{0}"
+ "text": "店铺传单 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_14",
@@ -317,7 +317,7 @@
"up_material": [],
"name_text": {
"key": "newsmithy_tool_name_text_15",
- "text": "推广引流等级.{0}"
+ "text": "店铺传单 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_15",
@@ -340,7 +340,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_16",
- "text": "倾销货物等级.{0}"
+ "text": "铁匠推销法 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_16",
@@ -363,7 +363,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_17",
- "text": "倾销货物等级.{0}"
+ "text": "铁匠推销法 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_17",
@@ -386,7 +386,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_18",
- "text": "倾销货物等级.{0}"
+ "text": "铁匠推销法 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_18",
@@ -403,7 +403,7 @@
"up_material": [],
"name_text": {
"key": "newsmithy_tool_name_text_19",
- "text": "倾销货物等级.{0}"
+ "text": "铁匠推销法 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_19",
@@ -426,7 +426,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_20",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_20",
@@ -449,7 +449,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_21",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_21",
@@ -472,7 +472,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_22",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_22",
@@ -495,7 +495,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_23",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_23",
@@ -518,7 +518,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_24",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_24",
@@ -541,7 +541,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_25",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_25",
@@ -564,7 +564,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_26",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_26",
@@ -587,7 +587,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_27",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_27",
@@ -610,7 +610,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_28",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_28",
@@ -633,7 +633,7 @@
],
"name_text": {
"key": "newsmithy_tool_name_text_29",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_29",
@@ -650,7 +650,7 @@
"up_material": [],
"name_text": {
"key": "newsmithy_tool_name_text_30",
- "text": "制造大师等级.{0}"
+ "text": "高阶锻造术 等级{0}"
},
"content_text": {
"key": "newsmithy_tool_content_text_30",
diff --git a/bin/json/game_topuiconfig.json b/bin/json/game_topuiconfig.json
index b16b245dc..07d8c45d6 100644
--- a/bin/json/game_topuiconfig.json
+++ b/bin/json/game_topuiconfig.json
@@ -2602,7 +2602,7 @@
"currencyField": [
{
"a": "item",
- "t": "24010001",
+ "t": "24011001",
"n": 0
}
]
@@ -2613,7 +2613,7 @@
"currencyField": [
{
"a": "item",
- "t": "24010001",
+ "t": "24011001",
"n": 0
}
]
diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json
index b8f2ba838..0db44f1ec 100644
--- a/bin/json/game_worldbattle.json
+++ b/bin/json/game_worldbattle.json
@@ -133,7 +133,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -148,7 +148,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -163,7 +163,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -178,7 +178,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -193,7 +193,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -208,7 +208,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -223,7 +223,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -238,7 +238,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -253,7 +253,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -268,7 +268,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -283,7 +283,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -298,7 +298,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -313,7 +313,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -328,7 +328,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -343,7 +343,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -358,7 +358,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -373,7 +373,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -388,7 +388,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -403,7 +403,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -418,7 +418,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -433,7 +433,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -448,7 +448,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -463,7 +463,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -478,7 +478,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
@@ -493,7 +493,7 @@
"playexp": {
"a": "attr",
"t": "exp",
- "n": 0
+ "n": 5
},
"carexe": 500,
"reward": 0
diff --git a/modules/caravan/module.go b/modules/caravan/module.go
index b59f4cbc7..90c0ee434 100644
--- a/modules/caravan/module.go
+++ b/modules/caravan/module.go
@@ -164,13 +164,14 @@ func (this *Caravan) InitCaravanItemData(uid string, data *pb.DBCaravan) {
bUp = true
}
}
-
- if bUp { // 价格上涨
- goods.Price = int32(math.Floor(float64(goods.Price) * (1.0 + float64(c.FluctuationRange)/1000.0)))
- } else {
- goods.Price = int32(math.Floor(float64(goods.Price) * (1.0 - float64(c.FluctuationRange)/1000.0)))
+ if len(c.FluctuationRange) == 2 {
+ p := comm.GetRandNum(c.PriceChangeWeightThree[0], c.PriceChangeWeightThree[1])
+ if bUp { // 价格上涨
+ goods.Price = int32(math.Floor(float64(goods.Price) * (1.0 + float64(p)/1000.0)))
+ } else {
+ goods.Price = int32(math.Floor(float64(goods.Price) * (1.0 - float64(p)/1000.0)))
+ }
}
-
if goods.Price < c.Pricemin { // 设置最小值
goods.Price = c.Pricemin
}
@@ -295,10 +296,13 @@ func (this *Caravan) refreshCaravanCityInfo(uid string, caravan *pb.DBCaravan) {
}
}
- if bUp { // 价格上涨
- v.Price = int32(math.Floor(float64(v.Price) * (1.0 + float64(c.FluctuationRange)/1000.0)))
- } else {
- v.Price = int32(math.Floor(float64(v.Price) * (1.0 - float64(c.FluctuationRange)/1000.0)))
+ if len(c.FluctuationRange) == 2 {
+ p := comm.GetRandNum(c.PriceChangeWeightThree[0], c.PriceChangeWeightThree[1])
+ if bUp { // 价格上涨
+ v.Price = int32(math.Floor(float64(v.Price) * (1.0 + float64(p)/1000.0)))
+ } else {
+ v.Price = int32(math.Floor(float64(v.Price) * (1.0 - float64(p)/1000.0)))
+ }
}
if v.Price < c.Pricemin { // 设置最小值
diff --git a/sys/configure/structs/Game.CaravanThingData.go b/sys/configure/structs/Game.CaravanThingData.go
index a43cca6fd..f69a9837d 100644
--- a/sys/configure/structs/Game.CaravanThingData.go
+++ b/sys/configure/structs/Game.CaravanThingData.go
@@ -19,7 +19,7 @@ type GameCaravanThingData struct {
PriceChangeWeightOne []int32
PriceChangeWeightTwo []int32
PriceChangeWeightThree []int32
- FluctuationRange int32
+ FluctuationRange []int32
Pricemin int32
Pricemax int32
Goodsnum int32
@@ -106,7 +106,20 @@ func (_v *GameCaravanThingData)Deserialize(_buf map[string]interface{}) (err err
}
}
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["FluctuationRange"].(float64); !_ok_ { err = errors.New("FluctuationRange error"); return }; _v.FluctuationRange = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["FluctuationRange"].([]interface{}); !_ok_ { err = errors.New("FluctuationRange error"); return }
+
+ _v.FluctuationRange = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.FluctuationRange = append(_v.FluctuationRange, _list_v_)
+ }
+ }
+
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pricemin"].(float64); !_ok_ { err = errors.New("pricemin error"); return }; _v.Pricemin = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pricemax"].(float64); !_ok_ { err = errors.New("pricemax error"); return }; _v.Pricemax = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["goodsnum"].(float64); !_ok_ { err = errors.New("goodsnum error"); return }; _v.Goodsnum = int32(_tempNum_) }