From 87ae8573e80f7c93c42c6e6d9db1177d97ca1c93 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 17 Oct 2023 14:36:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E9=BE=99=E5=A2=9E=E5=8A=A0=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E5=BC=80=E5=A7=8B=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_global.json | 8 +- bin/json/game_item.json | 46 +++++++ bin/json/game_taskround.json | 36 +++++- modules/items/module.go | 2 +- modules/jielong/api_result.go | 3 +- modules/jielong/api_start.go | 52 ++++++++ modules/privilege/api_buygift.go | 10 +- pb/jielong_db.pb.go | 30 +++-- pb/jielong_msg.pb.go | 149 ++++++++++++++++++++--- pb/privilege_msg.pb.go | 102 +++++++++------- sys/configure/structs/game.globalData.go | 4 +- 11 files changed, 361 insertions(+), 81 deletions(-) create mode 100644 modules/jielong/api_start.go diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 8080c5115..24da25a75 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -660,7 +660,7 @@ "puzzlePromptNum": 9, "Daily_Tips": { "a": "item", - "t": "10000006", + "t": "26000001", "n": 1 }, "Daily_Num": 5, @@ -865,6 +865,10 @@ ], "quickcard_aispeed": 400, "fastplay_interaction": 8, - "fastplay_item": "24013003" + "fastplay_item": { + "a": "item", + "t": "24013003", + "n": 1 + } } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 22b69588f..e2f3acada 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -20262,5 +20262,51 @@ } ], "gm": 1 + }, + { + "id": "26000001", + "name": { + "key": "item_item_name_416", + "text": "拼图提示道具" + }, + "usetype": 2, + "color": 3, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "wp_icon_jjcq", + "intr": { + "key": "item_item_intr_411", + "text": "帮助玩家快速破解波比拼图的道具" + }, + "describe": { + "key": "item_item_describe_411", + "text": "放松大脑的专属道具，便捷性智慧结晶，快捷的成功小工具。" + }, + "dialogue": { + "key": "item_item_dialogue_409", + "text": "【这是，参考答案？】" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1001 + } + ], + "gm": 1 } ] \ No newline at end of file diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json index e879b7dbe..ee59c97d8 100644 --- a/bin/json/game_taskround.json +++ b/bin/json/game_taskround.json @@ -80,6 +80,11 @@ "a": "attr", "t": "diamond", "n": 50 + }, + { + "a": "item", + "t": "26000001", + "n": 1 } ] }, @@ -164,6 +169,11 @@ "a": "attr", "t": "diamond", "n": 50 + }, + { + "a": "item", + "t": "26000001", + "n": 1 } ] }, @@ -248,6 +258,11 @@ "a": "attr", "t": "gold", "n": 100000 + }, + { + "a": "item", + "t": "26000001", + "n": 1 } ] }, @@ -332,6 +347,11 @@ "a": "attr", "t": "gold", "n": 100000 + }, + { + "a": "item", + "t": "26000001", + "n": 1 } ] }, @@ -416,6 +436,11 @@ "a": "attr", "t": "gold", "n": 100000 + }, + { + "a": "item", + "t": "26000001", + "n": 1 } ] }, @@ -437,7 +462,7 @@ "reword": [ { "a": "item", - "t": "10000002", + "t": "17060006", "n": 50 }, { @@ -465,7 +490,7 @@ "reword": [ { "a": "item", - "t": "10000002", + "t": "17060006", "n": 60 }, { @@ -493,13 +518,18 @@ "reword": [ { "a": "item", - "t": "10000002", + "t": "17060006", "n": 85 }, { "a": "attr", "t": "gold", "n": 100000 + }, + { + "a": "item", + "t": "26000001", + "n": 1 } ] } diff --git a/modules/items/module.go b/modules/items/module.go index f5fc24f93..51270c683 100644 --- a/modules/items/module.go +++ b/modules/items/module.go @@ -432,7 +432,7 @@ func (this *Items) InitItemBagData(session comm.IUserSession) (errdata *pb.Error // 接龙小游戏道具恢复 jielongMaxNum := this.ModuleTools.GetGlobalConf().FastplayInteraction jielongItemId := this.ModuleTools.GetGlobalConf().FastplayItem - curNum = int32(this.QueryItemAmount(session.GetUserId(), jielongItemId)) + curNum = int32(this.QueryItemAmount(session.GetUserId(), jielongItemId.T)) if curNum < jielongMaxNum { this.AddItem(session, dragonItemNum, jielongMaxNum-curNum, true) diff --git a/modules/jielong/api_result.go b/modules/jielong/api_result.go index 705500bbf..edcc58480 100644 --- a/modules/jielong/api_result.go +++ b/modules/jielong/api_result.go @@ -31,7 +31,8 @@ func (this *apiComp) Result(session comm.IUserSession, req *pb.JielongResultReq) } return } - + list.Status = 0 + update["status"] = list.Status // 重置状态 if req.Bwin { list.Wincount += 1 // 连胜+1 if list.Wincount > list.Hisotry { diff --git a/modules/jielong/api_start.go b/modules/jielong/api_start.go new file mode 100644 index 000000000..81d2284e3 --- /dev/null +++ b/modules/jielong/api_start.go @@ -0,0 +1,52 @@ +package jielong + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +// 参数校验 +func (this *apiComp) StartGameCheck(session comm.IUserSession, req *pb.JielongStarGameReq) (errdata *pb.ErrorData) { + + return +} + +func (this *apiComp) StartGame(session comm.IUserSession, req *pb.JielongStarGameReq) (errdata *pb.ErrorData) { + var ( + list *pb.DBJielongData + err error + update map[string]interface{} + ) + update = make(map[string]interface{}, 0) + if errdata = this.StartGameCheck(session, req); errdata != nil { + return + } + + list, err = this.module.modelJielong.getUserJielongData(session.GetUserId()) + if err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: err.Error(), + } + return + } + + // 校验门票够不够 + jielongItem := this.module.ModuleTools.GetGlobalConf().FastplayItem + if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{jielongItem}, true); errdata != nil { + return + } + if list.Status == 1 { + list.Wincount = 0 + update["wincount"] = list.Wincount + } + if len(update) > 0 { + this.module.modelJielong.changeJielongData(session.GetUserId(), update) + } + session.SendMsg(string(this.module.GetType()), "startgame", &pb.JielongStarGameResp{ + Susses: true, + }) + return +} diff --git a/modules/privilege/api_buygift.go b/modules/privilege/api_buygift.go index cadf85a83..0b1d7367c 100644 --- a/modules/privilege/api_buygift.go +++ b/modules/privilege/api_buygift.go @@ -20,6 +20,9 @@ func (this *apiComp) BuyGiftCheck(session comm.IUserSession, req *pb.PrivilegeBu ///获取特权列表 func (this *apiComp) BuyGift(session comm.IUserSession, req *pb.PrivilegeBuyGiftReq) (errdata *pb.ErrorData) { + var ( + atno []*pb.UserAtno + ) if errdata = this.BuyGiftCheck(session, req); errdata != nil { return } @@ -70,7 +73,7 @@ func (this *apiComp) BuyGift(session comm.IUserSession, req *pb.PrivilegeBuyGift } } // 加资源 - if errdata = this.module.DispenseRes(session, conf.Giftinfo, true); errdata != nil { + if errdata, atno = this.module.DispenseAtno(session, conf.Giftinfo, true); errdata != nil { return } vip.Reward[req.VipLv] = true @@ -79,6 +82,9 @@ func (this *apiComp) BuyGift(session comm.IUserSession, req *pb.PrivilegeBuyGift "reward": vip.Reward, }) // 推送 - session.SendMsg(string(this.module.GetType()), PrivilegeBuyGiftResp, &pb.PrivilegeBuyGiftResp{Data: vip}) + session.SendMsg(string(this.module.GetType()), PrivilegeBuyGiftResp, &pb.PrivilegeBuyGiftResp{ + Data: vip, + Res: atno, + }) return } diff --git a/pb/jielong_db.pb.go b/pb/jielong_db.pb.go index a800c8919..aa3ddabfd 100644 --- a/pb/jielong_db.pb.go +++ b/pb/jielong_db.pb.go @@ -33,6 +33,7 @@ type DBJielongData struct { Hisotry int32 `protobuf:"varint,5,opt,name=hisotry,proto3" json:"hisotry"` // 历史最高连胜次数 Gotarr map[int32]int32 `protobuf:"bytes,6,rep,name=gotarr,proto3" json:"gotarr" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 历史最高记录奖励 Lasttime int64 `protobuf:"varint,7,opt,name=lasttime,proto3" json:"lasttime"` + Status int32 `protobuf:"varint,8,opt,name=status,proto3" json:"status"` // 记录状态 此字段客户端忽略 } func (x *DBJielongData) Reset() { @@ -116,11 +117,18 @@ func (x *DBJielongData) GetLasttime() int64 { return 0 } +func (x *DBJielongData) GetStatus() int32 { + if x != nil { + return x.Status + } + return 0 +} + var File_jielong_jielong_db_proto protoreflect.FileDescriptor var file_jielong_jielong_db_proto_rawDesc = []byte{ 0x0a, 0x18, 0x6a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x2f, 0x6a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, - 0x67, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe1, 0x02, 0x0a, 0x0d, 0x44, + 0x67, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf9, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, @@ -135,15 +143,17 @@ var file_jielong_jielong_db_proto_rawDesc = []byte{ 0x6c, 0x6f, 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61, 0x2e, 0x47, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, - 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, - 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x47, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, + 0x75, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x47, + 0x6f, 0x74, 0x61, 0x72, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/jielong_msg.pb.go b/pb/jielong_msg.pb.go index 3dc72df33..4eed433b4 100644 --- a/pb/jielong_msg.pb.go +++ b/pb/jielong_msg.pb.go @@ -302,6 +302,92 @@ func (x *JielongRewardResp) GetRes() []*UserAtno { return nil } +// 开始接龙 +type JielongStarGameReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *JielongStarGameReq) Reset() { + *x = JielongStarGameReq{} + if protoimpl.UnsafeEnabled { + mi := &file_jielong_jielong_msg_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *JielongStarGameReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*JielongStarGameReq) ProtoMessage() {} + +func (x *JielongStarGameReq) ProtoReflect() protoreflect.Message { + mi := &file_jielong_jielong_msg_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use JielongStarGameReq.ProtoReflect.Descriptor instead. +func (*JielongStarGameReq) Descriptor() ([]byte, []int) { + return file_jielong_jielong_msg_proto_rawDescGZIP(), []int{6} +} + +type JielongStarGameResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Susses bool `protobuf:"varint,1,opt,name=susses,proto3" json:"susses"` +} + +func (x *JielongStarGameResp) Reset() { + *x = JielongStarGameResp{} + if protoimpl.UnsafeEnabled { + mi := &file_jielong_jielong_msg_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *JielongStarGameResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*JielongStarGameResp) ProtoMessage() {} + +func (x *JielongStarGameResp) ProtoReflect() protoreflect.Message { + mi := &file_jielong_jielong_msg_proto_msgTypes[7] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use JielongStarGameResp.ProtoReflect.Descriptor instead. +func (*JielongStarGameResp) Descriptor() ([]byte, []int) { + return file_jielong_jielong_msg_proto_rawDescGZIP(), []int{7} +} + +func (x *JielongStarGameResp) GetSusses() bool { + if x != nil { + return x.Susses + } + return false +} + var File_jielong_jielong_msg_proto protoreflect.FileDescriptor var file_jielong_jielong_msg_proto_rawDesc = []byte{ @@ -327,8 +413,13 @@ var file_jielong_jielong_msg_proto_rawDesc = []byte{ 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1b, 0x0a, 0x03, 0x72, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, - 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x03, 0x72, 0x65, 0x73, 0x42, 0x06, 0x5a, - 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x03, 0x72, 0x65, 0x73, 0x22, 0x14, 0x0a, + 0x12, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x53, 0x74, 0x61, 0x72, 0x47, 0x61, 0x6d, 0x65, + 0x52, 0x65, 0x71, 0x22, 0x2d, 0x0a, 0x13, 0x4a, 0x69, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x53, 0x74, + 0x61, 0x72, 0x47, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x75, + 0x73, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x75, 0x73, 0x73, + 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -343,22 +434,24 @@ func file_jielong_jielong_msg_proto_rawDescGZIP() []byte { return file_jielong_jielong_msg_proto_rawDescData } -var file_jielong_jielong_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6) +var file_jielong_jielong_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_jielong_jielong_msg_proto_goTypes = []interface{}{ - (*JielongGetListReq)(nil), // 0: JielongGetListReq - (*JielongGetListResp)(nil), // 1: JielongGetListResp - (*JielongResultReq)(nil), // 2: JielongResultReq - (*JielongResultResp)(nil), // 3: JielongResultResp - (*JielongRewardReq)(nil), // 4: JielongRewardReq - (*JielongRewardResp)(nil), // 5: JielongRewardResp - (*DBJielongData)(nil), // 6: DBJielongData - (*UserAtno)(nil), // 7: UserAtno + (*JielongGetListReq)(nil), // 0: JielongGetListReq + (*JielongGetListResp)(nil), // 1: JielongGetListResp + (*JielongResultReq)(nil), // 2: JielongResultReq + (*JielongResultResp)(nil), // 3: JielongResultResp + (*JielongRewardReq)(nil), // 4: JielongRewardReq + (*JielongRewardResp)(nil), // 5: JielongRewardResp + (*JielongStarGameReq)(nil), // 6: JielongStarGameReq + (*JielongStarGameResp)(nil), // 7: JielongStarGameResp + (*DBJielongData)(nil), // 8: DBJielongData + (*UserAtno)(nil), // 9: UserAtno } var file_jielong_jielong_msg_proto_depIdxs = []int32{ - 6, // 0: JielongGetListResp.data:type_name -> DBJielongData - 6, // 1: JielongResultResp.data:type_name -> DBJielongData - 6, // 2: JielongRewardResp.data:type_name -> DBJielongData - 7, // 3: JielongRewardResp.res:type_name -> UserAtno + 8, // 0: JielongGetListResp.data:type_name -> DBJielongData + 8, // 1: JielongResultResp.data:type_name -> DBJielongData + 8, // 2: JielongRewardResp.data:type_name -> DBJielongData + 9, // 3: JielongRewardResp.res:type_name -> UserAtno 4, // [4:4] is the sub-list for method output_type 4, // [4:4] is the sub-list for method input_type 4, // [4:4] is the sub-list for extension type_name @@ -446,6 +539,30 @@ func file_jielong_jielong_msg_proto_init() { return nil } } + file_jielong_jielong_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*JielongStarGameReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_jielong_jielong_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*JielongStarGameResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -453,7 +570,7 @@ func file_jielong_jielong_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_jielong_jielong_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 6, + NumMessages: 8, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/privilege_msg.pb.go b/pb/privilege_msg.pb.go index 88aaba5cf..c51875f31 100644 --- a/pb/privilege_msg.pb.go +++ b/pb/privilege_msg.pb.go @@ -254,7 +254,8 @@ type PrivilegeBuyGiftResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Data *DBVip `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` + Data *DBVip `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` + Res []*UserAtno `protobuf:"bytes,2,rep,name=res,proto3" json:"res"` } func (x *PrivilegeBuyGiftResp) Reset() { @@ -296,6 +297,13 @@ func (x *PrivilegeBuyGiftResp) GetData() *DBVip { return nil } +func (x *PrivilegeBuyGiftResp) GetRes() []*UserAtno { + if x != nil { + return x.Res + } + return nil +} + type PrivilegeVipListReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -434,41 +442,44 @@ var file_privilege_privilege_msg_proto_rawDesc = []byte{ 0x0a, 0x1d, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x2f, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x2f, 0x70, 0x72, 0x69, 0x76, 0x69, - 0x6c, 0x65, 0x67, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x15, 0x0a, - 0x13, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, - 0x74, 0x52, 0x65, 0x71, 0x22, 0x38, 0x0a, 0x14, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, - 0x65, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x50, - 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x28, - 0x0a, 0x14, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x42, 0x75, 0x79, 0x59, 0x75, - 0x65, 0x6b, 0x61, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x49, 0x44, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x49, 0x44, 0x22, 0x39, 0x0a, 0x15, 0x50, 0x72, 0x69, 0x76, - 0x69, 0x6c, 0x65, 0x67, 0x65, 0x42, 0x75, 0x79, 0x59, 0x75, 0x65, 0x6b, 0x61, 0x52, 0x65, 0x73, - 0x70, 0x12, 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x0c, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x22, 0x2b, 0x0a, 0x13, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, - 0x42, 0x75, 0x79, 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x69, - 0x70, 0x4c, 0x76, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, - 0x22, 0x32, 0x0a, 0x14, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x42, 0x75, 0x79, - 0x47, 0x69, 0x66, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x70, 0x52, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, - 0x65, 0x56, 0x69, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x14, 0x50, - 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x56, 0x69, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x70, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, - 0xa6, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x43, 0x68, 0x61, - 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x41, 0x0a, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, - 0x6c, 0x65, 0x67, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x50, 0x72, 0x69, + 0x6c, 0x65, 0x67, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, + 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x15, 0x0a, 0x13, 0x50, 0x72, 0x69, + 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, + 0x22, 0x38, 0x0a, 0x14, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x47, 0x65, 0x74, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x69, 0x76, 0x69, + 0x6c, 0x65, 0x67, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x28, 0x0a, 0x14, 0x50, 0x72, + 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x42, 0x75, 0x79, 0x59, 0x75, 0x65, 0x6b, 0x61, 0x52, + 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x03, 0x63, 0x49, 0x44, 0x22, 0x39, 0x0a, 0x15, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, + 0x65, 0x42, 0x75, 0x79, 0x59, 0x75, 0x65, 0x6b, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, + 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, + 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, + 0x2b, 0x0a, 0x13, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x42, 0x75, 0x79, 0x47, + 0x69, 0x66, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x22, 0x4f, 0x0a, 0x14, + 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x42, 0x75, 0x79, 0x47, 0x69, 0x66, 0x74, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x70, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x12, 0x1b, 0x0a, 0x03, 0x72, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, + 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x03, 0x72, 0x65, 0x73, 0x22, 0x15, 0x0a, + 0x13, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x56, 0x69, 0x70, 0x4c, 0x69, 0x73, + 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x14, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, + 0x65, 0x56, 0x69, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x56, + 0x69, 0x70, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xa6, 0x01, 0x0a, 0x13, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, - 0x2e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x1a, 0x4c, 0x0a, 0x0e, 0x50, 0x72, - 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, - 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x12, 0x41, 0x0a, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x43, + 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, + 0x65, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, + 0x65, 0x67, 0x65, 0x1a, 0x4c, 0x0a, 0x0e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, + 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, + 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( @@ -497,20 +508,22 @@ var file_privilege_privilege_msg_proto_goTypes = []interface{}{ nil, // 9: PrivilegeChangePush.PrivilegeEntry (*DBPrivilege)(nil), // 10: DBPrivilege (*DBVip)(nil), // 11: DBVip - (*PrivilegeList)(nil), // 12: PrivilegeList + (*UserAtno)(nil), // 12: UserAtno + (*PrivilegeList)(nil), // 13: PrivilegeList } var file_privilege_privilege_msg_proto_depIdxs = []int32{ 10, // 0: PrivilegeGetListResp.data:type_name -> DBPrivilege 10, // 1: PrivilegeBuyYuekaResp.data:type_name -> DBPrivilege 11, // 2: PrivilegeBuyGiftResp.data:type_name -> DBVip - 11, // 3: PrivilegeVipListResp.data:type_name -> DBVip - 9, // 4: PrivilegeChangePush.privilege:type_name -> PrivilegeChangePush.PrivilegeEntry - 12, // 5: PrivilegeChangePush.PrivilegeEntry.value:type_name -> PrivilegeList - 6, // [6:6] is the sub-list for method output_type - 6, // [6:6] is the sub-list for method input_type - 6, // [6:6] is the sub-list for extension type_name - 6, // [6:6] is the sub-list for extension extendee - 0, // [0:6] is the sub-list for field type_name + 12, // 3: PrivilegeBuyGiftResp.res:type_name -> UserAtno + 11, // 4: PrivilegeVipListResp.data:type_name -> DBVip + 9, // 5: PrivilegeChangePush.privilege:type_name -> PrivilegeChangePush.PrivilegeEntry + 13, // 6: PrivilegeChangePush.PrivilegeEntry.value:type_name -> PrivilegeList + 7, // [7:7] is the sub-list for method output_type + 7, // [7:7] is the sub-list for method input_type + 7, // [7:7] is the sub-list for extension type_name + 7, // [7:7] is the sub-list for extension extendee + 0, // [0:7] is the sub-list for field type_name } func init() { file_privilege_privilege_msg_proto_init() } @@ -519,6 +532,7 @@ func file_privilege_privilege_msg_proto_init() { return } file_privilege_privilege_db_proto_init() + file_comm_proto_init() if !protoimpl.UnsafeEnabled { file_privilege_privilege_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*PrivilegeGetListReq); i { diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 8458324ae..df9f362a6 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -295,7 +295,7 @@ type GameGlobalData struct { ChallengeNpcStory []int32 QuickcardAispeed float32 FastplayInteraction int32 - FastplayItem string + FastplayItem *Gameatn } const TypeId_GameGlobalData = 477542761 @@ -1161,7 +1161,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["quickcard_aispeed"].(float64); !_ok_ { err = errors.New("quickcard_aispeed error"); return }; _v.QuickcardAispeed = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fastplay_interaction"].(float64); !_ok_ { err = errors.New("fastplay_interaction error"); return }; _v.FastplayInteraction = int32(_tempNum_) } - { var _ok_ bool; if _v.FastplayItem, _ok_ = _buf["fastplay_item"].(string); !_ok_ { err = errors.New("fastplay_item error"); return } } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["fastplay_item"].(map[string]interface{}); !_ok_ { err = errors.New("fastplay_item error"); return }; if _v.FastplayItem, err = DeserializeGameatn(_x_); err != nil { return } } return }