From e5ce4c37aa7e1b0a75634a62cd0d0c9b070ca4aa Mon Sep 17 00:00:00 2001 From: wh_zcy Date: Thu, 18 Aug 2022 11:48:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_rdtaskall.json | 64 +++++++++---------- bin/json/game_rdtaskchoose.json | 24 +++---- bin/json/game_rdtasktype.json | 32 +++++----- cmd/v2/model/gen.go | 14 ++-- sys/configure/structs/Tables.go | 7 ++ sys/configure/structs/game.rdtaskAllData.go | 20 +++--- .../structs/game.rdtaskChooseData.go | 4 +- sys/configure/structs/game.rdtaskType.go | 2 +- sys/configure/structs/game.rdtaskTypeData.go | 8 +-- 9 files changed, 92 insertions(+), 83 deletions(-) diff --git a/bin/json/game_rdtaskall.json b/bin/json/game_rdtaskall.json index 64cbcf8ce..93e50c315 100644 --- a/bin/json/game_rdtaskall.json +++ b/bin/json/game_rdtaskall.json @@ -2,12 +2,12 @@ { "id": 1001, "type": 2, - "lastend": 0, - "rdtaks_num": [ + "lasttask": 0, + "rdtaksnum": [ 101 ], - "aftertaks": 1002, - "icetime": 0, + "aftertask": 1002, + "taskcd": 0, "tag": 1, "story": 3, "completetask": 0, @@ -32,13 +32,13 @@ { "id": 1002, "type": 2, - "lastend": 1001, - "rdtaks_num": [ + "lasttask": 1001, + "rdtaksnum": [ 101, 102 ], - "aftertaks": 1003, - "icetime": 0, + "aftertask": 1003, + "taskcd": 0, "tag": 2, "story": 3, "completetask": 0, @@ -63,13 +63,13 @@ { "id": 1003, "type": 2, - "lastend": 1002, - "rdtaks_num": [ + "lasttask": 1002, + "rdtaksnum": [ 101, 103 ], - "aftertaks": 1004, - "icetime": 0, + "aftertask": 1004, + "taskcd": 0, "tag": 1, "story": 3, "completetask": 0, @@ -90,13 +90,13 @@ { "id": 1004, "type": 2, - "lastend": 1003, - "rdtaks_num": [ + "lasttask": 1003, + "rdtaksnum": [ 101, 103 ], - "aftertaks": 1005, - "icetime": 0, + "aftertask": 1005, + "taskcd": 0, "tag": 1, "story": 3, "completetask": 0, @@ -117,13 +117,13 @@ { "id": 1005, "type": 2, - "lastend": 1004, - "rdtaks_num": [ + "lasttask": 1004, + "rdtaksnum": [ 104, 105 ], - "aftertaks": 1006, - "icetime": 0, + "aftertask": 1006, + "taskcd": 0, "tag": 1, "story": 3, "completetask": 0, @@ -144,12 +144,12 @@ { "id": 1006, "type": 2, - "lastend": 1005, - "rdtaks_num": [ + "lasttask": 1005, + "rdtaksnum": [ 106 ], - "aftertaks": 0, - "icetime": 0, + "aftertask": 0, + "taskcd": 0, "tag": 1, "story": 3, "completetask": 0, @@ -173,12 +173,12 @@ { "id": 1007, "type": 1, - "lastend": 0, - "rdtaks_num": [ + "lasttask": 0, + "rdtaksnum": [ 107 ], - "aftertaks": 1002, - "icetime": 1, + "aftertask": 1002, + "taskcd": 1, "tag": 1, "story": 3, "completetask": 0, @@ -199,12 +199,12 @@ { "id": 1008, "type": 1, - "lastend": 0, - "rdtaks_num": [ + "lasttask": 0, + "rdtaksnum": [ 108 ], - "aftertaks": 1002, - "icetime": -1, + "aftertask": 1002, + "taskcd": -1, "tag": 1, "story": 3, "completetask": 0, diff --git a/bin/json/game_rdtaskchoose.json b/bin/json/game_rdtaskchoose.json index 68e98b36d..19887bb52 100644 --- a/bin/json/game_rdtaskchoose.json +++ b/bin/json/game_rdtaskchoose.json @@ -2,7 +2,7 @@ { "chooseid": 10001, "num": 1, - "rdtaks_num": 101, + "rdtaksnum": 101, "need": [ 0 ] @@ -10,7 +10,7 @@ { "chooseid": 10002, "num": 2, - "rdtaks_num": 107, + "rdtaksnum": 107, "need": [ 0 ] @@ -18,7 +18,7 @@ { "chooseid": 10003, "num": 3, - "rdtaks_num": 101, + "rdtaksnum": 101, "need": [ 0 ] @@ -26,7 +26,7 @@ { "chooseid": 10011, "num": 1, - "rdtaks_num": 101, + "rdtaksnum": 101, "need": [ 0 ] @@ -34,7 +34,7 @@ { "chooseid": 10012, "num": 2, - "rdtaks_num": 101, + "rdtaksnum": 101, "need": [ 0 ] @@ -42,7 +42,7 @@ { "chooseid": 10013, "num": 3, - "rdtaks_num": 101, + "rdtaksnum": 101, "need": [ 0 ] @@ -50,7 +50,7 @@ { "chooseid": 10021, "num": 1, - "rdtaks_num": 101, + "rdtaksnum": 101, "need": [ 0 ] @@ -58,7 +58,7 @@ { "chooseid": 10022, "num": 2, - "rdtaks_num": 101, + "rdtaksnum": 101, "need": [ 0 ] @@ -66,7 +66,7 @@ { "chooseid": 10031, "num": 1, - "rdtaks_num": 0, + "rdtaksnum": 0, "need": [ 10012 ] @@ -74,7 +74,7 @@ { "chooseid": 10032, "num": 2, - "rdtaks_num": 0, + "rdtaksnum": 0, "need": [ 0 ] @@ -82,7 +82,7 @@ { "chooseid": 10041, "num": 1, - "rdtaks_num": 0, + "rdtaksnum": 0, "need": [ 10010 ] @@ -90,7 +90,7 @@ { "chooseid": 10042, "num": 2, - "rdtaks_num": 0, + "rdtaksnum": 0, "need": [ 0 ] diff --git a/bin/json/game_rdtasktype.json b/bin/json/game_rdtasktype.json index 6a8ba67cc..ba552fccf 100644 --- a/bin/json/game_rdtasktype.json +++ b/bin/json/game_rdtasktype.json @@ -1,72 +1,72 @@ [ { - "rdtaks_num": 101, + "rdtaksnum": 101, "typdes": 2, "datatime": 1, - "typtask_id": 1, + "typtaskid": 1, "data1": 90001, "data2": 0, "data3": 0 }, { - "rdtaks_num": 102, + "rdtaksnum": 102, "typdes": 2, "datatime": 1, - "typtask_id": 2, + "typtaskid": 2, "data1": 3, "data2": 0, "data3": 0 }, { - "rdtaks_num": 103, + "rdtaksnum": 103, "typdes": 2, "datatime": 1, - "typtask_id": 3, + "typtaskid": 3, "data1": 2, "data2": 0, "data3": 0 }, { - "rdtaks_num": 104, + "rdtaksnum": 104, "typdes": 2, "datatime": 1, - "typtask_id": 4, + "typtaskid": 4, "data1": 90001, "data2": 15, "data3": 0 }, { - "rdtaks_num": 105, + "rdtaksnum": 105, "typdes": 2, "datatime": 1, - "typtask_id": 4, + "typtaskid": 4, "data1": 25001, "data2": 10, "data3": 0 }, { - "rdtaks_num": 106, + "rdtaksnum": 106, "typdes": 2, "datatime": 1, - "typtask_id": 5, + "typtaskid": 5, "data1": 90001, "data2": 2, "data3": 0 }, { - "rdtaks_num": 107, + "rdtaksnum": 107, "typdes": 2, "datatime": 1, - "typtask_id": 4, + "typtaskid": 4, "data1": 25001, "data2": 20, "data3": 0 }, { - "rdtaks_num": 108, + "rdtaksnum": 108, "typdes": 2, "datatime": 1, - "typtask_id": 6, + "typtaskid": 6, "data1": 90001, "data2": 5, "data3": 0 diff --git a/cmd/v2/model/gen.go b/cmd/v2/model/gen.go index c58151f44..83af22fa0 100644 --- a/cmd/v2/model/gen.go +++ b/cmd/v2/model/gen.go @@ -1,10 +1,12 @@ package model type GenTool struct { - ClientDir string - InputDir string - OutputDir string - GenType int32 - - + ServerAddr string //服务地址 + ProjectDir string //项目目录 + Client string //Client 文件路径 + WorkDir string //工作目录 + InputDir string //输入目录 + OutputCodeDir string //输出Code目录 + OutputJsonDir string //输出json目录 + GenType int32 //生成类型 } diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 2734d2c0d..695804c10 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -75,6 +75,7 @@ type Tables struct { kungfu_masterworker *Gamekungfu_masterworker Gourmet *GameGourmet GourmetSkill *GameGourmetSkill + Drop *GameDrop } func NewTables(loader JsonLoader) (*Tables, error) { @@ -466,5 +467,11 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.GourmetSkill, err = NewGameGourmetSkill(buf) ; err != nil { return nil, err } + if buf, err = loader("game_drop") ; err != nil { + return nil, err + } + if tables.Drop, err = NewGameDrop(buf) ; err != nil { + return nil, err + } return tables, nil } diff --git a/sys/configure/structs/game.rdtaskAllData.go b/sys/configure/structs/game.rdtaskAllData.go index 2ded0d1fa..908ee2a0c 100644 --- a/sys/configure/structs/game.rdtaskAllData.go +++ b/sys/configure/structs/game.rdtaskAllData.go @@ -13,10 +13,10 @@ import "errors" type GameRdtaskAllData struct { Id int32 Type int32 - Lastend int32 - RdtaksNum []int32 - Aftertaks int32 - Icetime int32 + Lasttask int32 + Rdtaksnum []int32 + Aftertask int32 + Taskcd int32 Tag int32 Story int32 Completetask int32 @@ -33,23 +33,23 @@ func (*GameRdtaskAllData) GetTypeId() int32 { func (_v *GameRdtaskAllData)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; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lastend"].(float64); !_ok_ { err = errors.New("lastend error"); return }; _v.Lastend = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lasttask"].(float64); !_ok_ { err = errors.New("lasttask error"); return }; _v.Lasttask = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool - if _arr_, _ok_ = _buf["rdtaks_num"].([]interface{}); !_ok_ { err = errors.New("rdtaks_num error"); return } + if _arr_, _ok_ = _buf["rdtaksnum"].([]interface{}); !_ok_ { err = errors.New("rdtaksnum error"); return } - _v.RdtaksNum = make([]int32, 0, len(_arr_)) + _v.Rdtaksnum = make([]int32, 0, len(_arr_)) for _, _e_ := range _arr_ { var _list_v_ int32 { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } - _v.RdtaksNum = append(_v.RdtaksNum, _list_v_) + _v.Rdtaksnum = append(_v.Rdtaksnum, _list_v_) } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["aftertaks"].(float64); !_ok_ { err = errors.New("aftertaks error"); return }; _v.Aftertaks = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["icetime"].(float64); !_ok_ { err = errors.New("icetime error"); return }; _v.Icetime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["aftertask"].(float64); !_ok_ { err = errors.New("aftertask error"); return }; _v.Aftertask = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["taskcd"].(float64); !_ok_ { err = errors.New("taskcd error"); return }; _v.Taskcd = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tag"].(float64); !_ok_ { err = errors.New("tag error"); return }; _v.Tag = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["story"].(float64); !_ok_ { err = errors.New("story error"); return }; _v.Story = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["completetask"].(float64); !_ok_ { err = errors.New("completetask error"); return }; _v.Completetask = int32(_tempNum_) } diff --git a/sys/configure/structs/game.rdtaskChooseData.go b/sys/configure/structs/game.rdtaskChooseData.go index 6a72027a8..1022ea688 100644 --- a/sys/configure/structs/game.rdtaskChooseData.go +++ b/sys/configure/structs/game.rdtaskChooseData.go @@ -13,7 +13,7 @@ import "errors" type GameRdtaskChooseData struct { Chooseid int32 Num int32 - RdtaksNum int32 + Rdtaksnum int32 Need []int32 } @@ -26,7 +26,7 @@ func (*GameRdtaskChooseData) GetTypeId() int32 { func (_v *GameRdtaskChooseData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["chooseid"].(float64); !_ok_ { err = errors.New("chooseid error"); return }; _v.Chooseid = int32(_tempNum_) } { 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 _tempNum_ float64; if _tempNum_, _ok_ = _buf["rdtaks_num"].(float64); !_ok_ { err = errors.New("rdtaks_num error"); return }; _v.RdtaksNum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rdtaksnum"].(float64); !_ok_ { err = errors.New("rdtaksnum error"); return }; _v.Rdtaksnum = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/game.rdtaskType.go b/sys/configure/structs/game.rdtaskType.go index b1ec19cb7..e9eae488e 100644 --- a/sys/configure/structs/game.rdtaskType.go +++ b/sys/configure/structs/game.rdtaskType.go @@ -21,7 +21,7 @@ func NewGameRdtaskType(_buf []map[string]interface{}) (*GameRdtaskType, error) { return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.RdtaksNum] = _v + dataMap[_v.Rdtaksnum] = _v } } return &GameRdtaskType{_dataList:_dataList, _dataMap:dataMap}, nil diff --git a/sys/configure/structs/game.rdtaskTypeData.go b/sys/configure/structs/game.rdtaskTypeData.go index a779729f6..8e8f4cd15 100644 --- a/sys/configure/structs/game.rdtaskTypeData.go +++ b/sys/configure/structs/game.rdtaskTypeData.go @@ -11,10 +11,10 @@ package cfg import "errors" type GameRdtaskTypeData struct { - RdtaksNum int32 + Rdtaksnum int32 Typdes int32 Datatime int32 - TyptaskId int32 + Typtaskid int32 Data1 int32 Data2 int32 Data3 int32 @@ -27,10 +27,10 @@ func (*GameRdtaskTypeData) GetTypeId() int32 { } func (_v *GameRdtaskTypeData)Deserialize(_buf map[string]interface{}) (err error) { - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rdtaks_num"].(float64); !_ok_ { err = errors.New("rdtaks_num error"); return }; _v.RdtaksNum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rdtaksnum"].(float64); !_ok_ { err = errors.New("rdtaksnum error"); return }; _v.Rdtaksnum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["typdes"].(float64); !_ok_ { err = errors.New("typdes error"); return }; _v.Typdes = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["datatime"].(float64); !_ok_ { err = errors.New("datatime error"); return }; _v.Datatime = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["typtask_id"].(float64); !_ok_ { err = errors.New("typtask_id error"); return }; _v.TyptaskId = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["typtaskid"].(float64); !_ok_ { err = errors.New("typtaskid error"); return }; _v.Typtaskid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data1"].(float64); !_ok_ { err = errors.New("data1 error"); return }; _v.Data1 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data2"].(float64); !_ok_ { err = errors.New("data2 error"); return }; _v.Data2 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data3"].(float64); !_ok_ { err = errors.New("data3 error"); return }; _v.Data3 = int32(_tempNum_) }