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

同步配置

Browse Source
This commit is contained in:
liwei 2023-06-16 21:15:21 +08:00
parent c2ee23fd36
commit 953b8504f4
16 changed files with 109 additions and 606 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/json/game_dispatch_task.json
View File

@ -1832,7 +1832,7 @@
},
"icon": "xmwg_rw_pt4",
"taskcd": 200,
"tasktime": 147,
"tasktime": 179,
"tasktxt": {
"key": "pandamas_pandamas_dispatch_tasktxt_39",
"text": "这是属于悍娇虎的专属委托"

12
bin/json/game_navigation.json
View File

@ -120,10 +120,10 @@
"text": "羁绊"
},
"npcName": [
"功能入口-藏书馆"
"打造"
],
"functionicon": "ty_qp_hgd",
"jumpId": 146
"functionicon": "ty_qp_zm",
"jumpId": 1001
},
{
"Id": 8,
@ -132,7 +132,7 @@
"key": "navigation_Sheet1_scenename_8",
"text": "指挥部"
},
"sceneicon": "ty_qp_zhb",
"sceneicon": "ty_qp_tjp",
"functionname": {
"key": "navigation_Sheet1_functionname_8",
"text": "主线关卡"
@ -150,13 +150,13 @@
"key": "navigation_Sheet1_scenename_9",
"text": "指挥部"
},
"sceneicon": "ty_qp_zhb",
"sceneicon": "ty_qp_tjp",
"functionname": {
"key": "navigation_Sheet1_functionname_9",
"text": "星座图"
},
"npcName": [
"功能入口_主角星座图"
"手册台"
],
"functionicon": "ty_qp_tf",
"jumpId": 171

197
modules/hero/api_fusion.go
View File

