配置表同步

bin/json/game_coin.json

@@ -50,5 +50,18 @@
     "ico": "",
     "intr": "Currency used to purchase goods",
     "tipstxt": "Insufficient friendship points"
+  },
+  {
+    "key": "palyexp",
+    "name": "palyexp",
+    "color": 3,
+    "effects": "",
+    "access": 0,
+    "star": 2,
+    "race": 0,
+    "img": "wp_icon_0002",
+    "ico": "wp_icon_0002",
+    "intr": "Currency used to purchase goods",
+    "tipstxt": "Lack of experience"
   }
 ]

bin/json/game_global.json

@@ -156,6 +156,7 @@
     "dreamland_fightnum": 30,
     "dreamland_resettime": 0,
     "dreamland_limit": 3600,
+    "dreamland_share_time": 300,
     "dreamland_triggernum": 20,
     "hunting_num": 10,
     "hunting_reset": 1,

bin/json/game_herofusion.json

@@ -0,0 +1,67 @@
+[
+  {
+    "id": 1,
+    "switch": 1,
+    "hero": 14007,
+    "pointhero": [
+      35001,
+      35001,
+      35001,
+      35001
+    ],
+    "awaken": -1,
+    "start": -1
+  },
+  {
+    "id": 2,
+    "switch": 1,
+    "hero": 35001,
+    "pointhero": [
+      25001,
+      25001,
+      25001,
+      25001
+    ],
+    "awaken": -1,
+    "start": -1
+  },
+  {
+    "id": 3,
+    "switch": 1,
+    "hero": 25001,
+    "pointhero": [
+      25004,
+      25004,
+      25004,
+      25004
+    ],
+    "awaken": -1,
+    "start": -1
+  },
+  {
+    "id": 4,
+    "switch": 1,
+    "hero": 25004,
+    "pointhero": [
+      44005,
+      44005,
+      44005,
+      44005
+    ],
+    "awaken": -1,
+    "start": -1
+  },
+  {
+    "id": 5,
+    "switch": 1,
+    "hero": 45003,
+    "pointhero": [
+      44005,
+      44005,
+      44005,
+      44005
+    ],
+    "awaken": -1,
+    "start": -1
+  }
+]

bin/json/game_item.json

@@ -1632,40 +1632,5 @@
       "key": "itemtipstxt_60003",
       "text": "5星套装宝箱不足"
     }
-  },
-  {
-    "id": "70001",
-    "name": {
-      "key": "itemname_70001",
-      "text": "主角经验"
-    },
-    "usetype": 2,
-    "color": 6,
-    "bagtype": 0,
-    "index": 24,
-    "special_type": 0,
-    "time": 0,
-    "effects": "",
-    "box_id": 0,
-    "synthetize_num": 0,
-    "access": [],
-    "use_skip": 0,
-    "upper_limit": -1,
-    "uselv": 0,
-    "isani": 0,
-    "star": 0,
-    "race": 0,
-    "img": "wp_icon_10010",
-    "ico": "wp_icon_10010",
-    "intr": {
-      "key": "itemdesc_70001",
-      "text": "提升玩家经验所需要的道具"
-    },
-    "sale": [],
-    "synthetize_deplete": [],
-    "tipstxt": {
-      "key": "itemtipstxt_70001",
-      "text": "主角经验不足"
-    }
   }
 ]

bin/json/game_libraryfetter.json

@@ -3,20 +3,42 @@
     "id": 1,
     "fid": 101,
     "ftype": 1,
-    "name": "师徒二人",
+    "name": {
+      "key": "fetters_1",
+      "text": "师徒二人"
+    },
     "lv": 1,
     "hid": [
       "25001",
       "35001"
     ],
     "favorlv": 1,
