移出不必要的配置

bin/json/game_breakingbad.json

@@ -1,6 +1,6 @@
 [
   {
-    "delicacies": "132000",
+    "delicacies": "14020000",
     "recipe": [],
     "Type": -1,
     "flame": 1,
@@ -11,14 +11,14 @@
     }
   },
   {
-    "delicacies": "132001",
+    "delicacies": "14020001",
     "recipe": [
       {
-        "a": "131005",
+        "a": "14010005",
         "n": 10
       },
       {
-        "a": "131004",
+        "a": "14010004",
         "n": 10
       }
     ],
@@ -31,14 +31,14 @@
     }
   },
   {
-    "delicacies": "132002",
+    "delicacies": "14020002",
     "recipe": [
       {
-        "a": "131001",
+        "a": "14010001",
         "n": 10
       },
       {
-        "a": "131005",
+        "a": "14010005",
         "n": 5
       }
     ],
@@ -51,14 +51,14 @@
     }
   },
   {
-    "delicacies": "132003",
+    "delicacies": "14020003",
     "recipe": [
       {
-        "a": "131003",
+        "a": "14010003",
         "n": 10
       },
       {
-        "a": "131005",
+        "a": "14010005",
         "n": 5
       }
     ],
@@ -71,10 +71,10 @@
     }
   },
   {
-    "delicacies": "132004",
+    "delicacies": "14020004",
     "recipe": [
       {
-        "a": "131003",
+        "a": "14010003",
         "n": 20
       }
     ],
@@ -87,10 +87,10 @@
     }
   },
   {
-    "delicacies": "132005",
+    "delicacies": "14020005",
     "recipe": [
       {
-        "a": "131004",
+        "a": "14010004",
         "n": 20
       }
     ],
@@ -103,18 +103,18 @@
     }
   },
   {
-    "delicacies": "132006",
+    "delicacies": "14020006",
     "recipe": [
       {
-        "a": "131005",
+        "a": "14010005",
         "n": 10
       },
       {
-        "a": "131004",
+        "a": "14010004",
         "n": 10
       },
       {
-        "a": "131002",
+        "a": "14010002",
         "n": 5
       }
     ],
@@ -127,10 +127,10 @@
     }
   },
   {
-    "delicacies": "132007",
+    "delicacies": "14020007",
     "recipe": [
       {
-        "a": "131005",
+        "a": "14010005",
         "n": 20
       }
     ],
@@ -143,14 +143,14 @@
     }
   },
   {
-    "delicacies": "132008",
+    "delicacies": "14020008",
     "recipe": [
       {
-        "a": "131002",
+        "a": "14010002",
         "n": 10
       },
       {
-        "a": "131005",
+        "a": "14010005",
         "n": 10
       }
     ],
@@ -163,10 +163,10 @@
     }
   },
   {
-    "delicacies": "132009",
+    "delicacies": "14020009",
     "recipe": [
       {
-        "a": "131001",
+        "a": "14010001",
         "n": 20
       }
     ],

bin/json/game_caravanevent.json

@@ -6,9 +6,9 @@
     "citystory": 101,
     "citynormal": 102,
     "cityabnormal": 103,
-    "worldtask": 210,
+    "worldtask": 90010,
     "traintips": {
-      "key": "asdsad",
+      "key": "caravan_caravan_event_traintips_1",
       "text": "列车上来了外人，这个人看上去有很急切的事情，我们必须先解决这个再离开这里。"
     },
     "trainstory": 888,
@@ -24,10 +24,7 @@
     "exreword": [
       10001
     ],
-    "unreword": [
+    "unreword": [],
-      1,
-      40
-    ],
     "eventtime": 500
   }
 ]

bin/json/game_item.json

@@ -4270,7 +4270,7 @@
     "box_id": 0,
     "synthetize_num": 0,
     "access": [
-      123
+      10005
     ],
     "use_skip": 155,
     "upper_limit": 999,

bin/json/game_navigation.json

