From 2f56e52060f09337d9371b313f8ce350297f5d82 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 30 Nov 2022 11:44:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E5=A4=A9=E8=B4=AD=E4=B9=B0=E6=8A=BD?= =?UTF-8?q?=E5=8D=A1=E5=88=B8=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_libraryfetter.json | 6 ++-- bin/json/game_libraryhero.json | 46 ++++++++++++++++--------------- modules/hero/api_drawCardFloor.go | 2 ++ pb/hero_msg.pb.go | 27 +++++++++++++++--- 4 files changed, 52 insertions(+), 29 deletions(-) diff --git a/bin/json/game_libraryfetter.json b/bin/json/game_libraryfetter.json index b70c7ea34..5c293df1c 100644 --- a/bin/json/game_libraryfetter.json +++ b/bin/json/game_libraryfetter.json @@ -107,7 +107,7 @@ "hid": [ "25001", "35001", - "11009" + "15004" ], "favorlv": 1, "prize": [ @@ -140,7 +140,7 @@ "hid": [ "25001", "35001", - "11009" + "15004" ], "favorlv": 2, "prize": [ @@ -173,7 +173,7 @@ "hid": [ "25001", "35001", - "11009" + "15004" ], "favorlv": 3, "prize": [ diff --git a/bin/json/game_libraryhero.json b/bin/json/game_libraryhero.json index 1de5dedbd..54c92aa28 100644 --- a/bin/json/game_libraryhero.json +++ b/bin/json/game_libraryhero.json @@ -16,8 +16,8 @@ 2, 3 ], - "startid": 10001, - "rightend": 10001008, + "startid": 300001, + "rightend": 3000014, "special_stroyprize": [ { "a": "attr", @@ -26,9 +26,9 @@ } ], "endid": [ - 10001009, - 10001013, - 10001014 + 3000015, + 3000017, + 3000018 ], "stroyprize": [ { @@ -64,8 +64,8 @@ 2, 3 ], - "startid": 10001, - "rightend": 10001008, + "startid": 300001, + "rightend": 3000014, "special_stroyprize": [ { "a": "attr", @@ -74,9 +74,9 @@ } ], "endid": [ - 10001009, - 10001013, - 10001014 + 3000015, + 3000017, + 3000018 ], "stroyprize": [ { @@ -92,7 +92,8 @@ 4 ], "fid": [ - 101 + 101, + 102 ] }, { @@ -112,8 +113,8 @@ 2, 3 ], - "startid": 10001, - "rightend": 10001008, + "startid": 300001, + "rightend": 3000014, "special_stroyprize": [ { "a": "attr", @@ -122,9 +123,9 @@ } ], "endid": [ - 10001009, - 10001013, - 10001014 + 3000015, + 3000017, + 3000018 ], "stroyprize": [ { @@ -140,7 +141,8 @@ 4 ], "fid": [ - 101 + 101, + 102 ] }, { @@ -160,8 +162,8 @@ 2, 3 ], - "startid": 10001, - "rightend": 10001008, + "startid": 300001, + "rightend": 3000014, "special_stroyprize": [ { "a": "attr", @@ -170,9 +172,9 @@ } ], "endid": [ - 10001009, - 10001013, - 10001014 + 3000015, + 3000017, + 3000018 ], "stroyprize": [ { diff --git a/modules/hero/api_drawCardFloor.go b/modules/hero/api_drawCardFloor.go index 86cd35a1f..11c439f60 100644 --- a/modules/hero/api_drawCardFloor.go +++ b/modules/hero/api_drawCardFloor.go @@ -18,6 +18,8 @@ func (this *apiComp) DrawCardFloor(session comm.IUserSession, req *pb.HeroDrawCa heroRecord, _ := this.module.modelRecord.GetHeroRecord(session.GetUserId()) rsp.Star4 = heroRecord.Star4 rsp.Star5 = heroRecord.Star5 + rsp.Onebuy = heroRecord.Onebuy + rsp.Tenbuy = heroRecord.Tenbuy session.SendMsg(string(this.module.GetType()), DrawCardFloor, rsp) return } diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index b5cc4bc27..94a001121 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -1652,8 +1652,10 @@ type HeroDrawCardFloorResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Star4 int32 `protobuf:"varint,1,opt,name=star4,proto3" json:"star4"` - Star5 int32 `protobuf:"varint,2,opt,name=star5,proto3" json:"star5"` + Star4 int32 `protobuf:"varint,1,opt,name=star4,proto3" json:"star4"` + Star5 int32 `protobuf:"varint,2,opt,name=star5,proto3" json:"star5"` + Onebuy int32 `protobuf:"varint,3,opt,name=onebuy,proto3" json:"onebuy"` // 单次购买次数 + Tenbuy int32 `protobuf:"varint,4,opt,name=tenbuy,proto3" json:"tenbuy"` // 十连购买次数 } func (x *HeroDrawCardFloorResp) Reset() { @@ -1702,6 +1704,20 @@ func (x *HeroDrawCardFloorResp) GetStar5() int32 { return 0 } +func (x *HeroDrawCardFloorResp) GetOnebuy() int32 { + if x != nil { + return x.Onebuy + } + return 0 +} + +func (x *HeroDrawCardFloorResp) GetTenbuy() int32 { + if x != nil { + return x.Tenbuy + } + return 0 +} + // 英雄融合 type HeroFusionReq struct { state protoimpl.MessageState @@ -2354,11 +2370,14 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x68, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x16, 0x0a, 0x14, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x46, 0x6c, - 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x22, 0x43, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, + 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x22, 0x73, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x22, 0x92, 0x01, 0x0a, 0x0d, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x16, 0x0a, 0x06, 0x6f, + 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, + 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x22, 0x92, 0x01, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, 0x02,