上传工会远征信息

bin/json/game_arenaactiveking.json

@@ -0,0 +1,82 @@
+[
+  {
+    "lv_id": 1,
+    "place": 300,
+    "name": {
+      "key": "arena_active_king_name_1",
+      "text": "王者一"
+    },
+    "png": "smithy_atk_5",
+    "reward_week": [
+      {
+        "a": "attr",
+        "t": "arenacoin",
+        "n": 23
+      }
+    ]
+  },
+  {
+    "lv_id": 2,
+    "place": 250,
+    "name": {
+      "key": "arena_active_king_name_2",
+      "text": "王者二"
+    },
+    "png": "smithy_atk_5",
+    "reward_week": [
+      {
+        "a": "attr",
+        "t": "arenacoin",
+        "n": 24
+      }
+    ]
+  },
+  {
+    "lv_id": 3,
+    "place": 200,
+    "name": {
+      "key": "arena_active_king_name_3",
+      "text": "王者三"
+    },
+    "png": "smithy_atk_5",
+    "reward_week": [
+      {
+        "a": "attr",
+        "t": "arenacoin",
+        "n": 25
+      }
+    ]
+  },
+  {
+    "lv_id": 4,
+    "place": 100,
+    "name": {
+      "key": "arena_active_king_name_4",
+      "text": "王者四"
+    },
+    "png": "smithy_atk_5",
+    "reward_week": [
+      {
+        "a": "attr",
+        "t": "arenacoin",
+        "n": 26
+      }
+    ]
+  },
+  {
+    "lv_id": 5,
+    "place": 50,
+    "name": {
+      "key": "arena_active_king_name_5",
+      "text": "王者五"
+    },
+    "png": "smithy_atk_5",
+    "reward_week": [
+      {
+        "a": "attr",
+        "t": "arenacoin",
+        "n": 27
+      }
+    ]
+  }
+]

bin/json/game_arenaactivewin.json

@@ -0,0 +1,67 @@
+[
+  {
+    "id": 1,
+    "name": {
+      "key": "arena_active_win_name_01",
+      "text": "3连胜"
+    },
+    "txt": {
+      "a": "attr",
+      "t": "pvpintegral",
+      "n": 3
+    },
+    "winningstreak": 3
+  },
+  {
+    "id": 2,
+    "name": {
+      "key": "arena_active_win_name_02",
+      "text": "5连胜"
+    },
+    "txt": {
+      "a": "attr",
+      "t": "pvpintegral",
+      "n": 4
+    },
+    "winningstreak": 5
+  },
+  {
+    "id": 3,
+    "name": {
+      "key": "arena_active_win_name_03",
+      "text": "8连胜"
+    },
+    "txt": {
+      "a": "attr",
+      "t": "pvpintegral",
+      "n": 5
+    },
+    "winningstreak": 8
+  },
+  {
+    "id": 4,
+    "name": {
+      "key": "arena_active_win_name_04",
+      "text": "10连胜"
+    },
+    "txt": {
+      "a": "attr",
+      "t": "pvpintegral",
+      "n": 6
+    },
+    "winningstreak": 10
+  },
+  {
+    "id": 5,
+    "name": {
+      "key": "arena_active_win_name_05",
+      "text": "20连胜"
+    },
+    "txt": {
+      "a": "attr",
+      "t": "pvpintegral",
+      "n": 7
+    },
+    "winningstreak": 20
+  }
+]

bin/json/game_expeditionboss.json

@@ -9,7 +9,7 @@
     "serial": 1,
     "fighting": 1000,
     "boss_img": 25002,