@@ -72,7 +72,7 @@
     "mainscreen": ""
   },
   {
-    "Id": 6,
+    "Id": 5,
     "scene": "GameMain",
     "scenename": {
       "key": "navigation_Sheet1_scenename_5",
@@ -90,7 +90,7 @@
     "mainscreen": ""
   },
   {
-    "Id": 7,
+    "Id": 6,
     "scene": "GameMain",
     "scenename": {
       "key": "navigation_Sheet1_scenename_6",
@@ -108,7 +108,7 @@
     "mainscreen": ""
   },
   {
-    "Id": 8,
+    "Id": 7,
     "scene": "GameMain",
     "scenename": {
       "key": "navigation_Sheet1_scenename_7",
@@ -126,7 +126,7 @@
     "mainscreen": ""
   },
   {
-    "Id": 9,
+    "Id": 8,
     "scene": "GameMain",
     "scenename": {
       "key": "navigation_Sheet1_scenename_8",
@@ -144,6 +144,24 @@
     "functionicon": "ty_qp_gh",
     "mainscreen": ""
   },
+  {
+    "Id": 9,
+    "scene": "GameMain",
+    "scenename": {
+      "key": "navigation_Sheet1_scenename_19",
+      "text": "中轴城"
+    },
+    "sceneicon": "ty_qp_my01",
+    "functionname": {
+      "key": "navigation_Sheet1_functionname_19",
+      "text": "维京远征"
+    },
+    "npcName": [
+      "功能入口-维京远征"
+    ],
+    "functionicon": "ty_qp_yz",
+    "mainscreen": ""
+  },
   {
     "Id": 10,
     "scene": "SmithyScene",

bin/json/game_rdtasknpc.json

@@ -60,7 +60,7 @@
     "heroid": 44004,
     "datas": [
       "CommandScene",
-      "主线入口_原石",
+      "20010_骇客蛛_1",
       "905"
     ],
     "event": [

bin/json/game_skillafteratk.json

@@ -22506,15 +22506,15 @@
   {
     "Id": 200004001,
     "EmitPR": 1000,
-    "From": 3,
+    "From": 1,
     "Where": [],
     "Order": "",
     "Limit": 10,
     "ExecuteCnt": 1,
     "Type": 5,
     "Argu": [
-      1,
+      2,
-      1,
+      2,
       200
     ],
     "FollowSK": [],

sys/configure/structs/Tables.go

@@ -61,7 +61,6 @@ type Tables struct {
     PagodaTaskReward *GamePagodaTaskReward
     RdtaskCondi *GameRdtaskCondi
     RdtaskNpc *GameRdtaskNpc
-    Gourmet *GameGourmet
     Drop *GameDrop
     VikingBoss *GameVikingBoss
     VikingLineup *GameVikingLineup
@@ -494,12 +493,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.RdtaskNpc, err = NewGameRdtaskNpc(buf) ; err != nil {
         return nil, err
     }
-    if buf, err = loader("game_gourmet") ; err != nil {
-        return nil, err
-    }
-    if tables.Gourmet, err = NewGameGourmet(buf) ; err != nil {
-        return nil, err
-    }
     if buf, err = loader("game_drop") ; err != nil {
         return nil, err
     }

sys/configure/structs/game.Gourmet.go

@@ -1,34 +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 GameGourmet struct {
-    _dataList []*GameGourmetData
-}
-
-func NewGameGourmet(_buf []map[string]interface{}) (*GameGourmet, error) {
-	_dataList := make([]*GameGourmetData, 0, len(_buf))
-	for _, _ele_ := range _buf {
-		if _v, err2 := DeserializeGameGourmetData(_ele_); err2 != nil {
-			return nil, err2
-		} else {
-			_dataList = append(_dataList, _v)
-		}
-	}
-	return &GameGourmet{_dataList:_dataList}, nil
-}
-
-func (table *GameGourmet) GetDataList() []*GameGourmetData {
-    return table._dataList
-}
-
-func (table *GameGourmet) Get(index int) *GameGourmetData {
-    return table._dataList[index]
-}
-

sys/configure/structs/game.GourmetData.go

@@ -1,114 +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 GameGourmetData struct {
-    Id int32
-    Type int32
-    SkillType int32
-    Initial int32
-    Level int32
-    ColourLevelAffix string
-    Name string
-    Needtime int32
-    Display int32
-    Probability int32
-    DeliciousIcon string
-    SkillIcon string
-    Item []*Gameatn
-    ItemColourAffix1 string
-    ItemColourAffix2 string
-    ItemColourAffix3 string
-    DeliciousConsume []*Gameatn
-    SkillConsume []*Gameatn
-    Using int32
-    Propsgroup int32
-    SkillDescription string
-}
-
-const TypeId_GameGourmetData = -1202061691
-
-func (*GameGourmetData) GetTypeId() int32 {
-    return -1202061691
-}
-
-func (_v *GameGourmetData)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["skill_type"].(float64); !_ok_ { err = errors.New("skill_type error"); return }; _v.SkillType = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["initial"].(float64); !_ok_ { err = errors.New("initial error"); return }; _v.Initial = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) }
-    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["colour_level_affix"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ColourLevelAffix error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ColourLevelAffix, _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["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 _tempNum_ float64; if _tempNum_, _ok_ = _buf["needtime"].(float64); !_ok_ { err = errors.New("needtime error"); return }; _v.Needtime = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["display"].(float64); !_ok_ { err = errors.New("display error"); return }; _v.Display = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["probability"].(float64); !_ok_ { err = errors.New("probability error"); return }; _v.Probability = int32(_tempNum_) }
-    { var _ok_ bool; if _v.DeliciousIcon, _ok_ = _buf["delicious_icon"].(string); !_ok_ { err = errors.New("delicious_icon error"); return } }
-    { var _ok_ bool; if _v.SkillIcon, _ok_ = _buf["skill_icon"].(string); !_ok_ { err = errors.New("skill_icon error"); return } }
-     {
-                var _arr_ []interface{}
-                var _ok_ bool
-                if _arr_, _ok_ = _buf["item"].([]interface{}); !_ok_ { err = errors.New("item error"); return }
-
-                _v.Item = 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.Item = append(_v.Item, _list_v_)
-                }
-            }
-
-    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["item_colour_affix1"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ItemColourAffix1 error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ItemColourAffix1, _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["item_colour_affix2"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ItemColourAffix2 error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ItemColourAffix2, _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["item_colour_affix3"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ItemColourAffix3 error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ItemColourAffix3, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
-     {
-                var _arr_ []interface{}
-                var _ok_ bool
-                if _arr_, _ok_ = _buf["delicious_consume"].([]interface{}); !_ok_ { err = errors.New("delicious_consume error"); return }
-
-                _v.DeliciousConsume = 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.DeliciousConsume = append(_v.DeliciousConsume, _list_v_)
-                }
-            }
-
-     {
-                var _arr_ []interface{}
-                var _ok_ bool
-                if _arr_, _ok_ = _buf["skill_consume"].([]interface{}); !_ok_ { err = errors.New("skill_consume error"); return }
-
-                _v.SkillConsume = 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.SkillConsume = append(_v.SkillConsume, _list_v_)
-                }
-            }
-
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["using"].(float64); !_ok_ { err = errors.New("using error"); return }; _v.Using = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["propsgroup"].(float64); !_ok_ { err = errors.New("propsgroup error"); return }; _v.Propsgroup = int32(_tempNum_) }
-    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["skill_description"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.SkillDescription error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.SkillDescription, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
-    return
-}
-
-func DeserializeGameGourmetData(_buf map[string]interface{}) (*GameGourmetData, error) {
-    v := &GameGourmetData{}
-    if err := v.Deserialize(_buf); err == nil {
-        return v, nil
-    } else {
-        return nil, err
-    }
-}