diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 64ad9cd2d..a083b66d4 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -345,8 +345,8 @@ ], "run_horsetime1": 3, "run_horsetime2": 10, - "boy_headPortrait": "tx_js_45003", - "girl_headPortrait": "tx_js_44005", + "boy_headPortrait": "tx_js_zj", + "girl_headPortrait": "tx_js_zj", "namecolor": "#FFFF00", "skillGetLocation": [ 114 @@ -550,15 +550,111 @@ ], "raise_temperature": { "a": "item", - "t": "10013", + "t": "120104", "n": 1 }, "raise_temperatureNum": 50, "exemption_TemperatureCos": { "a": "item", - "t": "110002", + "t": "120103", "n": 1 }, - "exemption_TemperatureCosNum": 50 + "exemption_TemperatureCosNum": 50, + "dispatch_freecheck": 1, + "dispatch_checktime": 12, + "dispatch_checkmoney": { + "a": "attr", + "t": "gold", + "n": 1000 + }, + "dispatch_Refreshtimes": 6, + "dispatch_numoftimes": 6, + "dispatch_numtools": 10012, + "dispatch_npctimes": 2, + "dispatch_weektaskreward": [ + { + "n": 4, + "g": [ + { + "a": "attr", + "t": "gold", + "n": 9999 + }, + { + "a": "attr", + "t": "gold", + "n": 300 + } + ] + }, + { + "n": 8, + "g": [ + { + "a": "attr", + "t": "gold", + "n": 99 + }, + { + "a": "attr", + "t": "gold", + "n": 300 + } + ] + }, + { + "n": 10, + "g": [ + { + "a": "attr", + "t": "gold", + "n": 500 + } + ] + } + ], + "dispatch_weektaskcheck": 7, + "pandamas_challenge_cd": 3600, + "pandamas_challenge_num": 3, + "pandamas_fight_num": 3, + "pandamas_RankAbove50": 50, + "pandamas_RankedBelow50": 10, + "mryl_flushed": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + }, + { + "a": "attr", + "t": "gold", + "n": 7500 + }, + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "attr", + "t": "gold", + "n": 15000 + }, + { + "a": "attr", + "t": "gold", + "n": 20000 + }, + { + "a": "attr", + "t": "gold", + "n": 25000 + }, + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ] } ] \ No newline at end of file diff --git a/modules/arena/modelarena.go b/modules/arena/modelarena.go index 11c304704..dae0b8847 100644 --- a/modules/arena/modelarena.go +++ b/modules/arena/modelarena.go @@ -403,7 +403,7 @@ func (this *modelArena) recoverTicket(session comm.IUserSession, info *pb.DBAren if ticketNum+ticket > global.ArenaTicketMax { ticketNum = global.ArenaTicketMax - ticket } - this.module.DispenseRes(session, []*cfg.Gameatn{&cfg.Gameatn{A: comm.ItemType, T: comm.ArenaTicket, N: ticketNum}}, true) + this.module.DispenseRes(session, []*cfg.Gameatn{{A: comm.ItemType, T: comm.ArenaTicket, N: ticketNum}}, true) // info.Ticket += ticketNum // if info.Ticket > global.ArenaTicketMax { // info.Ticket = global.ArenaTicketMax diff --git a/modules/practice/api_gyminfo.go b/modules/practice/api_gyminfo.go index 0a8ee8c18..e8bac1ccd 100644 --- a/modules/practice/api_gyminfo.go +++ b/modules/practice/api_gyminfo.go @@ -3,6 +3,8 @@ package practice import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" + "time" "google.golang.org/protobuf/proto" ) @@ -23,6 +25,12 @@ func (this *apiComp) GymInfo(session comm.IUserSession, req *pb.PracticeGymInfoR code = pb.ErrorCode_DBError return } + if time.Unix(room.Lastrefresh, 0).Day() != configure.Now().Day() { + room.Gymrefresh = 0 + this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{ + "gymrefresh": room.Gymrefresh, + }) + } session.SendMsg(string(this.module.GetType()), "confirm", &pb.PracticeGymInfoResp{Lastaction: room.Gymaction, Refreshnum: room.Gymrefresh}) return } diff --git a/modules/practice/api_gymrefresh.go b/modules/practice/api_gymrefresh.go index a594a46e5..6537950f4 100644 --- a/modules/practice/api_gymrefresh.go +++ b/modules/practice/api_gymrefresh.go @@ -3,6 +3,9 @@ package practice import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" + cfg "go_dreamfactory/sys/configure/structs" + "math/rand" "google.golang.org/protobuf/proto" ) @@ -16,13 +19,44 @@ func (this *apiComp) GymRefreshCheck(session comm.IUserSession, req *pb.Practice ///练功请求 func (this *apiComp) GymRefresh(session comm.IUserSession, req *pb.PracticeGymRefreshReq) (code pb.ErrorCode, data proto.Message) { var ( - err error - room *pb.DBPracticeRoom + err error + room *pb.DBPracticeRoom + confs []*cfg.GamePandamasMrylData + refreshAtns []*cfg.Gameatn + atn *cfg.Gameatn ) + if room, err = this.module.modelPandata.queryUserMartialhall(session.GetUserId()); err != nil { code = pb.ErrorCode_DBError return } + refreshAtns = this.module.configure.GetGlobalConf().MrylFlushed + if len(refreshAtns) == 0 { + code = pb.ErrorCode_ConfigNoFound + return + } + if int(room.Gymrefresh) < len(refreshAtns) { + atn = refreshAtns[room.Gymrefresh] + } else { + atn = refreshAtns[len(refreshAtns)-1] + } + + if code = this.module.ConsumeRes(session, []*cfg.Gameatn{atn}, true); code != pb.ErrorCode_Success { + return + } + if confs, err = this.module.configure.getGamePandamasMryls(); err != nil { + code = pb.ErrorCode_ConfigNoFound + return + } + r := rand.New(rand.NewSource(configure.Now().Unix())) + room.Gymaction = confs[r.Perm(len(confs))[0]].Id + room.Gymrefresh++ + room.Lastrefresh = configure.Now().Unix() + this.module.modelPandata.Change(session.GetUserId(), map[string]interface{}{ + "gymaction": room.Gymaction, + "gymrefresh": room.Gymrefresh, + "lastrefresh": room.Lastrefresh, + }) session.SendMsg(string(this.module.GetType()), "confirm", &pb.PracticeGymRefreshResp{Lastaction: room.Gymaction, Refreshnum: room.Gymrefresh}) return } diff --git a/modules/practice/api_info.go b/modules/practice/api_info.go index 14b5b8162..5297f325c 100644 --- a/modules/practice/api_info.go +++ b/modules/practice/api_info.go @@ -13,7 +13,7 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.PracticeInfoRe return } -///练功请求 +///练功请求 func (this *apiComp) Info(session comm.IUserSession, req *pb.PracticeInfoReq) (code pb.ErrorCode, data proto.Message) { var ( err error diff --git a/modules/practice/configure.go b/modules/practice/configure.go index a8a7e69e2..0259729c5 100644 --- a/modules/practice/configure.go +++ b/modules/practice/configure.go @@ -125,6 +125,19 @@ func (this *configureComp) getGamePandamasYxjx(id int32) (configure *cfg.GamePan return } +func (this *configureComp) getGamePandamasMryls() (configure []*cfg.GamePandamasMrylData, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(game_pandamasmryl); err != nil { + this.module.Errorln(err) + return + } else { + configure = v.(*cfg.GamePandamasMryl).GetDataList() + } + return +} + func (this *configureComp) getPandamasMryl(id int32) (configure *cfg.GamePandamasMrylData, err error) { var ( v interface{} diff --git a/pb/practice_db.pb.go b/pb/practice_db.pb.go index 87340ef43..810fb058f 100644 --- a/pb/practice_db.pb.go +++ b/pb/practice_db.pb.go @@ -210,16 +210,17 @@ type DBPracticeRoom struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` //id - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id - Gymaction int32 `protobuf:"varint,3,opt,name=gymaction,proto3" json:"gymaction"` //健身房动作 - Gymrefresh int32 `protobuf:"varint,4,opt,name=gymrefresh,proto3" json:"gymrefresh"` //健身房刷新次数 - Full map[int32]int32 `protobuf:"bytes,5,rep,name=full,proto3" json:"full" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //满级登记 - Knapsack map[string]int32 `protobuf:"bytes,6,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //资源 - Pillar1 *DBPracticePillar `protobuf:"bytes,7,opt,name=pillar1,proto3" json:"pillar1"` //柱子1 - Pillar2 *DBPracticePillar `protobuf:"bytes,8,opt,name=pillar2,proto3" json:"pillar2"` //柱子2 - Pillar3 *DBPracticePillar `protobuf:"bytes,9,opt,name=pillar3,proto3" json:"pillar3"` //柱子3 - Pillarf *DBPracticePillar `protobuf:"bytes,10,opt,name=pillarf,proto3" json:"pillarf"` //好友柱子 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` //id + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id + Gymaction int32 `protobuf:"varint,3,opt,name=gymaction,proto3" json:"gymaction"` //健身房动作 + Gymrefresh int32 `protobuf:"varint,4,opt,name=gymrefresh,proto3" json:"gymrefresh"` //健身房刷新次数 + Lastrefresh int64 `protobuf:"varint,5,opt,name=lastrefresh,proto3" json:"lastrefresh"` //最后刷新时间 + Full map[int32]int32 `protobuf:"bytes,6,rep,name=full,proto3" json:"full" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //满级登记 + Knapsack map[string]int32 `protobuf:"bytes,7,rep,name=knapsack,proto3" json:"knapsack" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //资源 + Pillar1 *DBPracticePillar `protobuf:"bytes,8,opt,name=pillar1,proto3" json:"pillar1"` //柱子1 + Pillar2 *DBPracticePillar `protobuf:"bytes,9,opt,name=pillar2,proto3" json:"pillar2"` //柱子2 + Pillar3 *DBPracticePillar `protobuf:"bytes,10,opt,name=pillar3,proto3" json:"pillar3"` //柱子3 + Pillarf *DBPracticePillar `protobuf:"bytes,11,opt,name=pillarf,proto3" json:"pillarf"` //好友柱子 } func (x *DBPracticeRoom) Reset() { @@ -282,6 +283,13 @@ func (x *DBPracticeRoom) GetGymrefresh() int32 { return 0 } +func (x *DBPracticeRoom) GetLastrefresh() int64 { + if x != nil { + return x.Lastrefresh + } + return 0 +} + func (x *DBPracticeRoom) GetFull() map[int32]int32 { if x != nil { return x.Full @@ -348,40 +356,43 @@ var file_practice_practice_db_proto_rawDesc = []byte{ 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x07, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e, 0x74, 0x22, 0x84, 0x04, 0x0a, 0x0e, 0x44, 0x42, 0x50, + 0x07, 0x73, 0x74, 0x75, 0x64, 0x65, 0x6e, 0x74, 0x22, 0xa6, 0x04, 0x0a, 0x0e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 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, 0x1c, 0x0a, 0x09, 0x67, 0x79, 0x6d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x67, 0x79, 0x6d, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x67, 0x79, 0x6d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0a, 0x67, 0x79, 0x6d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x2d, 0x0a, 0x04, 0x66, - 0x75, 0x6c, 0x6c, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x50, 0x72, - 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x46, 0x75, 0x6c, 0x6c, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x66, 0x75, 0x6c, 0x6c, 0x12, 0x39, 0x0a, 0x08, 0x6b, 0x6e, - 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, - 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x4b, 0x6e, - 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, 0x6e, 0x61, - 0x70, 0x73, 0x61, 0x63, 0x6b, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x31, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, - 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, - 0x72, 0x31, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x32, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, - 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x32, 0x12, - 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, - 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, 0x12, 0x2b, 0x0a, 0x07, - 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x66, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, - 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, - 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x66, 0x1a, 0x37, 0x0a, 0x09, 0x46, 0x75, 0x6c, - 0x6c, 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, 0x3b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 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, + 0x0a, 0x67, 0x79, 0x6d, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x20, 0x0a, 0x0b, 0x6c, + 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x12, 0x2d, 0x0a, + 0x04, 0x66, 0x75, 0x6c, 0x6c, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, + 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, 0x46, 0x75, 0x6c, + 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x66, 0x75, 0x6c, 0x6c, 0x12, 0x39, 0x0a, 0x08, + 0x6b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, + 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x2e, + 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x6b, + 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, + 0x72, 0x31, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, + 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, + 0x6c, 0x61, 0x72, 0x31, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x32, 0x18, + 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, + 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, + 0x32, 0x12, 0x2b, 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, 0x18, 0x0a, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, + 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x33, 0x12, 0x2b, + 0x0a, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x66, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x11, 0x2e, 0x44, 0x42, 0x50, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x50, 0x69, 0x6c, 0x6c, + 0x61, 0x72, 0x52, 0x07, 0x70, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x66, 0x1a, 0x37, 0x0a, 0x09, 0x46, + 0x75, 0x6c, 0x6c, 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, 0x3b, 0x0a, 0x0d, 0x4b, 0x6e, 0x61, 0x70, 0x73, 0x61, 0x63, 0x6b, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 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/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 05675a272..4370729eb 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -180,6 +180,21 @@ type GameGlobalData struct { RaiseTemperatureNum int32 ExemptionTemperatureCos *Gameatn ExemptionTemperatureCosNum int32 + DispatchFreecheck int32 + DispatchChecktime int32 + DispatchCheckmoney *Gameatn + DispatchRefreshtimes int32 + DispatchNumoftimes int32 + DispatchNumtools int32 + DispatchNpctimes int32 + DispatchWeektaskreward []*Gamedispatch + DispatchWeektaskcheck int32 + PandamasChallengeCd int32 + PandamasChallengeNum int32 + PandamasFightNum int32 + PandamasRankAbove50 int32 + PandamasRankedBelow50 int32 + MrylFlushed []*Gameatn } const TypeId_GameGlobalData = 477542761 @@ -761,6 +776,47 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["raise_temperatureNum"].(float64); !_ok_ { err = errors.New("raise_temperatureNum error"); return }; _v.RaiseTemperatureNum = int32(_tempNum_) } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["exemption_TemperatureCos"].(map[string]interface{}); !_ok_ { err = errors.New("exemption_TemperatureCos error"); return }; if _v.ExemptionTemperatureCos, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exemption_TemperatureCosNum"].(float64); !_ok_ { err = errors.New("exemption_TemperatureCosNum error"); return }; _v.ExemptionTemperatureCosNum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dispatch_freecheck"].(float64); !_ok_ { err = errors.New("dispatch_freecheck error"); return }; _v.DispatchFreecheck = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dispatch_checktime"].(float64); !_ok_ { err = errors.New("dispatch_checktime error"); return }; _v.DispatchChecktime = int32(_tempNum_) } + { 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 _tempNum_ float64; if _tempNum_, _ok_ = _buf["dispatch_npctimes"].(float64); !_ok_ { err = errors.New("dispatch_npctimes error"); return }; _v.DispatchNpctimes = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["dispatch_weektaskreward"].([]interface{}); !_ok_ { err = errors.New("dispatch_weektaskreward error"); return } + + _v.DispatchWeektaskreward = make([]*Gamedispatch, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gamedispatch + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGamedispatch(_x_); err != nil { return } } + _v.DispatchWeektaskreward = append(_v.DispatchWeektaskreward, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dispatch_weektaskcheck"].(float64); !_ok_ { err = errors.New("dispatch_weektaskcheck error"); return }; _v.DispatchWeektaskcheck = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pandamas_challenge_cd"].(float64); !_ok_ { err = errors.New("pandamas_challenge_cd error"); return }; _v.PandamasChallengeCd = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pandamas_challenge_num"].(float64); !_ok_ { err = errors.New("pandamas_challenge_num error"); return }; _v.PandamasChallengeNum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pandamas_fight_num"].(float64); !_ok_ { err = errors.New("pandamas_fight_num error"); return }; _v.PandamasFightNum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pandamas_RankAbove50"].(float64); !_ok_ { err = errors.New("pandamas_RankAbove50 error"); return }; _v.PandamasRankAbove50 = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pandamas_RankedBelow50"].(float64); !_ok_ { err = errors.New("pandamas_RankedBelow50 error"); return }; _v.PandamasRankedBelow50 = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["mryl_flushed"].([]interface{}); !_ok_ { err = errors.New("mryl_flushed error"); return } + + _v.MrylFlushed = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.MrylFlushed = append(_v.MrylFlushed, _list_v_) + } + } + return }