liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2022-11-30 12:21:42 +08:00
commit 8eaaece554
4 changed files with 52 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/json/game_libraryfetter.json
View File

@ -107,7 +107,7 @@
"hid": [ "hid": [
"25001", "25001",
"35001", "35001",
"11009" "15004"
], ],
"favorlv": 1, "favorlv": 1,
"prize": [ "prize": [
@ -140,7 +140,7 @@
"hid": [ "hid": [
"25001", "25001",
"35001", "35001",
"11009" "15004"
], ],
"favorlv": 2, "favorlv": 2,
"prize": [ "prize": [
@ -173,7 +173,7 @@
"hid": [ "hid": [
"25001", "25001",
"35001", "35001",
"11009" "15004"
], ],
"favorlv": 3, "favorlv": 3,
"prize": [ "prize": [

46
bin/json/game_libraryhero.json
View File

@ -16,8 +16,8 @@
2, 2,
3 3
], ],
"startid": 10001, "startid": 300001,
"rightend": 10001008, "rightend": 3000014,
"special_stroyprize": [ "special_stroyprize": [
{ {
"a": "attr", "a": "attr",
@ -26,9 +26,9 @@
} }
], ],
"endid": [ "endid": [
10001009, 3000015,
10001013, 3000017,
10001014 3000018
], ],
"stroyprize": [ "stroyprize": [
{ {
@ -64,8 +64,8 @@
2, 2,
3 3
], ],
"startid": 10001, "startid": 300001,
"rightend": 10001008, "rightend": 3000014,
"special_stroyprize": [ "special_stroyprize": [
{ {
"a": "attr", "a": "attr",
@ -74,9 +74,9 @@
} }
], ],
"endid": [ "endid": [
10001009, 3000015,
10001013, 3000017,
10001014 3000018
], ],
"stroyprize": [ "stroyprize": [
{ {
@ -92,7 +92,8 @@
4 4
], ],
"fid": [ "fid": [
101 101,
102
] ]
}, },
{ {
@ -112,8 +113,8 @@
2, 2,
3 3
], ],
"startid": 10001, "startid": 300001,
"rightend": 10001008, "rightend": 3000014,
"special_stroyprize": [ "special_stroyprize": [
{ {
"a": "attr", "a": "attr",
@ -122,9 +123,9 @@
} }
], ],
"endid": [ "endid": [
10001009, 3000015,
10001013, 3000017,
10001014 3000018
], ],
"stroyprize": [ "stroyprize": [
{ {
@ -140,7 +141,8 @@
4 4
], ],
"fid": [ "fid": [
101 101,
102
] ]
}, },
{ {
@ -160,8 +162,8 @@
2, 2,
3 3
], ],
"startid": 10001, "startid": 300001,
"rightend": 10001008, "rightend": 3000014,
"special_stroyprize": [ "special_stroyprize": [
{ {
"a": "attr", "a": "attr",
@ -170,9 +172,9 @@
} }
], ],
"endid": [ "endid": [
10001009, 3000015,
10001013, 3000017,
10001014 3000018
], ],
"stroyprize": [ "stroyprize": [
{ {

2
modules/hero/api_drawCardFloor.go
View File

@ -18,6 +18,8 @@ func (this *apiComp) DrawCardFloor(session comm.IUserSession, req *pb.HeroDrawCa
heroRecord, _ := this.module.modelRecord.GetHeroRecord(session.GetUserId()) heroRecord, _ := this.module.modelRecord.GetHeroRecord(session.GetUserId())
rsp.Star4 = heroRecord.Star4 rsp.Star4 = heroRecord.Star4
rsp.Star5 = heroRecord.Star5 rsp.Star5 = heroRecord.Star5
rsp.Onebuy = heroRecord.Onebuy
rsp.Tenbuy = heroRecord.Tenbuy
session.SendMsg(string(this.module.GetType()), DrawCardFloor, rsp) session.SendMsg(string(this.module.GetType()), DrawCardFloor, rsp)
return return
} }

23
pb/hero_msg.pb.go
View File

@ -1654,6 +1654,8 @@ type HeroDrawCardFloorResp struct {
Star4 int32 `protobuf:"varint,1,opt,name=star4,proto3" json:"star4"` Star4 int32 `protobuf:"varint,1,opt,name=star4,proto3" json:"star4"`
Star5 int32 `protobuf:"varint,2,opt,name=star5,proto3" json:"star5"` 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() { func (x *HeroDrawCardFloorResp) Reset() {
@ -1702,6 +1704,20 @@ func (x *HeroDrawCardFloorResp) GetStar5() int32 {
return 0 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 { type HeroFusionReq struct {
state protoimpl.MessageState 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, 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, 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, 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, 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, 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, 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, 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, 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, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, 0x02,