-    "prize": []
+    "prize": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 500
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 50
+      }
+    ],
+    "prize_dsc": {
+      "key": "fetters_1",
+      "text": "师徒二人"
+    },
+    "png": "jiban_img_zu01"
   },
   {
     "id": 2,
     "fid": 101,
     "ftype": 1,
-    "name": "师徒二人",
+    "name": {
+      "key": "fetters_1",
+      "text": "师徒二人"
+    },
     "lv": 2,
     "hid": [
       "25001",
@@ -34,13 +56,21 @@
         "t": "diamond",
         "n": 100
       }
-    ]
+    ],
+    "prize_dsc": {
+      "key": "fetters_1",
+      "text": "师徒二人"
+    },
+    "png": "jiban_img_zu01"
   },
   {
     "id": 3,
     "fid": 101,
     "ftype": 1,
-    "name": "师徒二人",
+    "name": {
+      "key": "fetters_1",
+      "text": "师徒二人"
+    },
     "lv": 3,
     "hid": [
       "25001",
@@ -58,32 +88,59 @@
         "t": "diamond",
         "n": 200
       }
-    ]
+    ],
+    "prize_dsc": {
+      "key": "fetters_1",
+      "text": "师徒二人"
+    },
+    "png": "jiban_img_zu01"
   },
   {
     "id": 4,
     "fid": 102,
     "ftype": 2,
-    "name": "毫不相干",
+    "name": {
+      "key": "fetters_2",
+      "text": "毫不相干"
+    },
     "lv": 1,
     "hid": [
-      "11003",
+      "25001",
-      "11009",
+      "35001",
-      "15004"
+      "11009"
     ],
     "favorlv": 1,
-    "prize": []
+    "prize": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 500
+      },
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 50
+      }
+    ],
+    "prize_dsc": {
+      "key": "fetters_2",
+      "text": "毫不相干"
+    },
+    "png": "jiban_img_zu02"
   },
   {
     "id": 5,
     "fid": 102,
     "ftype": 2,
-    "name": "毫不相干",
+    "name": {
+      "key": "fetters_2",
+      "text": "毫不相干"
+    },
     "lv": 2,
     "hid": [
-      "11003",
+      "25001",
-      "11009",
+      "35001",
-      "15004"
+      "11009"
     ],
     "favorlv": 2,
     "prize": [
@@ -97,18 +154,26 @@
         "t": "diamond",
         "n": 100
       }
-    ]
+    ],
+    "prize_dsc": {
+      "key": "fetters_2",
+      "text": "毫不相干"
+    },
+    "png": "jiban_img_zu02"
   },
   {
     "id": 6,
     "fid": 102,
     "ftype": 2,
-    "name": "毫不相干",
+    "name": {
+      "key": "fetters_2",
+      "text": "毫不相干"
+    },
     "lv": 3,
     "hid": [
-      "11003",
+      "25001",
-      "11009",
+      "35001",
-      "15004"
+      "11009"
     ],
     "favorlv": 3,
     "prize": [
@@ -122,6 +187,11 @@
         "t": "diamond",
         "n": 200
       }
-    ]
+    ],
+    "prize_dsc": {
+      "key": "fetters_2",
+      "text": "毫不相干"
+    },
+    "png": "jiban_img_zu02"
   }
 ]

bin/json/game_libraryhero.json