-    "kill_reward": 1004,
+    "kill_reward": 213,
     "fail_reward": [
       {
         "a": "attr",
@@ -61,7 +61,7 @@
     "serial": 2,
     "fighting": 1200,
     "boss_img": 15001,
-    "kill_reward": 1005,
+    "kill_reward": 214,
     "fail_reward": [
       {
         "a": "attr",
@@ -113,7 +113,7 @@
     "serial": 3,
     "fighting": 1440,
     "boss_img": 15002,
-    "kill_reward": 1006,
+    "kill_reward": 215,
     "fail_reward": [
       {
         "a": "attr",
@@ -165,7 +165,7 @@
     "serial": 4,
     "fighting": 1728,
     "boss_img": 15004,
-    "kill_reward": 1007,
+    "kill_reward": 216,
     "fail_reward": [
       {
         "a": "attr",
@@ -217,7 +217,7 @@
     "serial": 5,
     "fighting": 2073,
     "boss_img": 25003,
-    "kill_reward": 1008,
+    "kill_reward": 217,
     "fail_reward": [
       {
         "a": "attr",
@@ -269,7 +269,7 @@
     "serial": 6,
     "fighting": 2487,
     "boss_img": 35005,
-    "kill_reward": 1009,
+    "kill_reward": 218,
     "fail_reward": [
       {
         "a": "attr",
@@ -321,7 +321,7 @@
     "serial": 7,
     "fighting": 2984,
     "boss_img": 45001,
-    "kill_reward": 1010,
+    "kill_reward": 219,
     "fail_reward": [
       {
         "a": "attr",
@@ -373,7 +373,7 @@
     "serial": 1,
     "fighting": 3580,
     "boss_img": 25002,
-    "kill_reward": 1011,
+    "kill_reward": 213,
     "fail_reward": [
       {
         "a": "attr",
@@ -425,7 +425,7 @@
     "serial": 2,
     "fighting": 4296,
     "boss_img": 15001,
-    "kill_reward": 1012,
+    "kill_reward": 214,
     "fail_reward": [
       {
         "a": "attr",
@@ -477,7 +477,7 @@
     "serial": 3,
     "fighting": 5155,
     "boss_img": 15002,
-    "kill_reward": 1013,
+    "kill_reward": 215,
     "fail_reward": [
       {
         "a": "attr",
@@ -529,7 +529,7 @@
     "serial": 4,
     "fighting": 6186,
     "boss_img": 15004,
-    "kill_reward": 1014,
+    "kill_reward": 216,
     "fail_reward": [
       {
         "a": "attr",
@@ -581,7 +581,7 @@
     "serial": 5,
     "fighting": 7423,
     "boss_img": 25003,
-    "kill_reward": 1015,
+    "kill_reward": 217,
     "fail_reward": [
       {
         "a": "attr",
@@ -633,7 +633,7 @@
     "serial": 6,
     "fighting": 8907,
     "boss_img": 35005,
-    "kill_reward": 1016,
+    "kill_reward": 218,
     "fail_reward": [
       {
         "a": "attr",
@@ -685,7 +685,7 @@
     "serial": 7,
     "fighting": 0,
     "boss_img": 45001,
-    "kill_reward": 1010,
+    "kill_reward": 219,
     "fail_reward": [
       {
         "a": "attr",
@@ -737,7 +737,7 @@
     "serial": 1,
     "fighting": 0,
     "boss_img": 25002,
-    "kill_reward": 1011,
+    "kill_reward": 213,
     "fail_reward": [
       {
         "a": "attr",
@@ -789,7 +789,7 @@
     "serial": 2,
     "fighting": 0,
     "boss_img": 15001,
-    "kill_reward": 1012,
+    "kill_reward": 214,
     "fail_reward": [
       {
         "a": "attr",
@@ -841,7 +841,7 @@
     "serial": 3,
     "fighting": 0,
     "boss_img": 15002,
-    "kill_reward": 1013,
+    "kill_reward": 215,
     "fail_reward": [
       {
         "a": "attr",
@@ -893,7 +893,7 @@
     "serial": 4,
     "fighting": 0,
     "boss_img": 15004,
-    "kill_reward": 1014,
+    "kill_reward": 216,
     "fail_reward": [
       {
         "a": "attr",
@@ -945,7 +945,7 @@
     "serial": 5,
     "fighting": 0,
     "boss_img": 25003,
-    "kill_reward": 1015,
+    "kill_reward": 217,
     "fail_reward": [
       {
         "a": "attr",
@@ -997,7 +997,7 @@
     "serial": 6,
     "fighting": 0,
     "boss_img": 35005,
-    "kill_reward": 1016,
+    "kill_reward": 218,
     "fail_reward": [
       {
         "a": "attr",
@@ -1049,7 +1049,7 @@
     "serial": 7,
     "fighting": 0,
     "boss_img": 45001,
-    "kill_reward": 1010,
+    "kill_reward": 219,
     "fail_reward": [
       {
         "a": "attr",
@@ -1101,7 +1101,7 @@
     "serial": 1,
     "fighting": 0,
     "boss_img": 25002,
-    "kill_reward": 1011,
+    "kill_reward": 213,
     "fail_reward": [
       {
         "a": "attr",
@@ -1153,7 +1153,7 @@
     "serial": 2,
     "fighting": 0,
     "boss_img": 15001,
-    "kill_reward": 1012,
+    "kill_reward": 214,
     "fail_reward": [
       {
         "a": "attr",
@@ -1205,7 +1205,7 @@
     "serial": 3,
     "fighting": 0,
     "boss_img": 15002,
-    "kill_reward": 1013,
+    "kill_reward": 215,
     "fail_reward": [
       {
         "a": "attr",
@@ -1257,7 +1257,7 @@
     "serial": 4,
     "fighting": 0,
     "boss_img": 15004,
-    "kill_reward": 1014,
+    "kill_reward": 216,
     "fail_reward": [
       {
         "a": "attr",
@@ -1309,7 +1309,7 @@
     "serial": 5,
     "fighting": 0,
     "boss_img": 25003,
-    "kill_reward": 1015,
+    "kill_reward": 217,
     "fail_reward": [
       {
         "a": "attr",
@@ -1361,7 +1361,7 @@
     "serial": 6,
     "fighting": 0,
     "boss_img": 35005,
-    "kill_reward": 1016,
+    "kill_reward": 218,
     "fail_reward": [
       {
         "a": "attr",
@@ -1413,7 +1413,7 @@
     "serial": 7,
     "fighting": 0,
     "boss_img": 45001,
-    "kill_reward": 1010,
+    "kill_reward": 219,
     "fail_reward": [
       {
         "a": "attr",
@@ -1465,7 +1465,7 @@
     "serial": 1,
     "fighting": 0,
     "boss_img": 25002,
-    "kill_reward": 1011,
+    "kill_reward": 213,
     "fail_reward": [
       {
         "a": "attr",
@@ -1517,7 +1517,7 @@
     "serial": 2,
     "fighting": 0,
     "boss_img": 15001,
-    "kill_reward": 1012,
+    "kill_reward": 214,
     "fail_reward": [
       {
         "a": "attr",
@@ -1569,7 +1569,7 @@
     "serial": 3,
     "fighting": 0,
     "boss_img": 15002,
-    "kill_reward": 1013,
+    "kill_reward": 215,
     "fail_reward": [
       {
         "a": "attr",
@@ -1621,7 +1621,7 @@
     "serial": 4,
     "fighting": 0,
     "boss_img": 15004,
-    "kill_reward": 1014,
+    "kill_reward": 216,
     "fail_reward": [
       {
         "a": "attr",
@@ -1673,7 +1673,7 @@
     "serial": 5,
     "fighting": 0,
     "boss_img": 25003,
-    "kill_reward": 1015,
+    "kill_reward": 217,
     "fail_reward": [
       {
         "a": "attr",
@@ -1725,7 +1725,7 @@
     "serial": 6,
     "fighting": 0,
     "boss_img": 35005,
-    "kill_reward": 1016,
+    "kill_reward": 218,
     "fail_reward": [
       {
         "a": "attr",
@@ -1777,7 +1777,7 @@
     "serial": 7,
     "fighting": 0,
     "boss_img": 45001,
-    "kill_reward": 1010,
+    "kill_reward": 219,
     "fail_reward": [
       {
         "a": "attr",

bin/json/game_guide.json

@@ -2123,7 +2123,7 @@
     "followguide": 1000909,
     "finger": [
       "store",
-      "listComp$.list$",
+      "list$",
       "0",
       "clickArea"
     ],

bin/json/game_skillafteratk.json

@@ -16803,7 +16803,7 @@
     "From": 1,
     "Where": [],
     "Order": "",
-    "Limit": 1,
+    "Limit": 10,
     "ExecuteCnt": 1,
     "TriggerAnim": "",
     "Type": 3,

bin/json/game_systemstroytalk.json

@@ -36,7 +36,7 @@
     "id": 4,
     "opentime": 18000092,
     "groupid": 4,
-    "herohead": "tx_js_24009",
+    "herohead": "tx_js_15003",
     "heroname": {
       "key": "systemnotice_storytalk_heroname_5",
       "text": "巨怪列车合作伙伴"

bin/timestamp.text

@@ -1 +1 @@
-0.000000
+20000.000000

modules/expedition/configure.go

@@ -8,7 +8,7 @@ import (
 )
 
 const (
-	game_expeditionboos = "game_expeditionboos.json"
+	game_expeditionboos = "game_expeditionboss.json"
 )
 
 // /配置管理基础组件

modules/expedition/model.go

@@ -123,7 +123,8 @@ func (this *ModelExpedition) settlementboos(info *pb.DBExpedition, boos *pb.DBEx
 		fightingValue += v.Totalpower
 	}
 	boos.Hp -= fightingValue
-	if boos.Hp < 0 {
+	if boos.Hp <= 0 {
+		boos.Hp = 0
 		boos.Killtime = configure.Now().Unix()
 		if info.Indexboos < int32(len(info.Boos))-1 {
 			info.Indexboos++

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

sys/configure/structs/Game.ArenaActiveKingData.go

@@ -0,0 +1,56 @@
+//------------------------------------------------------------------------------
+// <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 GameArenaActiveKingData struct {
+    LvId int32
+    Place int32
+    Name string
+    Png string
+    RewardWeek []*Gameatn
+}
+
+const TypeId_GameArenaActiveKingData = -1934655502
+
+func (*GameArenaActiveKingData) GetTypeId() int32 {
+    return -1934655502
+}
+
+func (_v *GameArenaActiveKingData)Deserialize(_buf map[string]interface{}) (err error) {
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv_id"].(float64); !_ok_ { err = errors.New("lv_id error"); return }; _v.LvId = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["place"].(float64); !_ok_ { err = errors.New("place error"); return }; _v.Place = int32(_tempNum_) }
+    {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; if _v.Png, _ok_ = _buf["png"].(string); !_ok_ { err = errors.New("png error"); return } }
+     {
+                var _arr_ []interface{}
+                var _ok_ bool
+                if _arr_, _ok_ = _buf["reward_week"].([]interface{}); !_ok_ { err = errors.New("reward_week error"); return }
+
+                _v.RewardWeek = 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.RewardWeek = append(_v.RewardWeek, _list_v_)
+                }
+            }
+
+    return
+}
+
+func DeserializeGameArenaActiveKingData(_buf map[string]interface{}) (*GameArenaActiveKingData, error) {
+    v := &GameArenaActiveKingData{}
+    if err := v.Deserialize(_buf); err == nil {
+        return v, nil
+    } else {
+        return nil, err
+    }
+}

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

sys/configure/structs/Game.ArenaActiveWinData.go

@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+// <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 GameArenaActiveWinData struct {
+    Id int32
+    Name string
+    Txt *Gameatn
+    Winningstreak int32
+}
+
+const TypeId_GameArenaActiveWinData = 2135234421
+
+func (*GameArenaActiveWinData) GetTypeId() int32 {
+    return 2135234421
+}
+
+func (_v *GameArenaActiveWinData)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 __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 _x_ map[string]interface{}; if _x_, _ok_ = _buf["txt"].(map[string]interface{}); !_ok_ { err = errors.New("txt error"); return }; if _v.Txt, err = DeserializeGameatn(_x_); err != nil { return } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["winningstreak"].(float64); !_ok_ { err = errors.New("winningstreak error"); return }; _v.Winningstreak = int32(_tempNum_) }
+    return
+}
+
+func DeserializeGameArenaActiveWinData(_buf map[string]interface{}) (*GameArenaActiveWinData, error) {
+    v := &GameArenaActiveWinData{}
+    if err := v.Deserialize(_buf); err == nil {
+        return v, nil
+    } else {
+        return nil, err
+    }
+}

sys/configure/structs/Tables.go

@@ -88,6 +88,8 @@ type Tables struct {
     ArenaRankReward *GameArenaRankReward
     ArenaChallengeNpc *GameArenaChallengeNpc
     ArenaWeeklyTask *GameArenaWeeklyTask
+    ArenaActiveKing *GameArenaActiveKing
+    ArenaActiveWin *GameArenaActiveWin
     GuildLv *GameGuildLv
     GuildPng *GameGuildPng
     GuildActivity *GameGuildActivity
@@ -354,8 +356,6 @@ type Tables struct {
     SystemNotice *GameSystemNotice
     SystemChatText *GameSystemChatText
     SystemStroyTalk *GameSystemStroyTalk
-    ActiveKing *GameActiveKing
-    ActiveTask *GameActiveTask
     EnchantbossReward *GameEnchantbossReward
 }
 
@@ -826,6 +826,18 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.ArenaWeeklyTask, err = NewGameArenaWeeklyTask(buf) ; err != nil {
         return nil, err
     }
+    if buf, err = loader("game_arenaactiveking") ; err != nil {
+        return nil, err
+    }
+    if tables.ArenaActiveKing, err = NewGameArenaActiveKing(buf) ; err != nil {
+        return nil, err
+    }
+    if buf, err = loader("game_arenaactivewin") ; err != nil {
+        return nil, err
+    }
+    if tables.ArenaActiveWin, err = NewGameArenaActiveWin(buf) ; err != nil {
+        return nil, err
+    }
     if buf, err = loader("game_guildlv") ; err != nil {
         return nil, err
     }
@@ -2422,18 +2434,6 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.SystemStroyTalk, err = NewGameSystemStroyTalk(buf) ; err != nil {
         return nil, err
     }
-    if buf, err = loader("game_activeking") ; err != nil {
-        return nil, err
-    }
-    if tables.ActiveKing, err = NewGameActiveKing(buf) ; err != nil {
-        return nil, err
-    }
-    if buf, err = loader("game_activetask") ; err != nil {
-        return nil, err
-    }
-    if tables.ActiveTask, err = NewGameActiveTask(buf) ; err != nil {
-        return nil, err
-    }
     if buf, err = loader("game_enchantbossreward") ; err != nil {
         return nil, err
     }