秘境同步

bin/json/game_heroupstorychapter.json

@@ -1,23 +1,15 @@
 [
   {
     "key": 1,
-    "hero": 25001,
-    "chaptername": {
-      "key": "heroupstory_heroupstory_chapter_chaptername_01",
-      "text": "第一章：武斗大会"
-    },
-    "chapter": 2500101,
     "onlevel": 0,
+    "chapter": 2500101,
     "onlevelstory": [],
     "point": {
-      "x": 2,
+      "x": 0,
       "y": 1
     },
     "level": 101,
-    "levellink": [
+    "levellink": [],
-      2,
-      3
-    ],
     "leveltype": 1,
     "startstory": 10254,
     "battle": 0,
@@ -39,20 +31,17 @@
   },
   {
     "key": 2,
-    "hero": 25001,
-    "chaptername": {
-      "key": "",
-      "text": ""
-    },
-    "chapter": 2500101,
     "onlevel": 1,
+    "chapter": 2500101,
     "onlevelstory": [],
     "point": {
-      "x": 2,
+      "x": 1,
       "y": 2
     },
     "level": 102,
-    "levellink": [],
+    "levellink": [
+      1
+    ],
     "leveltype": 2,
     "startstory": 10254,
     "battle": 101,
@@ -74,21 +63,16 @@
   },
   {
     "key": 3,
-    "hero": 25001,
-    "chaptername": {
-      "key": "",
-      "text": ""
-    },
-    "chapter": 2500101,
     "onlevel": 1,
+    "chapter": 2500101,
     "onlevelstory": [],
     "point": {
       "x": 1,
-      "y": 2
+      "y": 0
     },
     "level": 103,
     "levellink": [
-      4
+      1
     ],
     "leveltype": 3,
     "startstory": 0,
@@ -111,21 +95,17 @@
   },
   {
     "key": 4,
-    "hero": 25001,
-    "chaptername": {
-      "key": "",
-      "text": ""
-    },
-    "chapter": 2500101,
     "onlevel": 3,
+    "chapter": 2500101,
     "onlevelstory": [],
     "point": {
       "x": 2,
-      "y": 3
+      "y": 1
     },
     "level": 104,
     "levellink": [
-      5
+      2,
+      3
     ],
     "leveltype": 4,
     "startstory": 0,
@@ -142,20 +122,17 @@
   },
   {
     "key": 5,
-    "hero": 25001,
-    "chaptername": {
-      "key": "",
-      "text": ""
-    },
-    "chapter": 2500101,
     "onlevel": 4,
+    "chapter": 2500101,
     "onlevelstory": [],
     "point": {
       "x": 3,
-      "y": 4
+      "y": 1
     },
     "level": 105,
-    "levellink": [],
+    "levellink": [
+      4
+    ],
     "leveltype": 5,
     "startstory": 10254,
     "battle": 101,
@@ -177,23 +154,15 @@
   },
   {
     "key": 6,
-    "hero": 25001,
-    "chaptername": {
-      "key": "heroupstory_heroupstory_chapter_chaptername_06",
-      "text": "第二章：武侠汇聚"
-    },
-    "chapter": 2500102,
     "onlevel": 4,
+    "chapter": 2500102,
     "onlevelstory": [],
     "point": {
-      "x": 2,
+      "x": 0,
       "y": 1
     },
     "level": 101,
-    "levellink": [
+    "levellink": [],
-      7,
-      8
-    ],
     "leveltype": 1,
     "startstory": 10254,
     "battle": 0,
@@ -215,20 +184,17 @@
   },
   {
     "key": 7,
-    "hero": 25001,
-    "chaptername": {
-      "key": "",
-      "text": ""
-    },
-    "chapter": 2500102,
     "onlevel": 6,
+    "chapter": 2500102,
     "onlevelstory": [],
     "point": {
-      "x": 2,
+      "x": 1,
       "y": 2
     },
     "level": 102,
-    "levellink": [],
+    "levellink": [
+      1
+    ],
     "leveltype": 2,
     "startstory": 10254,
     "battle": 101,
@@ -250,21 +216,16 @@
   },
   {
     "key": 8,
-    "hero": 25001,
-    "chaptername": {
-      "key": "",
-      "text": ""
-    },
-    "chapter": 2500102,
     "onlevel": 6,
+    "chapter": 2500102,
     "onlevelstory": [],
     "point": {
       "x": 1,
-      "y": 2
+      "y": 0
     },
     "level": 103,
     "levellink": [
-      9
+      1
     ],
     "leveltype": 3,
     "startstory": 0,
@@ -287,21 +248,17 @@
   },
   {
     "key": 9,
-    "hero": 25001,
-    "chaptername": {
-      "key": "",
-      "text": ""
-    },
-    "chapter": 2500102,
     "onlevel": 8,
+    "chapter": 2500102,
     "onlevelstory": [],
     "point": {
       "x": 2,
-      "y": 3
+      "y": 1
     },
     "level": 104,
     "levellink": [
-      10
+      2,
+      3
     ],
     "leveltype": 4,
     "startstory": 0,
@@ -318,20 +275,17 @@
   },
   {
     "key": 10,
-    "hero": 25001,
-    "chaptername": {
-      "key": "",
-      "text": ""
-    },
-    "chapter": 2500102,
     "onlevel": 7,
+    "chapter": 2500102,
     "onlevelstory": [],
     "point": {
       "x": 3,
-      "y": 4
+      "y": 1
     },
     "level": 105,
-    "levellink": [],
+    "levellink": [
+      4
+    ],
     "leveltype": 5,
     "startstory": 10254,
     "battle": 0,
@@ -353,23 +307,15 @@
   },
   {
     "key": 11,
-    "hero": 25001,
-    "chaptername": {
-      "key": "heroupstory_heroupstory_chapter_chaptername_11",
-      "text": "第三章：大龙归来"
-    },
-    "chapter": 2500103,
     "onlevel": 9,
+    "chapter": 2500103,
     "onlevelstory": [],
     "point": {
-      "x": 2,
+      "x": 0,
       "y": 1
     },
     "level": 101,
-    "levellink": [
+    "levellink": [],
-      12,
-      13
-    ],
     "leveltype": 1,
     "startstory": 10254,
     "battle": 0,
@@ -391,20 +337,17 @@
   },
   {
     "key": 12,
-    "hero": 25001,
-    "chaptername": {
-      "key": "",
-      "text": ""
-    },
-    "chapter": 2500103,
     "onlevel": 11,
+    "chapter": 2500103,
     "onlevelstory": [],
     "point": {
-      "x": 2,
+      "x": 1,
       "y": 2
     },
     "level": 102,
-    "levellink": [],
+    "levellink": [
+      1
+    ],
     "leveltype": 2,
     "startstory": 10254,
     "battle": 101,
@@ -426,21 +369,16 @@
   },
   {
     "key": 13,
-    "hero": 25001,
-    "chaptername": {
-      "key": "",
-      "text": ""
-    },
-    "chapter": 2500103,
     "onlevel": 11,
+    "chapter": 2500103,
     "onlevelstory": [],
     "point": {
       "x": 1,
-      "y": 2
+      "y": 0
     },
     "level": 103,
     "levellink": [
-      14
+      1
     ],
     "leveltype": 3,
     "startstory": 0,
@@ -463,21 +401,17 @@
   },
   {
     "key": 14,
-    "hero": 25001,
-    "chaptername": {
-      "key": "",
-      "text": ""
-    },
-    "chapter": 2500103,
     "onlevel": 13,
+    "chapter": 2500103,
     "onlevelstory": [],
     "point": {
       "x": 2,
-      "y": 3
+      "y": 1
     },
     "level": 104,
     "levellink": [
-      15
+      2,
+      3
     ],
     "leveltype": 4,
     "startstory": 0,
@@ -494,20 +428,17 @@
   },
   {
     "key": 15,
-    "hero": 25001,
-    "chaptername": {
-      "key": "",
-      "text": ""
-    },
-    "chapter": 2500103,
     "onlevel": 14,
+    "chapter": 2500103,
     "onlevelstory": [],
     "point": {
       "x": 3,
-      "y": 4
+      "y": 1
     },
     "level": 105,
-    "levellink": [],
+    "levellink": [
+      4
+    ],
     "leveltype": 5,
     "startstory": 10254,
     "battle": 0,

bin/json/game_heroupstorychaptertxt.json

@@ -6,7 +6,7 @@
       "key": "heroupstory_heroupstory_chapter_chaptername_01",
       "text": "第一章：武斗大会"
     },
-    "chaptericon": "",
+    "chaptericon": "hd_qihd_img_01",
     "onchapter": 0,
     "chaptertime": 0
   },
