diff --git a/bin/json/game_rdtaskbattle.json b/bin/json/game_rdtaskbattle.json
new file mode 100644
index 000000000..7127fc1fb
--- /dev/null
+++ b/bin/json/game_rdtaskbattle.json
@@ -0,0 +1,950 @@
+[
+ {
+ "id": 101,
+ "FormatList": [
+ 101011
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 102,
+ "FormatList": [
+ 101021
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 103,
+ "FormatList": [
+ 101031,
+ 101032
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 104,
+ "FormatList": [
+ 101041,
+ 101042
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 105,
+ "FormatList": [
+ 101051,
+ 101052
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 106,
+ "FormatList": [
+ 101061,
+ 101062
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 107,
+ "FormatList": [
+ 101071,
+ 101072
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 108,
+ "FormatList": [
+ 101081,
+ 101082
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 109,
+ "FormatList": [
+ 101091,
+ 101092
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 110,
+ "FormatList": [
+ 101101,
+ 101102,
+ 101103
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 201,
+ "FormatList": [
+ 102011
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 202,
+ "FormatList": [
+ 102021
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 203,
+ "FormatList": [
+ 102031,
+ 102032
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 204,
+ "FormatList": [
+ 102041,
+ 102042
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 205,
+ "FormatList": [
+ 102051,
+ 102052
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 206,
+ "FormatList": [
+ 102061,
+ 102062
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 207,
+ "FormatList": [
+ 102071,
+ 102072
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 208,
+ "FormatList": [
+ 102081,
+ 102082
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 209,
+ "FormatList": [
+ 102091,
+ 102092
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 210,
+ "FormatList": [
+ 102101,
+ 102102,
+ 102103
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 301,
+ "FormatList": [
+ 103011
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 302,
+ "FormatList": [
+ 103021
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 303,
+ "FormatList": [
+ 103031,
+ 103032
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 304,
+ "FormatList": [
+ 103041,
+ 103042
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 305,
+ "FormatList": [
+ 103051,
+ 103052
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 306,
+ "FormatList": [
+ 103061,
+ 103062
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 307,
+ "FormatList": [
+ 103071,
+ 103072
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 308,
+ "FormatList": [
+ 103081,
+ 103082
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 309,
+ "FormatList": [
+ 103091,
+ 103092
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 310,
+ "FormatList": [
+ 103101,
+ 103102,
+ 103103
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 401,
+ "FormatList": [
+ 104011
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 402,
+ "FormatList": [
+ 104021
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 403,
+ "FormatList": [
+ 104031,
+ 104032
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 404,
+ "FormatList": [
+ 104041,
+ 104042
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 405,
+ "FormatList": [
+ 104051,
+ 104052
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 406,
+ "FormatList": [
+ 104061,
+ 104062
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 407,
+ "FormatList": [
+ 104071,
+ 104072
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 408,
+ "FormatList": [
+ 104081,
+ 104082
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 409,
+ "FormatList": [
+ 104091,
+ 104092
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 410,
+ "FormatList": [
+ 104101,
+ 104102,
+ 104103
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 501,
+ "FormatList": [
+ 105011
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 502,
+ "FormatList": [
+ 105021
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 503,
+ "FormatList": [
+ 105031,
+ 105032
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 504,
+ "FormatList": [
+ 105041,
+ 105042
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 505,
+ "FormatList": [
+ 105051,
+ 105052
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 506,
+ "FormatList": [
+ 105061,
+ 105062
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 507,
+ "FormatList": [
+ 105071,
+ 105072
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 508,
+ "FormatList": [
+ 105081,
+ 105082
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 509,
+ "FormatList": [
+ 105091,
+ 105092
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 510,
+ "FormatList": [
+ 105101,
+ 105102,
+ 105103
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 601,
+ "FormatList": [
+ 106011
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 602,
+ "FormatList": [
+ 106021
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 603,
+ "FormatList": [
+ 106031,
+ 106032
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 604,
+ "FormatList": [
+ 106041,
+ 106042
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 605,
+ "FormatList": [
+ 106051,
+ 106052
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 606,
+ "FormatList": [
+ 106061,
+ 106062
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 607,
+ "FormatList": [
+ 106071,
+ 106072
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 608,
+ "FormatList": [
+ 106081,
+ 106082
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 609,
+ "FormatList": [
+ 106091,
+ 106092
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 610,
+ "FormatList": [
+ 106101,
+ 106102,
+ 106103
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 701,
+ "FormatList": [
+ 107011
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 702,
+ "FormatList": [
+ 107021
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 703,
+ "FormatList": [
+ 107031,
+ 107032
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 704,
+ "FormatList": [
+ 107041,
+ 107042
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 705,
+ "FormatList": [
+ 107051,
+ 107052
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 706,
+ "FormatList": [
+ 107061,
+ 107062
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 707,
+ "FormatList": [
+ 107071,
+ 107072
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 708,
+ "FormatList": [
+ 107081,
+ 107082
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 709,
+ "FormatList": [
+ 107091,
+ 107092
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 710,
+ "FormatList": [
+ 107101,
+ 107102,
+ 107103
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 801,
+ "FormatList": [
+ 108011
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 802,
+ "FormatList": [
+ 108021
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 803,
+ "FormatList": [
+ 108031,
+ 108032
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 804,
+ "FormatList": [
+ 108041,
+ 108042
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 805,
+ "FormatList": [
+ 108051,
+ 108052
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 806,
+ "FormatList": [
+ 108061,
+ 108062
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 807,
+ "FormatList": [
+ 108071,
+ 108072
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 808,
+ "FormatList": [
+ 108081,
+ 108082
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 809,
+ "FormatList": [
+ 108091,
+ 108092
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 810,
+ "FormatList": [
+ 108101,
+ 108102,
+ 108103
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 901,
+ "FormatList": [
+ 109011
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 902,
+ "FormatList": [
+ 109021
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 903,
+ "FormatList": [
+ 109031,
+ 109032
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 904,
+ "FormatList": [
+ 109041,
+ 109042
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 905,
+ "FormatList": [
+ 109051,
+ 109052
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 906,
+ "FormatList": [
+ 109061,
+ 109062
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 907,
+ "FormatList": [
+ 109071,
+ 109072
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 908,
+ "FormatList": [
+ 109081,
+ 109082
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 909,
+ "FormatList": [
+ 109091,
+ 109092
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 910,
+ "FormatList": [
+ 109101,
+ 109102,
+ 109103
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1001,
+ "FormatList": [
+ 110011
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1002,
+ "FormatList": [
+ 110021
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1003,
+ "FormatList": [
+ 110031,
+ 110032
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1004,
+ "FormatList": [
+ 110041,
+ 110042
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1005,
+ "FormatList": [
+ 110051,
+ 110052
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1006,
+ "FormatList": [
+ 110061,
+ 110062
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1007,
+ "FormatList": [
+ 110071,
+ 110072
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1008,
+ "FormatList": [
+ 110081,
+ 110082
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1009,
+ "FormatList": [
+ 110091,
+ 110092
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1010,
+ "FormatList": [
+ 110101,
+ 110102,
+ 110103
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1101,
+ "FormatList": [
+ 111011
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1102,
+ "FormatList": [
+ 111021
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1103,
+ "FormatList": [
+ 111031,
+ 111032
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1104,
+ "FormatList": [
+ 111041,
+ 111042
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1105,
+ "FormatList": [
+ 111051,
+ 111052
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1106,
+ "FormatList": [
+ 111061,
+ 111062
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1107,
+ "FormatList": [
+ 111071,
+ 111072
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1108,
+ "FormatList": [
+ 111081,
+ 111082
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1109,
+ "FormatList": [
+ 111091,
+ 111092
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1110,
+ "FormatList": [
+ 111101,
+ 111102,
+ 111103
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1201,
+ "FormatList": [
+ 112011
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1202,
+ "FormatList": [
+ 112021
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1203,
+ "FormatList": [
+ 112031,
+ 112032
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1204,
+ "FormatList": [
+ 112041,
+ 112042
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1205,
+ "FormatList": [
+ 112051,
+ 112052
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1206,
+ "FormatList": [
+ 112061,
+ 112062
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1207,
+ "FormatList": [
+ 112071,
+ 112072
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1208,
+ "FormatList": [
+ 112081,
+ 112082
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1209,
+ "FormatList": [
+ 112091,
+ 112092
+ ],
+ "captainId": "250011"
+ },
+ {
+ "id": 1210,
+ "FormatList": [
+ 112101,
+ 112102,
+ 112103
+ ],
+ "captainId": "250011"
+ }
+]
\ No newline at end of file
diff --git a/sys/configure/structs/Game.RdtaskBattle.go b/sys/configure/structs/Game.RdtaskBattle.go
new file mode 100644
index 000000000..71c7b48ea
--- /dev/null
+++ b/sys/configure/structs/Game.RdtaskBattle.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameRdtaskBattle struct {
+ _dataMap map[int32]*GameRdtaskBattleData
+ _dataList []*GameRdtaskBattleData
+}
+
+func NewGameRdtaskBattle(_buf []map[string]interface{}) (*GameRdtaskBattle, error) {
+ _dataList := make([]*GameRdtaskBattleData, 0, len(_buf))
+ dataMap := make(map[int32]*GameRdtaskBattleData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameRdtaskBattleData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameRdtaskBattle{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameRdtaskBattle) GetDataMap() map[int32]*GameRdtaskBattleData {
+ return table._dataMap
+}
+
+func (table *GameRdtaskBattle) GetDataList() []*GameRdtaskBattleData {
+ return table._dataList
+}
+
+func (table *GameRdtaskBattle) Get(key int32) *GameRdtaskBattleData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.RdtaskBattleData.go b/sys/configure/structs/Game.RdtaskBattleData.go
new file mode 100644
index 000000000..4cc7ca49d
--- /dev/null
+++ b/sys/configure/structs/Game.RdtaskBattleData.go
@@ -0,0 +1,52 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameRdtaskBattleData struct {
+ Id int32
+ FormatList []int32
+ CaptainId string
+}
+
+const TypeId_GameRdtaskBattleData = -1802967787
+
+func (*GameRdtaskBattleData) GetTypeId() int32 {
+ return -1802967787
+}
+
+func (_v *GameRdtaskBattleData)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 _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["FormatList"].([]interface{}); !_ok_ { err = errors.New("FormatList error"); return }
+
+ _v.FormatList = 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.FormatList = append(_v.FormatList, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; if _v.CaptainId, _ok_ = _buf["captainId"].(string); !_ok_ { err = errors.New("captainId error"); return } }
+ return
+}
+
+func DeserializeGameRdtaskBattleData(_buf map[string]interface{}) (*GameRdtaskBattleData, error) {
+ v := &GameRdtaskBattleData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index 554c22811..a5e244654 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -69,6 +69,7 @@ type Tables struct {
RdtaskCondi *GameRdtaskCondi
RdtaskChoose *GameRdtaskChoose
RdtaskSide *GameRdtaskSide
+ RdtaskBattle *GameRdtaskBattle
KungfuUnlock *GameKungfuUnlock
KungfuMasterworker *GameKungfuMasterworker
Gourmet *GameGourmet
@@ -452,6 +453,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.RdtaskSide, err = NewGameRdtaskSide(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_rdtaskbattle") ; err != nil {
+ return nil, err
+ }
+ if tables.RdtaskBattle, err = NewGameRdtaskBattle(buf) ; err != nil {
+ return nil, err
+ }
if buf, err = loader("game_kungfuunlock") ; err != nil {
return nil, err
}
@@ -620,5 +627,8 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.Robot, err = NewGameRobot(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_jumpview") ; err != nil {
+ return nil, err
+ }
return tables, nil
}