@@ -96,16 +96,16 @@
     ]
   },
   {
-    "hid": "11009",
+    "hid": "35002",
     "name": {
       "key": "hero_35002",
       "text": "希卡普"
     },
     "star": 4,
     "history": [
-      "110091",
+      "350021",
-      "110092",
+      "350022",
-      "110093"
+      "350023"
     ],
     "favorlv": [
       1,

bin/json/game_libraryhistory.json

@@ -99,7 +99,7 @@
     ]
   },
   {
-    "histroy": "110091",
+    "histroy": "350021",
     "txt": "希卡普很勇敢",
     "prize": [
       {
@@ -110,7 +110,7 @@
     ]
   },
   {
-    "histroy": "110092",
+    "histroy": "350022",
     "txt": "希卡普很善良",
     "prize": [
       {
@@ -121,7 +121,7 @@
     ]
   },
   {
-    "histroy": "110093",
+    "histroy": "350023",
     "txt": "希卡普很帅气",
     "prize": [
       {

bin/json/game_msgdistrib.json

@@ -37,7 +37,7 @@
   },
   {
     "msgid": "moonfantasy",
-    "open": false,
+    "open": true,
     "routrules": "~/worker",
     "describe": "月之秘境"
   }

bin/json/game_playerlv.json

@@ -215,7 +215,7 @@
   },
   {
     "lv": 21,
-    "exp": 25000,
+    "exp": 21000,
     "reward": [
       {
         "a": "attr",

sys/configure/structs/Game.Herofusion.go

@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+// <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[int32]*GameHerofusionData
+    _dataList []*GameHerofusionData
+}
+
+func NewGameHerofusion(_buf []map[string]interface{}) (*GameHerofusion, error) {
+	_dataList := make([]*GameHerofusionData, 0, len(_buf))
+	dataMap := make(map[int32]*GameHerofusionData)
+	for _, _ele_ := range _buf {
+		if _v, err2 := DeserializeGameHerofusionData(_ele_); err2 != nil {
+			return nil, err2
+		} else {
+			_dataList = append(_dataList, _v)
+			dataMap[_v.Id] = _v
+		}
+	}
+	return &GameHerofusion{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameHerofusion) GetDataMap() map[int32]*GameHerofusionData {
+    return table._dataMap
+}
+
+func (table *GameHerofusion) GetDataList() []*GameHerofusionData {
+    return table._dataList
+}
+
+func (table *GameHerofusion) Get(key int32) *GameHerofusionData {
+    return table._dataMap[key]
+}
+
+

sys/configure/structs/Game.HerofusionData.go

@@ -0,0 +1,58 @@
+//------------------------------------------------------------------------------
+// <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 {
+    Id int32
+    Switch int32
+    Hero int32
+    Pointhero []int32
+    Awaken int32
+    Start int32
+}
+
+const TypeId_GameHerofusionData = -689698108
+
+func (*GameHerofusionData) GetTypeId() int32 {
+    return -689698108
+}
+
+func (_v *GameHerofusionData)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["switch"].(float64); !_ok_ { err = errors.New("switch error"); return }; _v.Switch = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hero"].(float64); !_ok_ { err = errors.New("hero error"); return }; _v.Hero = int32(_tempNum_) }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["pointhero"].([]interface{}); !_ok_ { err = errors.New("pointhero error"); return }
+
+                _v.Pointhero = 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.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_) }
+    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
+    }
+}

sys/configure/structs/Game.LibraryFetter.go

@@ -9,34 +9,26 @@
 package cfg
 
 type GameLibraryFetter struct {
-    _dataMap map[int32]*GameLibraryFetterData
     _dataList []*GameLibraryFetterData
 }
 
 func NewGameLibraryFetter(_buf []map[string]interface{}) (*GameLibraryFetter, error) {
 	_dataList := make([]*GameLibraryFetterData, 0, len(_buf))
-	dataMap := make(map[int32]*GameLibraryFetterData)
 	for _, _ele_ := range _buf {
 		if _v, err2 := DeserializeGameLibraryFetterData(_ele_); err2 != nil {
 			return nil, err2
 		} else {
 			_dataList = append(_dataList, _v)
-			dataMap[_v.Id] = _v
 		}
 	}
-	return &GameLibraryFetter{_dataList:_dataList, _dataMap:dataMap}, nil
+	return &GameLibraryFetter{_dataList:_dataList}, nil
-}
-
-func (table *GameLibraryFetter) GetDataMap() map[int32]*GameLibraryFetterData {
-    return table._dataMap
 }
 
 func (table *GameLibraryFetter) GetDataList() []*GameLibraryFetterData {
     return table._dataList
 }
 
-func (table *GameLibraryFetter) Get(key int32) *GameLibraryFetterData {
+func (table *GameLibraryFetter) Get(index int) *GameLibraryFetterData {
-    return table._dataMap[key]
+    return table._dataList[index]
 }
 
-

sys/configure/structs/Game.LibraryFetterData.go

@@ -19,6 +19,8 @@ type GameLibraryFetterData struct {
     Hid []string
     Favorlv int32
     Prize []*Gameatn
+    PrizeDsc string
+    Png string
 }
 
 const TypeId_GameLibraryFetterData = -764317099
@@ -31,7 +33,7 @@ func (_v *GameLibraryFetterData)Deserialize(_buf map[string]interface{}) (err er
     { 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["fid"].(float64); !_ok_ { err = errors.New("fid error"); return }; _v.Fid = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ftype"].(float64); !_ok_ { err = errors.New("ftype error"); return }; _v.Ftype = int32(_tempNum_) }
-    { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name 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["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
@@ -62,6 +64,8 @@ func (_v *GameLibraryFetterData)Deserialize(_buf map[string]interface{}) (err er
                 }
             }
 
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["prize_dsc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.PrizeDsc error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.PrizeDsc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    { var _ok_ bool; if _v.Png, _ok_ = _buf["png"].(string); !_ok_ { err = errors.New("png error"); return } }
     return
 }
 

sys/configure/structs/Tables.go

@@ -79,6 +79,8 @@ type Tables struct {
     VikingBoss *GameVikingBoss
     VikingChallenge *GameVikingChallenge
     DreamlandBoos *GameDreamlandBoos
+    DreamlandChallenge *GameDreamlandChallenge
+    DreamlandTrigger *GameDreamlandTrigger
     HuntingBoss *GameHuntingBoss
     HuntingChallenge *GameHuntingChallenge
     HuntingOpenTime *GameHuntingOpenTime
@@ -104,6 +106,7 @@ type Tables struct {
     SubplotMainTask *GameSubplotMainTask
     SubplotSubTask *GameSubplotSubTask
     Captaintext *GameCaptaintext
+    Herofusion *GameHerofusion
 }
 
 func NewTables(loader JsonLoader) (*Tables, error) {
@@ -519,6 +522,18 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.DreamlandBoos, err = NewGameDreamlandBoos(buf) ; err != nil {
         return nil, err
     }
+    if buf, err = loader("game_dreamlandchallenge") ; err != nil {
+        return nil, err
+    }
+    if tables.DreamlandChallenge, err = NewGameDreamlandChallenge(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_dreamlandtrigger") ; err != nil {
+        return nil, err
+    }
+    if tables.DreamlandTrigger, err = NewGameDreamlandTrigger(buf) ; err != nil {
+        return nil, err
+    }
     if buf, err = loader("game_huntingboss") ; err != nil {
         return nil, err
     }
@@ -669,5 +684,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.Captaintext, err = NewGameCaptaintext(buf) ; err != nil {
         return nil, err
     }
+    if buf, err = loader("game_herofusion") ; err != nil {
+        return nil, err
+    }
+    if tables.Herofusion, err = NewGameHerofusion(buf) ; err != nil {
+        return nil, err
+    }
     return tables, nil
 }

sys/configure/structs/game.globalData.go

@@ -79,6 +79,7 @@ type GameGlobalData struct {
     DreamlandFightnum int32
     DreamlandResettime int32
     DreamlandLimit int32
+    DreamlandShareTime int32
     DreamlandTriggernum int32
     HuntingNum int32
     HuntingReset int32
@@ -226,6 +227,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dreamland_fightnum"].(float64); !_ok_ { err = errors.New("dreamland_fightnum error"); return }; _v.DreamlandFightnum = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dreamland_resettime"].(float64); !_ok_ { err = errors.New("dreamland_resettime error"); return }; _v.DreamlandResettime = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dreamland_limit"].(float64); !_ok_ { err = errors.New("dreamland_limit error"); return }; _v.DreamlandLimit = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dreamland_share_time"].(float64); !_ok_ { err = errors.New("dreamland_share_time error"); return }; _v.DreamlandShareTime = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dreamland_triggernum"].(float64); !_ok_ { err = errors.New("dreamland_triggernum error"); return }; _v.DreamlandTriggernum = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hunting_num"].(float64); !_ok_ { err = errors.New("hunting_num error"); return }; _v.HuntingNum = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hunting_reset"].(float64); !_ok_ { err = errors.New("hunting_reset error"); return }; _v.HuntingReset = int32(_tempNum_) }

sys/configure/structs/game.msgDistrib.go

@@ -9,8 +9,8 @@
 package cfg
 
 type GameMsgdistrib struct {
-	_dataMap  map[string]*GameMsgdistribData
+    _dataMap map[string]*GameMsgdistribData
-	_dataList []*GameMsgdistribData
+    _dataList []*GameMsgdistribData
 }
 
 func NewGameMsgdistrib(_buf []map[string]interface{}) (*GameMsgdistrib, error) {
@@ -24,17 +24,19 @@ func NewGameMsgdistrib(_buf []map[string]interface{}) (*GameMsgdistrib, error) {
 			dataMap[_v.Msgid] = _v
 		}
 	}
-	return &GameMsgdistrib{_dataList: _dataList, _dataMap: dataMap}, nil
+	return &GameMsgdistrib{_dataList:_dataList, _dataMap:dataMap}, nil
 }
 
 func (table *GameMsgdistrib) GetDataMap() map[string]*GameMsgdistribData {
-	return table._dataMap
+    return table._dataMap
 }
 
 func (table *GameMsgdistrib) GetDataList() []*GameMsgdistribData {
-	return table._dataList
+    return table._dataList
 }
 
 func (table *GameMsgdistrib) Get(key string) *GameMsgdistribData {
-	return table._dataMap[key]
+    return table._dataMap[key]
 }
+
+