@@ -17,7 +17,7 @@
       "key": "heroupstory_heroupstory_chapter_chaptername_06",
       "text": "第二章：武侠汇聚"
     },
-    "chaptericon": "",
+    "chaptericon": "hd_qihd_img_02",
     "onchapter": 2500101,
     "chaptertime": 48
   },
@@ -28,7 +28,7 @@
       "key": "heroupstory_heroupstory_chapter_chaptername_11",
       "text": "第三章：大龙归来"
     },
-    "chaptericon": "",
+    "chaptericon": "hd_qihd_img_03",
     "onchapter": 2500102,
     "chaptertime": 48
   }

bin/json/game_monsterformat.json

@@ -232805,7 +232805,7 @@
     "captainId": 0,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "heroid": -1,
+    "heroid": 35001,
     "star": 3,
     "equip": [],
     "newskill": [],
@@ -232865,7 +232865,7 @@
     "captainId": 1,
     "IsBoss": 0,
     "bossHpCnt": 0,
-    "heroid": 35001,
+    "heroid": -1,
     "star": 3,
     "equip": [],
     "newskill": [],

bin/json/game_stoneroom.json

@@ -27,9 +27,9 @@
     "PortalName": "portal_1",
     "EventrewardGroup": 16010100,
     "EventBattleGroup": 14110100,
