Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
14e1a5bb30
File diff suppressed because it is too large
Load Diff
@ -567,18 +567,22 @@
|
||||
"t": "gold",
|
||||
"n": 1000
|
||||
},
|
||||
"dispatch_Refreshtimes": 6,
|
||||
"dispatch_numoftimes": 6,
|
||||
"dispatch_numtools": 10012,
|
||||
"dispatch_Refreshtimes": 100,
|
||||
"dispatch_numoftimes": 60,
|
||||
"dispatch_numtools": {
|
||||
"a": "item",
|
||||
"t": "10012",
|
||||
"n": 1
|
||||
},
|
||||
"dispatch_npctimes": 2,
|
||||
"dispatch_weektaskreward": [
|
||||
{
|
||||
"n": 4,
|
||||
"g": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 9999
|
||||
"a": "item",
|
||||
"t": "10006",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
@ -591,9 +595,9 @@
|
||||
"n": 8,
|
||||
"g": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 99
|
||||
"a": "item",
|
||||
"t": "10006",
|
||||
"n": 2
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
@ -606,9 +610,9 @@
|
||||
"n": 10,
|
||||
"g": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 500
|
||||
"a": "item",
|
||||
"t": "10006",
|
||||
"n": 4
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
"pos": 1,
|
||||
"captainId": 0,
|
||||
"IsBoss": 0,
|
||||
"monster": 510053,
|
||||
"monster": 510023,
|
||||
"lv": 10,
|
||||
"hppro": 0.4,
|
||||
"atkpro": 1,
|
||||
"defpro": 0.4,
|
||||
"hppro": 100,
|
||||
"atkpro": 0.1,
|
||||
"defpro": 0.1,
|
||||
"modelsize": 1
|
||||
},
|
||||
{
|
||||
@ -18,9 +18,9 @@
|
||||
"IsBoss": 0,
|
||||
"monster": 510053,
|
||||
"lv": 10,
|
||||
"hppro": 0.4,
|
||||
"atkpro": 1,
|
||||
"defpro": 0.4,
|
||||
"hppro": 100,
|
||||
"atkpro": 0.1,
|
||||
"defpro": 0.1,
|
||||
"modelsize": 1
|
||||
},
|
||||
{
|
||||
@ -30,9 +30,9 @@
|
||||
"IsBoss": 0,
|
||||
"monster": 510043,
|
||||
"lv": 10,
|
||||
"hppro": 0.4,
|
||||
"atkpro": 1,
|
||||
"defpro": 0.4,
|
||||
"hppro": 100,
|
||||
"atkpro": 0.1,
|
||||
"defpro": 0.1,
|
||||
"modelsize": 1
|
||||
},
|
||||
{
|
||||
@ -40,11 +40,11 @@
|
||||
"pos": 4,
|
||||
"captainId": 0,
|
||||
"IsBoss": 0,
|
||||
"monster": 240023,
|
||||
"monster": 530013,
|
||||
"lv": 12,
|
||||
"hppro": 0.4,
|
||||
"atkpro": 1,
|
||||
"defpro": 0.4,
|
||||
"hppro": 100,
|
||||
"atkpro": 0.1,
|
||||
"defpro": 0.1,
|
||||
"modelsize": 1
|
||||
},
|
||||
{
|
||||
@ -52,11 +52,11 @@
|
||||
"pos": 5,
|
||||
"captainId": 0,
|
||||
"IsBoss": 0,
|
||||
"monster": 510043,
|
||||
"monster": 510033,
|
||||
"lv": 10,
|
||||
"hppro": 0.4,
|
||||
"atkpro": 1,
|
||||
"defpro": 0.4,
|
||||
"hppro": 100,
|
||||
"atkpro": 0.1,
|
||||
"defpro": 0.1,
|
||||
"modelsize": 1
|
||||
},
|
||||
{
|
||||
|
||||
@ -11,16 +11,6 @@
|
||||
"text": "每分钟提升经验{0}"
|
||||
},
|
||||
"up_lv_consume": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "30001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "30002",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
@ -44,16 +34,6 @@
|
||||
"text": "每分钟提升经验{0}"
|
||||
},
|
||||
"up_lv_consume": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "30001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "30002",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
@ -77,16 +57,6 @@
|
||||
"text": "每分钟提升经验{0}"
|
||||
},
|
||||
"up_lv_consume": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "30001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "30002",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
@ -110,16 +80,6 @@
|
||||
"text": "每分钟提升经验{0}"
|
||||
},
|
||||
"up_lv_consume": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "30001",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "30002",
|
||||
"n": 1
|
||||
},
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
"key": "wuguan_1",
|
||||
"text": "图鉴信息描述"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "wg_icon_mz01",
|
||||
"atlas_score": 30
|
||||
},
|
||||
{
|
||||
@ -32,7 +32,7 @@
|
||||
"key": "wuguan_1",
|
||||
"text": "图鉴信息描述"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "wg_icon_mz02",
|
||||
"atlas_score": 45
|
||||
},
|
||||
{
|
||||
@ -50,7 +50,7 @@
|
||||
"key": "wuguan_1",
|
||||
"text": "图鉴信息描述"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "wg_icon_mz03",
|
||||
"atlas_score": 60
|
||||
},
|
||||
{
|
||||
@ -68,7 +68,7 @@
|
||||
"key": "wuguan_1",
|
||||
"text": "图鉴信息描述"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "wg_icon_mz04",
|
||||
"atlas_score": 75
|
||||
},
|
||||
{
|
||||
@ -86,7 +86,7 @@
|
||||
"key": "wuguan_1",
|
||||
"text": "图鉴信息描述"
|
||||
},
|
||||
"icon": "",
|
||||
"icon": "wg_icon_mz05",
|
||||
"atlas_score": 90
|
||||
},
|
||||
{
|
||||
|
||||
@ -110,10 +110,10 @@ func (d *DispatchView) CreateView(t *model.TestCase) fyne.CanvasObject {
|
||||
}
|
||||
|
||||
heroIds := []string{}
|
||||
if hero1.Text!=""{
|
||||
if hero1.Text != "" {
|
||||
heroIds = append(heroIds, hero1.Text)
|
||||
}
|
||||
if hero2.Text!=""{
|
||||
if hero2.Text != "" {
|
||||
heroIds = append(heroIds, hero2.Text)
|
||||
}
|
||||
if err := service.GetPttService().SendToClient(
|
||||
|
||||
@ -4,6 +4,7 @@ import (
|
||||
"errors"
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
|
||||
"google.golang.org/protobuf/proto"
|
||||
)
|
||||
@ -53,7 +54,8 @@ func (a *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (code pb.
|
||||
}
|
||||
|
||||
//校验门票
|
||||
if d.Ticket <= 0 {
|
||||
ticketAtn := a.module.configure.GetGlobalConf().DispatchNumtools
|
||||
if code = a.module.CheckRes(session, []*cfg.Gameatn{ticketAtn}); code != pb.ErrorCode_Success {
|
||||
code = pb.ErrorCode_DispatchTicketNoEnough
|
||||
return
|
||||
}
|
||||
@ -70,6 +72,9 @@ func (a *apiComp) Do(session comm.IUserSession, req *pb.DispatchDoReq) (code pb.
|
||||
return
|
||||
}
|
||||
|
||||
//扣除门票
|
||||
a.module.ConsumeRes(session, []*cfg.Gameatn{ticketAtn}, true)
|
||||
|
||||
rsp.IsSucc = true
|
||||
session.SendMsg(string(a.module.GetType()), "do", rsp)
|
||||
return
|
||||
|
||||
@ -4,6 +4,7 @@ import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
"go_dreamfactory/sys/configure"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
"go_dreamfactory/utils"
|
||||
|
||||
"google.golang.org/protobuf/proto"
|
||||
@ -35,18 +36,15 @@ func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) (
|
||||
}
|
||||
|
||||
freeCount := a.module.configure.GetGlobalConf().DispatchFreecheck
|
||||
ticketCount := a.module.configure.GetGlobalConf().DispatchNumoftimes
|
||||
|
||||
nb := &pb.Noticeboard{
|
||||
Lv: 1, //公告初始升级
|
||||
FreeCount: freeCount,
|
||||
Tasks: tasks,
|
||||
CreateTime: configure.Now().Unix(),
|
||||
UpdateTime: configure.Now().Unix(),
|
||||
}
|
||||
|
||||
update := map[string]interface{}{
|
||||
"nb": nb,
|
||||
"ticket": ticketCount,
|
||||
}
|
||||
if err := a.module.modelDispatch.Change(uid, update); err != nil {
|
||||
code = pb.ErrorCode_DBError
|
||||
@ -54,14 +52,26 @@ func (a *apiComp) Notice(session comm.IUserSession, req *pb.DispatchNoticeReq) (
|
||||
}
|
||||
d.Nb = nb
|
||||
} else {
|
||||
//恢复门票
|
||||
one := utils.DiffDays(d.Nb.UpdateTime, configure.Now().Unix())
|
||||
if one >= 1 {
|
||||
itemId := a.module.configure.GetGlobalConf().DispatchNumtools.T
|
||||
left := a.module.ModuleItems.QueryItemAmount(uid, itemId)
|
||||
limit := a.module.configure.GetGlobalConf().DispatchNumoftimes
|
||||
if int32(left) < limit {
|
||||
add := limit - int32(left)
|
||||
atn := &cfg.Gameatn{A: "item", T: itemId, N: add}
|
||||
a.module.DispenseRes(session, []*cfg.Gameatn{atn}, true)
|
||||
}
|
||||
}
|
||||
//周任务重置
|
||||
n := utils.DiffDays(d.Nb.CreateTime, configure.Now().Unix())
|
||||
n := utils.DiffDays(d.Nb.UpdateTime, configure.Now().Unix())
|
||||
day := a.module.configure.GetGlobalConf().DispatchWeektaskcheck
|
||||
if int32(n) >= day {
|
||||
d.Nb.WeekCount = 0
|
||||
d.Nb.WeekReceived = []int32{}
|
||||
d.Nb.UpdateTime = configure.Now().Unix()
|
||||
}
|
||||
|
||||
a.module.modelDispatch.updateNotice(session.GetUserId(), d)
|
||||
}
|
||||
|
||||
|
||||
@ -43,15 +43,13 @@ func (this *modelDispatch) initDispatch(uid string, dispatch *pb.DBDispatch) *pb
|
||||
}
|
||||
|
||||
freeCount := this.module.configure.GetGlobalConf().DispatchFreecheck
|
||||
ticketCount := this.module.configure.GetGlobalConf().DispatchNumoftimes
|
||||
dis := &pb.DBDispatch{
|
||||
Uid: uid,
|
||||
Ticket: ticketCount,
|
||||
Nb: &pb.Noticeboard{
|
||||
Lv: 1, //公告初始升级
|
||||
FreeCount: freeCount,
|
||||
Tasks: tasks,
|
||||
CreateTime: configure.Now().Unix(),
|
||||
UpdateTime: configure.Now().Unix(),
|
||||
},
|
||||
}
|
||||
|
||||
@ -180,8 +178,6 @@ func (this *modelDispatch) taskRandom(uid string, dispatch *pb.DBDispatch) (task
|
||||
tasks = append(tasks[:i], tasks[i+1:]...)
|
||||
i--
|
||||
randCount++
|
||||
} else {
|
||||
tasks = append(tasks, tasks[i])
|
||||
}
|
||||
}
|
||||
//追加随机
|
||||
@ -365,7 +361,6 @@ func (this *modelDispatch) dispatch(uid string, taskId int32, heroIds []string,
|
||||
|
||||
update := map[string]interface{}{
|
||||
"nb": disp.Nb,
|
||||
"ticket": disp.Ticket - 1,
|
||||
}
|
||||
if err := this.Change(uid, update); err != nil {
|
||||
return err
|
||||
|
||||
@ -28,7 +28,6 @@ type DBDispatch struct {
|
||||
|
||||
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid" bson:"uid"` //
|
||||
Nb *Noticeboard `protobuf:"bytes,2,opt,name=nb,proto3" json:"nb" bson:"nb"` //公告栏
|
||||
Ticket int32 `protobuf:"varint,3,opt,name=ticket,proto3" json:"ticket" bson:"ticket"` //派遣门票
|
||||
}
|
||||
|
||||
func (x *DBDispatch) Reset() {
|
||||
@ -77,13 +76,6 @@ func (x *DBDispatch) GetNb() *Noticeboard {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *DBDispatch) GetTicket() int32 {
|
||||
if x != nil {
|
||||
return x.Ticket
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
// 公告栏
|
||||
type Noticeboard struct {
|
||||
state protoimpl.MessageState
|
||||
@ -98,7 +90,7 @@ type Noticeboard struct {
|
||||
WeekCount int32 `protobuf:"varint,6,opt,name=weekCount,proto3" json:"weekCount" bson:"weekCount"` //周任务数
|
||||
TaskCount int32 `protobuf:"varint,7,opt,name=taskCount,proto3" json:"taskCount" bson:"taskCount"` //任务数
|
||||
WeekReceived []int32 `protobuf:"varint,8,rep,packed,name=weekReceived,proto3" json:"weekReceived" bson:"weekReceived"` ////已领取的周任务索引ID
|
||||
CreateTime int64 `protobuf:"varint,9,opt,name=createTime,proto3" json:"createTime" bson:"createTime"` //创建时间
|
||||
UpdateTime int64 `protobuf:"varint,9,opt,name=updateTime,proto3" json:"updateTime" bson:"updateTime"` //更新时间
|
||||
}
|
||||
|
||||
func (x *Noticeboard) Reset() {
|
||||
@ -189,9 +181,9 @@ func (x *Noticeboard) GetWeekReceived() []int32 {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *Noticeboard) GetCreateTime() int64 {
|
||||
func (x *Noticeboard) GetUpdateTime() int64 {
|
||||
if x != nil {
|
||||
return x.CreateTime
|
||||
return x.UpdateTime
|
||||
}
|
||||
return 0
|
||||
}
|
||||
@ -288,43 +280,41 @@ var File_dispatch_dispatch_db_proto protoreflect.FileDescriptor
|
||||
|
||||
var file_dispatch_dispatch_db_proto_rawDesc = []byte{
|
||||
0x0a, 0x1a, 0x64, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x2f, 0x64, 0x69, 0x73, 0x70, 0x61,
|
||||
0x74, 0x63, 0x68, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x54, 0x0a, 0x0a,
|
||||
0x74, 0x63, 0x68, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3c, 0x0a, 0x0a,
|
||||
0x44, 0x42, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
|
||||
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x02,
|
||||
0x6e, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x4e, 0x6f, 0x74, 0x69, 0x63,
|
||||
0x65, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x52, 0x02, 0x6e, 0x62, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x69,
|
||||
0x63, 0x6b, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x69, 0x63, 0x6b,
|
||||
0x65, 0x74, 0x22, 0xa4, 0x02, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x62, 0x6f, 0x61,
|
||||
0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
|
||||
0x6c, 0x76, 0x12, 0x1e, 0x0a, 0x0a, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x54, 0x79,
|
||||
0x70, 0x65, 0x12, 0x23, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b,
|
||||
0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x65, 0x65, 0x43,
|
||||
0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x66, 0x72, 0x65, 0x65,
|
||||
0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
|
||||
0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x72, 0x65, 0x66,
|
||||
0x72, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x77, 0x65, 0x65,
|
||||
0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x77, 0x65,
|
||||
0x65, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x43,
|
||||
0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b,
|
||||
0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x63,
|
||||
0x65, 0x69, 0x76, 0x65, 0x64, 0x18, 0x08, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x77, 0x65, 0x65,
|
||||
0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65,
|
||||
0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x63,
|
||||
0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xaa, 0x01, 0x0a, 0x0c, 0x44, 0x69,
|
||||
0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61,
|
||||
0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b,
|
||||
0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x75,
|
||||
0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x75,
|
||||
0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x65, 0x66, 0x74, 0x54, 0x69,
|
||||
0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x65, 0x66, 0x74, 0x54, 0x69,
|
||||
0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x18, 0x05, 0x20,
|
||||
0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x12, 0x18, 0x0a, 0x07,
|
||||
0x65, 0x78, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x65,
|
||||
0x78, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
|
||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x65, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x52, 0x02, 0x6e, 0x62, 0x22, 0xa4, 0x02, 0x0a, 0x0b, 0x4e,
|
||||
0x6f, 0x74, 0x69, 0x63, 0x65, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x1e, 0x0a, 0x0a, 0x6e, 0x6f,
|
||||
0x74, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
|
||||
0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x05, 0x74, 0x61,
|
||||
0x73, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x69, 0x73, 0x70,
|
||||
0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12,
|
||||
0x1c, 0x0a, 0x09, 0x66, 0x72, 0x65, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x09, 0x66, 0x72, 0x65, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a,
|
||||
0x0c, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x0c, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x43, 0x6f, 0x75, 0x6e,
|
||||
0x74, 0x12, 0x1c, 0x0a, 0x09, 0x77, 0x65, 0x65, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x77, 0x65, 0x65, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12,
|
||||
0x1c, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a,
|
||||
0x0c, 0x77, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x18, 0x08, 0x20,
|
||||
0x03, 0x28, 0x05, 0x52, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65,
|
||||
0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18,
|
||||
0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d,
|
||||
0x65, 0x22, 0xaa, 0x01, 0x0a, 0x0c, 0x44, 0x69, 0x73, 0x70, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61,
|
||||
0x73, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74,
|
||||
0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74,
|
||||
0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03,
|
||||
0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a,
|
||||
0x0a, 0x08, 0x6c, 0x65, 0x66, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
|
||||
0x52, 0x08, 0x6c, 0x65, 0x66, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65,
|
||||
0x72, 0x6f, 0x49, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72,
|
||||
0x6f, 0x49, 0x64, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x78, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18,
|
||||
0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x65, 0x78, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06,
|
||||
0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
@ -185,7 +185,7 @@ type GameGlobalData struct {
|
||||
DispatchCheckmoney *Gameatn
|
||||
DispatchRefreshtimes int32
|
||||
DispatchNumoftimes int32
|
||||
DispatchNumtools int32
|
||||
DispatchNumtools *Gameatn
|
||||
DispatchNpctimes int32
|
||||
DispatchWeektaskreward []*Gamedispatch
|
||||
DispatchWeektaskcheck int32
|
||||
@ -781,7 +781,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["dispatch_checkmoney"].(map[string]interface{}); !_ok_ { err = errors.New("dispatch_checkmoney error"); return }; if _v.DispatchCheckmoney, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dispatch_Refreshtimes"].(float64); !_ok_ { err = errors.New("dispatch_Refreshtimes error"); return }; _v.DispatchRefreshtimes = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dispatch_numoftimes"].(float64); !_ok_ { err = errors.New("dispatch_numoftimes error"); return }; _v.DispatchNumoftimes = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dispatch_numtools"].(float64); !_ok_ { err = errors.New("dispatch_numtools error"); return }; _v.DispatchNumtools = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["dispatch_numtools"].(map[string]interface{}); !_ok_ { err = errors.New("dispatch_numtools error"); return }; if _v.DispatchNumtools, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dispatch_npctimes"].(float64); !_ok_ { err = errors.New("dispatch_npctimes error"); return }; _v.DispatchNpctimes = int32(_tempNum_) }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user