更新配置

bin/json/game_rdtaskall.json

@@ -2,12 +2,12 @@
   {
     "id": 1001,
     "type": 2,
-    "lastend": 0,
+    "lasttask": 0,
-    "rdtaks_num": [
+    "rdtaksnum": [
       101
     ],
-    "aftertaks": 1002,
+    "aftertask": 1002,
-    "icetime": 0,
+    "taskcd": 0,
     "tag": 1,
     "story": 3,
     "completetask": 0,
@@ -32,13 +32,13 @@
   {
     "id": 1002,
     "type": 2,
-    "lastend": 1001,
+    "lasttask": 1001,
-    "rdtaks_num": [
+    "rdtaksnum": [
       101,
       102
     ],
-    "aftertaks": 1003,
+    "aftertask": 1003,
-    "icetime": 0,
+    "taskcd": 0,
     "tag": 2,
     "story": 3,
     "completetask": 0,
@@ -63,13 +63,13 @@
   {
     "id": 1003,
     "type": 2,
-    "lastend": 1002,
+    "lasttask": 1002,
-    "rdtaks_num": [
+    "rdtaksnum": [
       101,
       103
     ],
-    "aftertaks": 1004,
+    "aftertask": 1004,
-    "icetime": 0,
+    "taskcd": 0,
     "tag": 1,
     "story": 3,
     "completetask": 0,
@@ -90,13 +90,13 @@
   {
     "id": 1004,
     "type": 2,
-    "lastend": 1003,
+    "lasttask": 1003,
-    "rdtaks_num": [
+    "rdtaksnum": [
       101,
       103
     ],
-    "aftertaks": 1005,
+    "aftertask": 1005,
-    "icetime": 0,
+    "taskcd": 0,
     "tag": 1,
     "story": 3,
     "completetask": 0,
@@ -117,13 +117,13 @@
   {
     "id": 1005,
     "type": 2,
-    "lastend": 1004,
+    "lasttask": 1004,
-    "rdtaks_num": [
+    "rdtaksnum": [
       104,
       105
     ],
-    "aftertaks": 1006,
+    "aftertask": 1006,
-    "icetime": 0,
+    "taskcd": 0,
     "tag": 1,
     "story": 3,
     "completetask": 0,
@@ -144,12 +144,12 @@
   {
     "id": 1006,
     "type": 2,
-    "lastend": 1005,
+    "lasttask": 1005,
-    "rdtaks_num": [
+    "rdtaksnum": [
       106
     ],
-    "aftertaks": 0,
+    "aftertask": 0,
-    "icetime": 0,
+    "taskcd": 0,
     "tag": 1,
     "story": 3,
     "completetask": 0,
@@ -173,12 +173,12 @@
   {
     "id": 1007,
     "type": 1,
-    "lastend": 0,
+    "lasttask": 0,
-    "rdtaks_num": [
+    "rdtaksnum": [
       107
     ],
-    "aftertaks": 1002,
+    "aftertask": 1002,
-    "icetime": 1,
+    "taskcd": 1,
     "tag": 1,
     "story": 3,
     "completetask": 0,
@@ -199,12 +199,12 @@
   {
     "id": 1008,
     "type": 1,
-    "lastend": 0,
+    "lasttask": 0,
-    "rdtaks_num": [
+    "rdtaksnum": [
       108
     ],
-    "aftertaks": 1002,
+    "aftertask": 1002,
-    "icetime": -1,
+    "taskcd": -1,
     "tag": 1,
     "story": 3,
     "completetask": 0,

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
     ]

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

cmd/v2/model/gen.go

@@ -1,10 +1,12 @@
 package model
 
 type GenTool struct {
-	ClientDir string
+	ServerAddr    string //服务地址
-	InputDir  string
+	ProjectDir    string //项目目录
-	OutputDir string
+	Client        string //Client 文件路径
-	GenType   int32
+	WorkDir       string //工作目录
-
+	InputDir      string //输入目录
-	
+	OutputCodeDir string //输出Code目录
+	OutputJsonDir string //输出json目录
+	GenType       int32  //生成类型
 }

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
 }

sys/configure/structs/game.rdtaskAllData.go

@@ -13,10 +13,10 @@ import "errors"
 type GameRdtaskAllData struct {
     Id int32
     Type int32
-    Lastend int32
+    Lasttask int32
-    RdtaksNum []int32
+    Rdtaksnum []int32
-    Aftertaks int32
+    Aftertask int32
-    Icetime 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["aftertask"].(float64); !_ok_ { err = errors.New("aftertask error"); return }; _v.Aftertask = 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["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_) }

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

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

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_) }