@ -1,106 +1,99 @@
package hero
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/utils"
)
// //参数校验
// func (this *apiComp) FusionCheck(session comm.IUserSession, req *pb.HeroFusionReq) (errdata *pb.ErrorData) {
// if req.HeroId == "" {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ReqParameterError,
// Title: pb.ErrorCode_ReqParameterError.ToString(),
// }
// }
// return
// }
//参数校验
func (this *apiComp) FusionCheck(session comm.IUserSession, req *pb.HeroFusionReq) (errdata *pb.ErrorData) {
if req.HeroId == "" {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
}
return
}
// func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (errdata *pb.ErrorData) {
// var (
// totalCount int32
// mapHero map[string]int32
// _costMaphero map[string]*pb.DBHero
// ChangeList []*pb.DBHero // 变化的英雄数据
// )
// ChangeList = make([]*pb.DBHero, 0)
// _costMaphero = make(map[string]*pb.DBHero, 0)
// mapHero = make(map[string]int32)
// if errdata = this.FusionCheck(session, req); errdata != nil {
// return
// }
// conf, err := this.module.configure.GetHeroFucionConfig(req.HeroId)
// if err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ConfigNoFound, // 配置没找到
// Title: pb.ErrorCode_ConfigNoFound.ToString(),
// Message: err.Error(),
// }
// return
// }
// for _, v := range req.Heros {
// totalCount += v
// }
// if totalCount != int32(len(conf.Pointhero)) { // 校验数量
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ReqParameterError,
// Title: pb.ErrorCode_ReqParameterError.ToString(),
// }
// return
// }
// for k, v := range req.Heros {
// // 校验英雄是否存在
// _obj, c := this.module.GetHeroByObjID(session.GetUserId(), k)
// if c != nil {
// errdata = c
// return
// }
// mapHero[_obj.HeroID] += v
// _costMaphero[k] = _obj
// }
// for _, v := range conf.Pointhero {
// if _, ok := mapHero[v]; ok {
// mapHero[v] -= 1
// } else {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ReqParameterError,
// Title: pb.ErrorCode_ReqParameterError.ToString(),
// }
// return
// }
// }
// for _, v := range mapHero {
// if v != 0 {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_ReqParameterError,
// Title: pb.ErrorCode_ReqParameterError.ToString(),
// }
// return
// }
// }
// for k, _ := range req.Heros {
// //mapHero[_costMaphero[k].HeroID]
// if errdata = this.module.DelCard(session.GetUserId(), _costMaphero[k]); errdata != nil {
// return
// }
// ChangeList = append(ChangeList, _costMaphero[k])
// }
func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (errdata *pb.ErrorData) {
var (
totalCount int32
mapHero map[string]int32
_costMaphero map[string]*pb.DBHero
ChangeList []*pb.DBHero // 变化的英雄数据
)
ChangeList = make([]*pb.DBHero, 0)
_costMaphero = make(map[string]*pb.DBHero, 0)
mapHero = make(map[string]int32)
if errdata = this.FusionCheck(session, req); errdata != nil {
return
}
conf, err := this.module.configure.GetHeroFucionConfig(req.HeroId)
if err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound, // 配置没找到
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
for _, v := range req.Heros {
totalCount += v
}
if totalCount != int32(len(conf.Pointhero)) { // 校验数量
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
return
}
for k, v := range req.Heros {
// 校验英雄是否存在
_obj, c := this.module.GetHeroByObjID(session.GetUserId(), k)
if c != nil {
errdata = c
return
}
mapHero[_obj.HeroID] += v
_costMaphero[k] = _obj
}
for _, v := range conf.Pointhero {
if _, ok := mapHero[v]; ok {
mapHero[v] -= 1
} else {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
return
}
}
for _, v := range mapHero {
if v != 0 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
}
return
}
}
for k, _ := range req.Heros {
//mapHero[_costMaphero[k].HeroID]
if errdata = this.module.DelCard(session.GetUserId(), _costMaphero[k]); errdata != nil {
return
}
ChangeList = append(ChangeList, _costMaphero[k])
}
// 获得新卡
res := &cfg.Gameatn{
A: "hero",
T: conf.Hero,
N: 1,
}
if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{res}, false); errdata != nil {
this.module.Errorf("err:%v,create hero:%s,uid,%ss", errdata, conf.Hero, session.GetUserId())
return
}
session.SendMsg(string(this.module.GetType()), HeroFusionResp, &pb.HeroFusionResp{Heroid: conf.Hero})
// 通过融合获得指定英雄
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype139, utils.ToInt32(conf.Hero))
go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype139, utils.ToInt32(conf.Hero)))
return
}
// // 获得新卡
// res := &cfg.Gameatn{
// A: "hero",
// T: conf.Hero,
// N: 1,
// }
// if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{res}, false); errdata != nil {
// this.module.Errorf("err:%v,create hero:%s,uid,%ss", errdata, conf.Hero, session.GetUserId())
// return
// }
// session.SendMsg(string(this.module.GetType()), HeroFusionResp, &pb.HeroFusionResp{Heroid: conf.Hero})
// // 通过融合获得指定英雄
// // this.module.ModuleRtask.SendToRtask(session, comm.Rtype139, utils.ToInt32(conf.Hero))
// go this.module.ModuleBuried.TriggerBuried(session.GetUserId(), comm.GetBuriedParam(comm.Rtype139, utils.ToInt32(conf.Hero)))
// return
// }

17
modules/hero/configure_comp.go
View File