-    "EventStoryNpcGroup": 0,
+    "EventStoryNpcGroup": 12100000,
-    "EventTreasureGroup": 0,
+    "EventTreasureGroup": 10000001,
-    "EventStoreGroup": 0,
+    "EventStoreGroup": 11000000,
     "BossEvent": 0,
     "Condition": [
       14

modules/tools/comp_configure.go

@@ -89,6 +89,7 @@ func (this *MCompConfigure) Init(service core.IService, module core.IModule, com
 	this.SNum = make(map[int64]int32, 0)
 	configure.RegisterConfigure(game_lottery, cfg.NewGameLottery, this.LoadGroupData)
 
+	this.GetGroupDataByLottery(30020, 0, 1)
 	return
 }
 

sys/configure/structs/Game.BuffType.go

@@ -91,4 +91,13 @@ const (
     GameBuffType_BE_DMG_ADD_ONCE_PER_PERSON = 98
     GameBuffType_IGNORE_EFFECT_RESIST = 99
     GameBuffType_IGNORE_IMMUNITY = 100
+    GameBuffType_NO_SELF_TURN_ADD_DMG = 101
+    GameBuffType_COMPARE_PRO_LOW_ADD_DMG = 102
+    GameBuffType_PROPERTY_HIGH_ADD_DMG = 103
+    GameBuffType_UNABLE_CRIT = 104
+    GameBuffType_COMPARE_PRO_LOW_ADD_PROB = 105
+    GameBuffType_COMPARE_PRO_HIGH_ADD_PROB = 106
+    GameBuffType_ADJUST_PRO_BY_ALIVE_NUM = 107
+    GameBuffType_ADJUST_PRO_BY_BUFF_NUM = 108
+    GameBuffType_LOST_SHIELD_EXTRA_DMG = 109
 )

sys/configure/structs/Game.FightEventType.go

@@ -42,4 +42,5 @@ const (
     GameFightEventType_OnRebirthEnd = 30
     GameFightEventType_OnShiftBuffEnd = 31
     GameFightEventType_OnAddShieldEnd = 32
+    GameFightEventType_OnBuffEnd = 33
 )

sys/configure/structs/Game.HeroupstoryChapterData.go

@@ -13,10 +13,8 @@ import "bright/serialization"
 
 type GameHeroupstoryChapterData struct {
     Key int32
-    Hero int32
-    Chaptername string
-    Chapter int32
     Onlevel int32
+    Chapter int32
     Onlevelstory []int32
     Point serialization.Vector2
     Level int32
@@ -40,10 +38,8 @@ func (*GameHeroupstoryChapterData) GetTypeId() int32 {
 
 func (_v *GameHeroupstoryChapterData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = 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 _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["chaptername"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Chaptername error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Chaptername, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["chapter"].(float64); !_ok_ { err = errors.New("chapter error"); return }; _v.Chapter = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["onlevel"].(float64); !_ok_ { err = errors.New("onlevel error"); return }; _v.Onlevel = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["chapter"].(float64); !_ok_ { err = errors.New("chapter error"); return }; _v.Chapter = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
                 var _ok_ bool

sys/configure/structs/Game.StonePrivilege.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 GameStonePrivilege struct {
+    _dataMap map[int32]*GameStonePrivilegeData
+    _dataList []*GameStonePrivilegeData
+}
+
+func NewGameStonePrivilege(_buf []map[string]interface{}) (*GameStonePrivilege, error) {
+	_dataList := make([]*GameStonePrivilegeData, 0, len(_buf))
+	dataMap := make(map[int32]*GameStonePrivilegeData)
+	for _, _ele_ := range _buf {
+		if _v, err2 := DeserializeGameStonePrivilegeData(_ele_); err2 != nil {
+			return nil, err2
+		} else {
+			_dataList = append(_dataList, _v)
+			dataMap[_v.PrivilegeId] = _v
+		}
+	}
+	return &GameStonePrivilege{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameStonePrivilege) GetDataMap() map[int32]*GameStonePrivilegeData {
+    return table._dataMap
+}
+
+func (table *GameStonePrivilege) GetDataList() []*GameStonePrivilegeData {
+    return table._dataList
+}
+
+func (table *GameStonePrivilege) Get(key int32) *GameStonePrivilegeData {
+    return table._dataMap[key]
+}
+
+

sys/configure/structs/Game.StonePrivilegeData.go

@@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+// <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 GameStonePrivilegeData struct {
+    PrivilegeId int32
+    Desc string
+    Value1 int32
+    Value2 int32
+    Value3 int32
+}
+
+const TypeId_GameStonePrivilegeData = -379650798
+
+func (*GameStonePrivilegeData) GetTypeId() int32 {
+    return -379650798
+}
+
+func (_v *GameStonePrivilegeData)Deserialize(_buf map[string]interface{}) (err error) {
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PrivilegeId"].(float64); !_ok_ { err = errors.New("PrivilegeId error"); return }; _v.PrivilegeId = int32(_tempNum_) }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value1"].(float64); !_ok_ { err = errors.New("Value1 error"); return }; _v.Value1 = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value2"].(float64); !_ok_ { err = errors.New("Value2 error"); return }; _v.Value2 = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Value3"].(float64); !_ok_ { err = errors.New("Value3 error"); return }; _v.Value3 = int32(_tempNum_) }
+    return
+}
+
+func DeserializeGameStonePrivilegeData(_buf map[string]interface{}) (*GameStonePrivilegeData, error) {
+    v := &GameStonePrivilegeData{}
+    if err := v.Deserialize(_buf); err == nil {
+        return v, nil
+    } else {
+        return nil, err
+    }
+}

sys/configure/structs/Game.StoneTalentData.go

@@ -14,6 +14,7 @@ type GameStoneTalentData struct {
     Id int32
     NodeType int32
     NodeIcon string
+    ListIndex int32
     Front []int32
     CostItem []*Gameatn
     PrivilegeId int32
@@ -31,6 +32,7 @@ func (_v *GameStoneTalentData)Deserialize(_buf map[string]interface{}) (err erro
     { 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["NodeType"].(float64); !_ok_ { err = errors.New("NodeType error"); return }; _v.NodeType = int32(_tempNum_) }
     { var _ok_ bool; if _v.NodeIcon, _ok_ = _buf["NodeIcon"].(string); !_ok_ { err = errors.New("NodeIcon error"); return } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["listIndex"].(float64); !_ok_ { err = errors.New("listIndex error"); return }; _v.ListIndex = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
                 var _ok_ bool

sys/configure/structs/Tables.go

@@ -220,6 +220,7 @@ type Tables struct {
     StoneWeek *GameStoneWeek
     StoneTalent *GameStoneTalent
     StoneIllustrated *GameStoneIllustrated
+    StonePrivilege *GameStonePrivilege
     GameSummaryTab *GameGameSummaryTab
     GameSummary *GameGameSummary
     CompositeAll *GameCompositeAll
@@ -1506,6 +1507,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.StoneIllustrated, err = NewGameStoneIllustrated(buf) ; err != nil {
         return nil, err
     }
+    if buf, err = loader("game_stoneprivilege") ; err != nil {
+        return nil, err
+    }
+    if tables.StonePrivilege, err = NewGameStonePrivilege(buf) ; err != nil {
+        return nil, err
+    }
     if buf, err = loader("game_gamesummarytab") ; err != nil {
         return nil, err
     }