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 2023-08-09 21:37:25 +08:00
commit 9078e843ea
4 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/warorder/api_info.go
View File

@ -73,7 +73,9 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WarorderInfoReq) (e
} }
if dwarorder, ok = info.Dreamwarorder[req.Rtype]; !ok { if dwarorder, ok = info.Dreamwarorder[req.Rtype]; !ok {
dwarorder = &pb.DreamWarorder{} dwarorder = &pb.DreamWarorder{
Lv: 1,
}
info.Dreamwarorder[req.Rtype] = dwarorder info.Dreamwarorder[req.Rtype] = dwarorder
} }
if dwarorder.Opentime != activity.Stime { if dwarorder.Opentime != activity.Stime {
@ -90,7 +92,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WarorderInfoReq) (e
} }
if !utils.IsSameWeek(dwarorder.Weektime) { if !utils.IsSameWeek(dwarorder.Weektime) {
weeknum := this.module.ModuleTools.GetGlobalConf().Passcheck4WeekNum weeknum := this.module.ModuleTools.GetGlobalConf().Passcheck4WeekNum
this.module.model.refreshDayTask(dwarorder, confs, weeknum) this.module.model.refreshWeekTask(dwarorder, confs, weeknum)
dwarorder.Weektime = configure.Now().Unix() dwarorder.Weektime = configure.Now().Unix()
} }

2
modules/warorder/api_receive.go
View File

@ -138,6 +138,6 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WarorderReceiveR
return return
} }
session.SendMsg(string(this.module.GetType()), "receive", &pb.WarorderReceiveResp{Rtype: req.Rtype, Info: warorder, Award: ads}) session.SendMsg(string(this.module.GetType()), "receive", &pb.WarorderReceiveResp{Rtype: req.Rtype, Warorder: warorder, Dwarorder: dwarorder, Award: ads})
return return
} }

2
modules/warorder/configure.go
View File

@ -114,7 +114,7 @@ func (this *configureComp) updatePassCheckExp() {
err error err error
ok bool ok bool
) )
if v, err = this.GetConfigure(game_passcheck); err != nil { if v, err = this.GetConfigure(game_passcheckexp); err != nil {
return return
} else { } else {
if conf, ok = v.(*cfg.GamePassCheckExp); !ok { if conf, ok = v.(*cfg.GamePassCheckExp); !ok {

67
pb/warorder_msg.pb.go
View File

@ -193,7 +193,7 @@ type WarorderReceiveResp struct {
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Rtype int32 `protobuf:"varint,1,opt,name=rtype,proto3" json:"rtype"` Rtype int32 `protobuf:"varint,1,opt,name=rtype,proto3" json:"rtype"`
Info *Warorder `protobuf:"bytes,2,opt,name=info,proto3" json:"info"` Warorder *Warorder `protobuf:"bytes,2,opt,name=warorder,proto3" json:"warorder"`
Dwarorder *DreamWarorder `protobuf:"bytes,3,opt,name=dwarorder,proto3" json:"dwarorder"` Dwarorder *DreamWarorder `protobuf:"bytes,3,opt,name=dwarorder,proto3" json:"dwarorder"`
Award []*UserAssets `protobuf:"bytes,4,rep,name=award,proto3" json:"award"` //奖励 Award []*UserAssets `protobuf:"bytes,4,rep,name=award,proto3" json:"award"` //奖励
} }
@ -237,9 +237,9 @@ func (x *WarorderReceiveResp) GetRtype() int32 {
return 0 return 0
} }
func (x *WarorderReceiveResp) GetInfo() *Warorder { func (x *WarorderReceiveResp) GetWarorder() *Warorder {
if x != nil { if x != nil {
return x.Info return x.Warorder
} }
return nil return nil
} }
@ -522,37 +522,38 @@ var file_warorder_warorder_msg_proto_rawDesc = []byte{
0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x22, 0x2a, 0x0a, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x22, 0x2a, 0x0a,
0x12, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x12, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65,
0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x22, 0x9b, 0x01, 0x0a, 0x13, 0x57, 0x61, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x22, 0xa3, 0x01, 0x0a, 0x13, 0x57, 0x61,
0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73,
0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1d, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x08, 0x77, 0x61, 0x72, 0x6f, 0x72,
0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x57, 0x61, 0x72, 0x6f,
0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x2c, 0x0a, 0x09, 0x64, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x72, 0x64, 0x65, 0x72, 0x52, 0x08, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x2c,
0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x72, 0x65, 0x61, 0x0a, 0x09, 0x64, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28,
0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x09, 0x64, 0x77, 0x61, 0x72, 0x6f, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65,
0x72, 0x64, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x72, 0x52, 0x09, 0x64, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x05,
0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73,
0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x38, 0x0a, 0x10, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22,
0x64, 0x65, 0x72, 0x42, 0x75, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x38, 0x0a, 0x10, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x75, 0x79, 0x4c, 0x76,
0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18,
0x76, 0x22, 0x5d, 0x0a, 0x11, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x75, 0x79, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x5d, 0x0a, 0x11, 0x57, 0x61, 0x72,
0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x75, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72,
0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x22, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x72, 0x65, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x22, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01,
0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64,
0x22, 0x41, 0x0a, 0x17, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x65, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x41, 0x0a, 0x17, 0x57, 0x61, 0x72, 0x6f,
0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b,
0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64,
0x74, 0x69, 0x64, 0x22, 0x54, 0x0a, 0x18, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x54, 0x0a, 0x18, 0x57,
0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54,
0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65,
0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a,
0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x03, 0x03, 0x74, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12,
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78,
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x33,
} }
var ( var (
@ -586,7 +587,7 @@ var file_warorder_warorder_msg_proto_depIdxs = []int32{
8, // 0: WarorderInfoResp.warorder:type_name -> Warorder 8, // 0: WarorderInfoResp.warorder:type_name -> Warorder
9, // 1: WarorderInfoResp.dwarorder:type_name -> DreamWarorder 9, // 1: WarorderInfoResp.dwarorder:type_name -> DreamWarorder
10, // 2: WarorderInfoResp.conlds:type_name -> ConIProgress 10, // 2: WarorderInfoResp.conlds:type_name -> ConIProgress
8, // 3: WarorderReceiveResp.info:type_name -> Warorder 8, // 3: WarorderReceiveResp.warorder:type_name -> Warorder
9, // 4: WarorderReceiveResp.dwarorder:type_name -> DreamWarorder 9, // 4: WarorderReceiveResp.dwarorder:type_name -> DreamWarorder
11, // 5: WarorderReceiveResp.award:type_name -> UserAssets 11, // 5: WarorderReceiveResp.award:type_name -> UserAssets
9, // 6: WarorderBuyLvResp.info:type_name -> DreamWarorder 9, // 6: WarorderBuyLvResp.info:type_name -> DreamWarorder