@ -60,7 +60,6 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
hero_skillup: cfg.NewGameHeroSkillLevel,
game_skillatk: cfg.NewGameSkillAtk,
hero_drawcard: cfg.NewGameDrawCard,
hero_fusion: cfg.NewGameHerofusion,
hero_talent: cfg.NewGameHeroTalent,
hero_talentbox: cfg.NewGameTalentBox,
game_shopitem: cfg.NewGameShopitem,
@ -282,22 +281,6 @@ func (this *configureComp) GetHeroSkillMaxLvConfig(skillId uint32) int32 {
return 0
}
// 获取卡牌合成配置
func (this *configureComp) GetHeroFucionConfig(cid string) (data *cfg.GameHerofusionData, err error) {
var (
v interface{}
)
if v, err = this.GetConfigure(hero_fusion); err == nil {
if configure, ok := v.(*cfg.GameHerofusion); ok {
if data = configure.Get(cid); data != nil {
return
}
}
}
err = comm.NewNotFoundConfErr(moduleName, hero_fusion, cid)
return
}
func (this *configureComp) GetHeroTalent(id int32) (data *cfg.GameHeroTalentData, err error) {
var (
v interface{}

42
sys/configure/structs/Game.Herofusion.go
View File

@ -1,42 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameHerofusion struct {
_dataMap map[string]*GameHerofusionData
_dataList []*GameHerofusionData
}
func NewGameHerofusion(_buf []map[string]interface{}) (*GameHerofusion, error) {
_dataList := make([]*GameHerofusionData, 0, len(_buf))
dataMap := make(map[string]*GameHerofusionData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameHerofusionData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Hero] = _v
}
}
return &GameHerofusion{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameHerofusion) GetDataMap() map[string]*GameHerofusionData {
return table._dataMap
}
func (table *GameHerofusion) GetDataList() []*GameHerofusionData {
return table._dataList
}
func (table *GameHerofusion) Get(key string) *GameHerofusionData {
return table._dataMap[key]
}

73
sys/configure/structs/Game.HerofusionData.go
View File

@ -1,73 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameHerofusionData struct {
Hero string
Switch int32
Pointhero []string
Awaken int32
Start int32
Lv int32
Fuison []*Gameatn
}
const TypeId_GameHerofusionData = -689698108
func (*GameHerofusionData) GetTypeId() int32 {
return -689698108
}
func (_v *GameHerofusionData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Hero, _ok_ = _buf["hero"].(string); !_ok_ { err = errors.New("hero error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["switch"].(float64); !_ok_ { err = errors.New("switch error"); return }; _v.Switch = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["pointhero"].([]interface{}); !_ok_ { err = errors.New("pointhero error"); return }
_v.Pointhero = make([]string, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ string
{ if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
_v.Pointhero = append(_v.Pointhero, _list_v_)
}
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["awaken"].(float64); !_ok_ { err = errors.New("awaken error"); return }; _v.Awaken = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["start"].(float64); !_ok_ { err = errors.New("start error"); return }; _v.Start = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["fuison"].([]interface{}); !_ok_ { err = errors.New("fuison error"); return }
_v.Fuison = 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.Fuison = append(_v.Fuison, _list_v_)
}
}
return
}
func DeserializeGameHerofusionData(_buf map[string]interface{}) (*GameHerofusionData, error) {
v := &GameHerofusionData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

42
sys/configure/structs/Game.LibraryComplot.go
View File

@ -1,42 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameLibraryComplot struct {
_dataMap map[int32]*GameLibraryComplotData
_dataList []*GameLibraryComplotData
}
func NewGameLibraryComplot(_buf []map[string]interface{}) (*GameLibraryComplot, error) {
_dataList := make([]*GameLibraryComplotData, 0, len(_buf))
dataMap := make(map[int32]*GameLibraryComplotData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameLibraryComplotData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GameLibraryComplot{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameLibraryComplot) GetDataMap() map[int32]*GameLibraryComplotData {
return table._dataMap
}
func (table *GameLibraryComplot) GetDataList() []*GameLibraryComplotData {
return table._dataList
}
func (table *GameLibraryComplot) Get(key int32) *GameLibraryComplotData {
return table._dataMap[key]
}

53
sys/configure/structs/Game.LibraryComplotData.go
View File

@ -1,53 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameLibraryComplotData struct {
Id int32
SubTask int32
NodeIndex int32
Order string
StoryId int32
FetterId int32
Name string
Describe string
Img string
Ending int32
}
const TypeId_GameLibraryComplotData = 172849261
func (*GameLibraryComplotData) GetTypeId() int32 {
return 172849261
}
func (_v *GameLibraryComplotData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["subTask"].(float64); !_ok_ { err = errors.New("subTask error"); return }; _v.SubTask = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["nodeIndex"].(float64); !_ok_ { err = errors.New("nodeIndex error"); return }; _v.NodeIndex = int32(_tempNum_) }
{ var _ok_ bool; if _v.Order, _ok_ = _buf["order"].(string); !_ok_ { err = errors.New("order error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["story_id"].(float64); !_ok_ { err = errors.New("story_id error"); return }; _v.StoryId = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fetter_id"].(float64); !_ok_ { err = errors.New("fetter_id error"); return }; _v.FetterId = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["describe"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Describe error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Describe, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ending"].(float64); !_ok_ { err = errors.New("ending error"); return }; _v.Ending = int32(_tempNum_) }
return
}
func DeserializeGameLibraryComplotData(_buf map[string]interface{}) (*GameLibraryComplotData, error) {
v := &GameLibraryComplotData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

42
sys/configure/structs/Game.NewRedDot.go
View File

@ -1,42 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameNewRedDot struct {
_dataMap map[int32]*GameNewRedDotData
_dataList []*GameNewRedDotData
}
func NewGameNewRedDot(_buf []map[string]interface{}) (*GameNewRedDot, error) {
_dataList := make([]*GameNewRedDotData, 0, len(_buf))
dataMap := make(map[int32]*GameNewRedDotData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameNewRedDotData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GameNewRedDot{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameNewRedDot) GetDataMap() map[int32]*GameNewRedDotData {
return table._dataMap
}
func (table *GameNewRedDot) GetDataList() []*GameNewRedDotData {
return table._dataList
}
func (table *GameNewRedDot) Get(key int32) *GameNewRedDotData {
return table._dataMap[key]
}

49
sys/configure/structs/Game.NewRedDotData.go
View File

@ -1,49 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameNewRedDotData struct {
Id int32
MsgType int32
TreeType int32
ShowType int32
CountType int32
Group string
Path string
Header string
}
const TypeId_GameNewRedDotData = 943392646
func (*GameNewRedDotData) GetTypeId() int32 {
return 943392646
}
func (_v *GameNewRedDotData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["msg_type"].(float64); !_ok_ { err = errors.New("msg_type error"); return }; _v.MsgType = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tree_type"].(float64); !_ok_ { err = errors.New("tree_type error"); return }; _v.TreeType = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["show_type"].(float64); !_ok_ { err = errors.New("show_type error"); return }; _v.ShowType = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["count_type"].(float64); !_ok_ { err = errors.New("count_type error"); return }; _v.CountType = int32(_tempNum_) }
{ var _ok_ bool; if _v.Group, _ok_ = _buf["group"].(string); !_ok_ { err = errors.New("group error"); return } }
{ var _ok_ bool; if _v.Path, _ok_ = _buf["path"].(string); !_ok_ { err = errors.New("path error"); return } }
{ var _ok_ bool; if _v.Header, _ok_ = _buf["header"].(string); !_ok_ { err = errors.New("header error"); return } }
return
}
func DeserializeGameNewRedDotData(_buf map[string]interface{}) (*GameNewRedDotData, error) {
v := &GameNewRedDotData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

42
sys/configure/structs/Game.RedDotGroup.go
View File

@ -1,42 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameRedDotGroup struct {
_dataMap map[int32]*GameRedDotGroupData
_dataList []*GameRedDotGroupData
}
func NewGameRedDotGroup(_buf []map[string]interface{}) (*GameRedDotGroup, error) {
_dataList := make([]*GameRedDotGroupData, 0, len(_buf))
dataMap := make(map[int32]*GameRedDotGroupData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameRedDotGroupData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
return &GameRedDotGroup{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameRedDotGroup) GetDataMap() map[int32]*GameRedDotGroupData {
return table._dataMap
}
func (table *GameRedDotGroup) GetDataList() []*GameRedDotGroupData {
return table._dataList
}
func (table *GameRedDotGroup) Get(key int32) *GameRedDotGroupData {
return table._dataMap[key]
}

43
sys/configure/structs/Game.RedDotGroupData.go
View File

@ -1,43 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameRedDotGroupData struct {
Id int32
Type int32
Group string
Layer string
Header string
}
const TypeId_GameRedDotGroupData = -1285083979
func (*GameRedDotGroupData) GetTypeId() int32 {
return -1285083979
}
func (_v *GameRedDotGroupData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{ var _ok_ bool; if _v.Group, _ok_ = _buf["group"].(string); !_ok_ { err = errors.New("group error"); return } }
{ var _ok_ bool; if _v.Layer, _ok_ = _buf["layer"].(string); !_ok_ { err = errors.New("layer error"); return } }
{ var _ok_ bool; if _v.Header, _ok_ = _buf["header"].(string); !_ok_ { err = errors.New("header error"); return } }
return
}
func DeserializeGameRedDotGroupData(_buf map[string]interface{}) (*GameRedDotGroupData, error) {
v := &GameRedDotGroupData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

2
sys/configure/structs/Game.WorldTaskData.go
View File

@ -17,7 +17,6 @@ type GameWorldTaskData struct {
Ontxe int32
IdAfter int32
Group int32
Exgroup int32
Des int32
Icon string
TaskName string
@ -44,7 +43,6 @@ func (_v *GameWorldTaskData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ontxe"].(float64); !_ok_ { err = errors.New("ontxe error"); return }; _v.Ontxe = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id_after"].(float64); !_ok_ { err = errors.New("id_after error"); return }; _v.IdAfter = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exgroup"].(float64); !_ok_ { err = errors.New("exgroup error"); return }; _v.Exgroup = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["des"].(float64); !_ok_ { err = errors.New("des error"); return }; _v.Des = int32(_tempNum_) }
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }

42
sys/configure/structs/game.equipColor.go
View File

@ -1,42 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
type GameEquipColor struct {
_dataMap map[int32]*GameEquipColorData
_dataList []*GameEquipColorData
}
func NewGameEquipColor(_buf []map[string]interface{}) (*GameEquipColor, error) {
_dataList := make([]*GameEquipColorData, 0, len(_buf))
dataMap := make(map[int32]*GameEquipColorData)
for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameEquipColorData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Num] = _v
}
}
return &GameEquipColor{_dataList:_dataList, _dataMap:dataMap}, nil
}
func (table *GameEquipColor) GetDataMap() map[int32]*GameEquipColorData {
return table._dataMap
}
func (table *GameEquipColor) GetDataList() []*GameEquipColorData {
return table._dataList
}
func (table *GameEquipColor) Get(key int32) *GameEquipColorData {
return table._dataMap[key]
}

37
sys/configure/structs/game.equipColorData.go
View File

@ -1,37 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
package cfg
import "errors"
type GameEquipColorData struct {
Num int32
Color string
}
const TypeId_GameEquipColorData = -1911630631
func (*GameEquipColorData) GetTypeId() int32 {
return -1911630631
}
func (_v *GameEquipColorData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["color"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Color error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Color, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}
func DeserializeGameEquipColorData(_buf map[string]interface{}) (*GameEquipColorData, error) {
v := &GameEquipColorData{}
if err := v.Deserialize(_buf); err == nil {
return v, nil
} else {
return nil, err
}
}

6
sys/configure/structs/game.globalData.go
View File

@ -235,10 +235,7 @@ type GameGlobalData struct {
BuzkashiBumpdis float32
StaminaPotion int32
FightPs int32
<<<<<<< HEAD
PlayerBodychange int32
=======
>>>>>>> 2131e2390f348a79dd67bd0801b2bbc656f9f311
}
const TypeId_GameGlobalData = 477542761
@ -953,10 +950,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_bumpdis"].(float64); !_ok_ { err = errors.New("buzkashi_bumpdis error"); return }; _v.BuzkashiBumpdis = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stamina_potion"].(float64); !_ok_ { err = errors.New("stamina_potion error"); return }; _v.StaminaPotion = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fight_ps"].(float64); !_ok_ { err = errors.New("fight_ps error"); return }; _v.FightPs = int32(_tempNum_) }
<<<<<<< HEAD
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["player_bodychange"].(float64); !_ok_ { err = errors.New("player_bodychange error"); return }; _v.PlayerBodychange = int32(_tempNum_) }
=======
>>>>>>> 2131e2390f348a79dd67bd0801b2bbc656f9f311
return
}