掠夺解锁新的队列

bin/json/game_buzkashitracklottery.json

@@ -0,0 +1,52 @@
+[
+  {
+    "Id": 1,
+    "TrackID": "Track_1",
+    "TrackWt": 20
+  },
+  {
+    "Id": 2,
+    "TrackID": "Track_2",
+    "TrackWt": 20
+  },
+  {
+    "Id": 3,
+    "TrackID": "Track_3",
+    "TrackWt": 20
+  },
+  {
+    "Id": 4,
+    "TrackID": "Track_4",
+    "TrackWt": 25
+  },
+  {
+    "Id": 5,
+    "TrackID": "Track_5",
+    "TrackWt": 25
+  },
+  {
+    "Id": 6,
+    "TrackID": "Track_6",
+    "TrackWt": 20
+  },
+  {
+    "Id": 7,
+    "TrackID": "Track_7",
+    "TrackWt": 10
+  },
+  {
+    "Id": 8,
+    "TrackID": "Track_8",
+    "TrackWt": 5
+  },
+  {
+    "Id": 9,
+    "TrackID": "Track_9",
+    "TrackWt": 5
+  },
+  {
+    "Id": 10,
+    "TrackID": "Track_10",
+    "TrackWt": 5
+  }
+]

bin/json/game_coin.json

@@ -536,5 +536,32 @@
       "key": "item_coin_intr2_20",
       "text": "不论曾经是谁的，现在都是我的了。"
     }
+  },
+  {
+    "key": "plundercollege",
+    "keyint": 20,
+    "name": {
+      "key": "item_coin_name_21",
+      "text": "旗帜"
+    },
+    "hold": 1,
+    "color": 5,
+    "effects": "",
+    "access": [
+      158
+    ],
+    "img": "attr_sxintegral",
+    "intr": {
+      "key": "item_coin_intr_21",
+      "text": "巨怪商队的内用来解锁更多运输次数的道具。"
+    },
+    "describe": {
+      "key": "",
+      "text": ""
+    },
+    "dialogue": {
+      "key": "item_coin_intr2_21",
+      "text": "这是繁荣的象征"
+    }
   }
 ]

bin/json/game_consumehero.json

@@ -17,7 +17,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_01",
-      "text": "胡德的毒苹果酒吧桌游卡"
+      "text": "胡德的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_01",
@@ -82,7 +82,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_02",
-      "text": "匹诺曹的毒苹果酒吧桌游卡"
+      "text": "匹诺曹的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_02",
@@ -147,7 +147,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_03",
-      "text": "姜饼人的毒苹果酒吧桌游卡"
+      "text": "姜饼人的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_03",
@@ -212,7 +212,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_04",
-      "text": "法夸德勋爵的毒苹果酒吧桌游卡"
+      "text": "法夸德勋爵的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_04",
@@ -283,7 +283,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_05",
-      "text": "大大的毒苹果酒吧桌游卡"
+      "text": "大大的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_05",
@@ -354,7 +354,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_06",
-      "text": "船长的毒苹果酒吧桌游卡"
+      "text": "船长的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_06",
@@ -425,7 +425,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_07",
-      "text": "警长的毒苹果酒吧桌游卡"
+      "text": "警长的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_07",
@@ -496,7 +496,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_08",
-      "text": "阿宝的毒苹果酒吧桌游卡"
+      "text": "阿宝的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_08",
@@ -567,7 +567,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_09",
-      "text": "师父的毒苹果酒吧桌游卡"
+      "text": "师父的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_09",
@@ -638,7 +638,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_10",
-      "text": "骇客蛛的毒苹果酒吧桌游卡"
+      "text": "骇客蛛的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_10",
@@ -709,7 +709,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_11",
-      "text": "悍娇虎的毒苹果酒吧桌游卡"
+      "text": "悍娇虎的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_11",
@@ -780,7 +780,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_12",
-      "text": "盖的毒苹果酒吧桌游卡。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
+      "text": "盖的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_12",
@@ -851,7 +851,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_13",
-      "text": "菲奥娜的毒苹果酒吧桌游卡"
+      "text": "菲奥娜的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_13",
@@ -922,7 +922,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_14",
-      "text": "穿靴子的猫的毒苹果酒吧桌游卡"
+      "text": "穿靴子的猫的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_14",
@@ -993,7 +993,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_15",
-      "text": "乌龟大师的毒苹果酒吧桌游卡"
+      "text": "乌龟大师的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_15",
@@ -1064,7 +1064,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_16",
-      "text": "冰霜杰克的毒苹果酒吧桌游卡"
+      "text": "冰霜杰克的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_16",
@@ -1135,7 +1135,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_17",
-      "text": "漆黑的毒苹果酒吧桌游卡"
+      "text": "漆黑的巅峰之王守护者卡片。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_17",

bin/json/game_expeditionboos.json

@@ -26,7 +26,7 @@
       6
     ],
     "hid": [
-      25001
+      "25001"
     ],
     "color": [
       4,
@@ -61,7 +61,7 @@
       6
     ],
     "hid": [
-      25001
+      "25001"
     ],
     "color": [
       4,
@@ -96,7 +96,7 @@
       6
     ],
     "hid": [
-      25001
+      "25001"
     ],
     "color": [
       4,
@@ -131,7 +131,7 @@
       6
     ],
     "hid": [
-      25001
+      "25001"
     ],
     "color": [
       4,
@@ -166,7 +166,7 @@
       6
     ],
     "hid": [
-      25001
+      "25001"
     ],
     "color": [
       4,
@@ -201,7 +201,7 @@
       6
     ],
     "hid": [
-      25001
+      "25001"
     ],
     "color": [
       4,
@@ -236,7 +236,7 @@
       6
     ],
     "hid": [
-      25001
+      "25001"
     ],
     "color": [
       4,
@@ -271,7 +271,7 @@
       6
     ],
     "hid": [
-      25001
+      "25001"
     ],
     "color": [
       4,
@@ -306,7 +306,7 @@
       6
     ],
     "hid": [
-      25001
+      "25001"
     ],
     "color": [
       4,
@@ -341,7 +341,7 @@
       6
     ],
     "hid": [
-      25001
+      "25001"
     ],
     "color": [
       4,
@@ -376,7 +376,7 @@
       6
     ],
     "hid": [
-      25001
+      "25001"
     ],
     "color": [
       4,
@@ -411,7 +411,7 @@
       6
     ],
     "hid": [
-      25001
+      "25001"
     ],
     "color": [
       4,
@@ -446,7 +446,7 @@
       6
     ],
     "hid": [
-      25001
+      "25001"
     ],
     "color": [
       4,

bin/json/game_global.json

@@ -633,6 +633,7 @@
     "buzkashi_recentPlayer": 10,
     "buzkashi_trackpartdis": 200,
     "buzkashi_trackpartcount": 4,
+    "buzkashi_trackpartStartDis": 300,
     "task_activation": 10000007,
     "favorability_attenuation": [
       {
@@ -788,7 +789,11 @@
     "guild_sign_in": 10,
     "enhanceboss_ps": 10,
     "plunder_pvp_battlereadyid": 105,
-    "plunder_pvp_college_num": 400,
+    "plunder_pvp_college_num": {
+      "a": "attr",
+      "t": "plundercollege",
+      "n": 400
+    },
     "plunder_pvp_college_time": 7
   }
 ]

bin/json/game_hero.json

@@ -9981,7 +9981,7 @@
     "hid": "83008",
     "name": {
       "key": "hero_main_name_83008",
-      "text": "黑化小猴子"
+      "text": "怪异的拳猴"
     },
     "star": 3,
     "color": 2,
@@ -10060,7 +10060,7 @@
     "expitemnum": 7,
     "herointr": {
       "key": "hero_main_herointr_83008",
-      "text": "传说中的守护者“黑化小猴子”,拥有不俗的战斗能力"
+      "text": "传说中的守护者“怪异的拳猴”,拥有不俗的战斗能力"
     }
   },
   {

bin/json/game_mail.json

@@ -493,5 +493,27 @@
     },
     "reword": [],
     "duration": 720
+  },
+  {
+    "id": "XXLRankingReward",
+    "title": {
+      "key": "mail_mail_title_23",
+      "text": "三消排行奖励"
+    },
+    "postmark": "yj_icon_yc_mfjl",
+    "recipient": {
+      "key": "mail_mail_recipient_23",
+      "text": "亲爱的玩家："
+    },
+    "content": {
+      "key": "mail_mail_content_7",
+      "text": "获得第{0}名，奖励请查收。"
+    },
+    "sender": {
+      "key": "mail_mail_sender_23",
+      "text": "系统"
+    },
+    "reword": [],
+    "duration": 720
   }
 ]

bin/json/game_model.json

@@ -7526,18 +7526,18 @@
   },
   {
     "id": "83008",
-    "preson": "83008",
+    "preson": "51012",
-    "presonshow": "83008_exhibition",
+    "presonshow": "51012_exhibition",
-    "presonstory": "83008_story",
+    "presonstory": "51012_evil",
     "presondraw": "",
     "height": 1,
     "weight": 1,
-    "ico": "tx_js_83008",
+    "ico": "tx_js_51012",
-    "fight": "tx_js_83008",
+    "fight": "tx_js_51012",
-    "img": "sbkp_js_83008",
+    "img": "sbkp_js_51012",
-    "heroimg": "hbkp_js_83008",
+    "heroimg": "hbkp_js_51012",
-    "portrait": "zm_img_83008",
+    "portrait": "zm_img_51012",
-    "bust": "bust_83008",
+    "bust": "bust_51012",
     "postxyz": [
       0,
       0,

bin/json/game_opencond.json

@@ -1033,7 +1033,7 @@
     "opencondi": [
       18000042
     ],
-    "wkqbx": 0,
+    "wkqbx": 2,
     "img": "icon_sytj",
     "prompt": {
       "key": "opencond_opencond_prompt_37",

bin/json/game_playingmethod.json

@@ -25,7 +25,7 @@
     },
     "txt": {
       "key": "consume_consume_playingmethod_txt_03",
-      "text": "基础方块新增炸弹方块"
+      "text": "基础方块新增炸弹方块，可以消除大片区域。"
     },
     "type": 2,
     "detail": 1,
@@ -41,7 +41,7 @@
     },
     "txt": {
       "key": "consume_consume_playingmethod_txt_04",
-      "text": "基础方块新增烟火方块"
+      "text": "基础方块新增烟火方块，可以消除指定方向所以方块。"
     },
     "type": 2,
     "detail": 1,

modules/plunder/api_unlock.go

@@ -0,0 +1,53 @@
+package plunder
+
+import (
+	"go_dreamfactory/comm"
+	"go_dreamfactory/pb"
+	cfg "go_dreamfactory/sys/configure/structs"
+)
+
+func (this *apiComp) UnlockCheck(session comm.IUserSession, req *pb.PlunderUnlockReq) (errdata *pb.ErrorData) {
+	return
+}
+
+// 获取基本信息
+func (this *apiComp) Unlock(session comm.IUserSession, req *pb.PlunderUnlockReq) (errdata *pb.ErrorData) {
+	var (
+		err  error
+		list *pb.DBPlunder
+	)
+	if errdata = this.UnlockCheck(session, req); errdata != nil {
+		return
+	}
+
+	if list, err = this.module.modelPlunder.getPlunderData(session.GetUserId()); err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Message: err.Error(),
+		}
+		return
+	}
+	if int32(len(list.Line)) >= req.Pos {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_ReqParameterError,
+			Title: pb.ErrorCode_ReqParameterError.ToString(),
+		}
+		return
+	}
+	if list.Line[req.Pos].Closetime != -1 {
+		errdata = &pb.ErrorData{
+			Code:  pb.ErrorCode_PlundeUnlock,
+			Title: pb.ErrorCode_PlundeUnlock.ToString(),
+		}
+		return
+	}
+	// 校验数据够不够
+
+	globalConf := this.module.ModuleTools.GetGlobalConf()
+
+	this.module.ConsumeRes(session, []*cfg.Gameatn{globalConf.PlunderPvpCollegeNum}, true)
+
+	session.SendMsg(string(this.module.GetType()), "unlock", &pb.PlunderUnlockReq{})
+
+	return
+}

pb/chat_db.pb.go

@@ -87,7 +87,7 @@ const (
 	ChatType_ItemShare      ChatType = 5 //道具分享
 	ChatType_Parkour        ChatType = 6 //捕羊大赛邀请
 	ChatType_Questionnaire  ChatType = 7 //问答分享
-	ChatType_XxlRoom        ChatType = 8 //三消房间分享类型
+	ChatType_XxlRoom        ChatType = 8 // 三消房间分享类型
 )
 
 // Enum value maps for ChatType.

pb/errorcode.pb.go

@@ -479,6 +479,7 @@ const (
 	ErrorCode_PlundeNormalShip    ErrorCode = 5405 //普通船不能被掠夺
 	ErrorCode_PlundeShipCDIng     ErrorCode = 5406 //掠夺cd中
 	ErrorCode_PlundeShipRunning   ErrorCode = 5407 //运输中
+	ErrorCode_PlundeUnlock        ErrorCode = 5408 //已解锁
 )
 
 // Enum value maps for ErrorCode.
@@ -893,6 +894,7 @@ var (
 		5405: "PlundeNormalShip",
 		5406: "PlundeShipCDIng",
 		5407: "PlundeShipRunning",
+		5408: "PlundeUnlock",
 	}
 	ErrorCode_value = map[string]int32{
 		"Success":                       0,
@@ -1304,6 +1306,7 @@ var (
 		"PlundeNormalShip":              5405,
 		"PlundeShipCDIng":               5406,
 		"PlundeShipRunning":             5407,
+		"PlundeUnlock":                  5408,
 	}
 )
 
@@ -1338,7 +1341,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
 
 var file_errorcode_proto_rawDesc = []byte{
 	0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2a, 0xa1, 0x4c, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0xb4, 0x4c, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
 	0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
 	0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
 	0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
@@ -1948,8 +1951,9 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x53, 0x68, 0x69, 0x70, 0x10, 0x9d, 0x2a, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x6c, 0x75, 0x6e, 0x64,
 	0x65, 0x53, 0x68, 0x69, 0x70, 0x43, 0x44, 0x49, 0x6e, 0x67, 0x10, 0x9e, 0x2a, 0x12, 0x16, 0x0a,
 	0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x52, 0x75, 0x6e, 0x6e, 0x69,
-	0x6e, 0x67, 0x10, 0x9f, 0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
+	0x6e, 0x67, 0x10, 0x9f, 0x2a, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x55,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0, 0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

pb/plunder_msg.pb.go

@@ -930,6 +930,101 @@ func (x *PlunderChangePush) GetShip() map[string]*ShipData {
 	return nil
 }
 
+// 解锁
+type PlunderUnlockReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Pos int32 `protobuf:"varint,1,opt,name=pos,proto3" json:"pos"` //
+}
+
+func (x *PlunderUnlockReq) Reset() {
+	*x = PlunderUnlockReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_plunder_plunder_msg_proto_msgTypes[17]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PlunderUnlockReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PlunderUnlockReq) ProtoMessage() {}
+
+func (x *PlunderUnlockReq) ProtoReflect() protoreflect.Message {
+	mi := &file_plunder_plunder_msg_proto_msgTypes[17]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PlunderUnlockReq.ProtoReflect.Descriptor instead.
+func (*PlunderUnlockReq) Descriptor() ([]byte, []int) {
+	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{17}
+}
+
+func (x *PlunderUnlockReq) GetPos() int32 {
+	if x != nil {
+		return x.Pos
+	}
+	return 0
+}
+
+type PlunderUnlockResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Line []*TransportLine `protobuf:"bytes,1,rep,name=line,proto3" json:"line"` // 运输队列
+}
+
+func (x *PlunderUnlockResp) Reset() {
+	*x = PlunderUnlockResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_plunder_plunder_msg_proto_msgTypes[18]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PlunderUnlockResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PlunderUnlockResp) ProtoMessage() {}
+
+func (x *PlunderUnlockResp) ProtoReflect() protoreflect.Message {
+	mi := &file_plunder_plunder_msg_proto_msgTypes[18]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PlunderUnlockResp.ProtoReflect.Descriptor instead.
+func (*PlunderUnlockResp) Descriptor() ([]byte, []int) {
+	return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{18}
+}
+
+func (x *PlunderUnlockResp) GetLine() []*TransportLine {
+	if x != nil {
+		return x.Line
+	}
+	return nil
+}
+
 var File_plunder_plunder_msg_proto protoreflect.FileDescriptor
 
 var file_plunder_plunder_msg_proto_rawDesc = []byte{
@@ -1045,8 +1140,14 @@ var file_plunder_plunder_msg_proto_rawDesc = []byte{
 	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
 	0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09,
 	0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
+	0x3a, 0x02, 0x38, 0x01, 0x22, 0x24, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x55,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0x37, 0x0a, 0x11, 0x50, 0x6c,
+	0x75, 0x6e, 0x64, 0x65, 0x72, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x22, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
+	0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c,
+	0x69, 0x6e, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1061,7 +1162,7 @@ func file_plunder_plunder_msg_proto_rawDescGZIP() []byte {
 	return file_plunder_plunder_msg_proto_rawDescData
 }
 
-var file_plunder_plunder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 22)
+var file_plunder_plunder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 24)
 var file_plunder_plunder_msg_proto_goTypes = []interface{}{
 	(*PlunderGetListReq)(nil),           // 0: PlunderGetListReq
 	(*PlunderGetListResp)(nil),          // 1: PlunderGetListResp
@@ -1080,47 +1181,50 @@ var file_plunder_plunder_msg_proto_goTypes = []interface{}{
 	(*PlunderClientTagReq)(nil),         // 14: PlunderClientTagReq
 	(*PlunderClientTagResp)(nil),        // 15: PlunderClientTagResp
 	(*PlunderChangePush)(nil),           // 16: PlunderChangePush
-	nil,                                 // 17: PlunderChallengeOverResp.ShipEntry
+	(*PlunderUnlockReq)(nil),            // 17: PlunderUnlockReq
-	nil,                                 // 18: PlunderChallengeOverResp.HeroexpEntry
+	(*PlunderUnlockResp)(nil),           // 18: PlunderUnlockResp
-	nil,                                 // 19: PlunderReachResp.ShipEntry
+	nil,                                 // 19: PlunderChallengeOverResp.ShipEntry
-	nil,                                 // 20: PlunderClientTagResp.ShipEntry
+	nil,                                 // 20: PlunderChallengeOverResp.HeroexpEntry
-	nil,                                 // 21: PlunderChangePush.ShipEntry
+	nil,                                 // 21: PlunderReachResp.ShipEntry
-	(*DBPlunder)(nil),                   // 22: DBPlunder
+	nil,                                 // 22: PlunderClientTagResp.ShipEntry
-	(*DBPlunderLand)(nil),               // 23: DBPlunderLand
+	nil,                                 // 23: PlunderChangePush.ShipEntry
-	(*BattleFormation)(nil),             // 24: BattleFormation
+	(*DBPlunder)(nil),                   // 24: DBPlunder
-	(*BattleInfo)(nil),                  // 25: BattleInfo
+	(*DBPlunderLand)(nil),               // 25: DBPlunderLand
-	(*BattleReport)(nil),                // 26: BattleReport
+	(*BattleFormation)(nil),             // 26: BattleFormation
-	(*TransportLine)(nil),               // 27: TransportLine
+	(*BattleInfo)(nil),                  // 27: BattleInfo
-	(*UserAtno)(nil),                    // 28: UserAtno
+	(*BattleReport)(nil),                // 28: BattleReport
-	(*ShipData)(nil),                    // 29: ShipData
+	(*TransportLine)(nil),               // 29: TransportLine
+	(*UserAtno)(nil),                    // 30: UserAtno
+	(*ShipData)(nil),                    // 31: ShipData
 }
 var file_plunder_plunder_msg_proto_depIdxs = []int32{
-	22, // 0: PlunderGetListResp.list:type_name -> DBPlunder
+	24, // 0: PlunderGetListResp.list:type_name -> DBPlunder
-	23, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand
+	25, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand
-	24, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation
+	26, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation
-	25, // 3: PlunderChallengeResp.info:type_name -> BattleInfo
+	27, // 3: PlunderChallengeResp.info:type_name -> BattleInfo
-	26, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport
+	28, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport
-	27, // 5: PlunderChallengeOverResp.line:type_name -> TransportLine
+	29, // 5: PlunderChallengeOverResp.line:type_name -> TransportLine
-	17, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry
+	19, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry
-	28, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno
+	30, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno
-	18, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry
+	20, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry
-	24, // 9: PlunderPvpChallengeReq.battle:type_name -> BattleFormation
+	26, // 9: PlunderPvpChallengeReq.battle:type_name -> BattleFormation
-	25, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo
+	27, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo
-	26, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport
+	28, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport
-	28, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno
+	30, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno
-	27, // 13: PlunderReachResp.line:type_name -> TransportLine
+	29, // 13: PlunderReachResp.line:type_name -> TransportLine
-	19, // 14: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry
+	21, // 14: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry
-	20, // 15: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry
+	22, // 15: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry
-	21, // 16: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry
+	23, // 16: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry
-	29, // 17: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData
+	29, // 17: PlunderUnlockResp.line:type_name -> TransportLine
-	29, // 18: PlunderReachResp.ShipEntry.value:type_name -> ShipData
+	31, // 18: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData
-	29, // 19: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData
+	31, // 19: PlunderReachResp.ShipEntry.value:type_name -> ShipData
-	29, // 20: PlunderChangePush.ShipEntry.value:type_name -> ShipData
+	31, // 20: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData
-	21, // [21:21] is the sub-list for method output_type
+	31, // 21: PlunderChangePush.ShipEntry.value:type_name -> ShipData
-	21, // [21:21] is the sub-list for method input_type
+	22, // [22:22] is the sub-list for method output_type
-	21, // [21:21] is the sub-list for extension type_name
+	22, // [22:22] is the sub-list for method input_type
-	21, // [21:21] is the sub-list for extension extendee
+	22, // [22:22] is the sub-list for extension type_name
-	0,  // [0:21] is the sub-list for field type_name
+	22, // [22:22] is the sub-list for extension extendee
+	0,  // [0:22] is the sub-list for field type_name
 }
 
 func init() { file_plunder_plunder_msg_proto_init() }
@@ -1336,6 +1440,30 @@ func file_plunder_plunder_msg_proto_init() {
 				return nil
 			}
 		}
+		file_plunder_plunder_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PlunderUnlockReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_plunder_plunder_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PlunderUnlockResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -1343,7 +1471,7 @@ func file_plunder_plunder_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_plunder_plunder_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   22,
+			NumMessages:   24,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

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

sys/configure/structs/Game.BuzkashiTrackLotteryData.go

@@ -0,0 +1,39 @@
+//------------------------------------------------------------------------------
+// <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 GameBuzkashiTrackLotteryData struct {
+    Id int32
+    TrackID string
+    TrackWt int32
+}
+
+const TypeId_GameBuzkashiTrackLotteryData = 172598875
+
+func (*GameBuzkashiTrackLotteryData) GetTypeId() int32 {
+    return 172598875
+}
+
+func (_v *GameBuzkashiTrackLotteryData)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; if _v.TrackID, _ok_ = _buf["TrackID"].(string); !_ok_ { err = errors.New("TrackID error"); return } }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["TrackWt"].(float64); !_ok_ { err = errors.New("TrackWt error"); return }; _v.TrackWt = int32(_tempNum_) }
+    return
+}
+
+func DeserializeGameBuzkashiTrackLotteryData(_buf map[string]interface{}) (*GameBuzkashiTrackLotteryData, error) {
+    v := &GameBuzkashiTrackLotteryData{}
+    if err := v.Deserialize(_buf); err == nil {
+        return v, nil
+    } else {
+        return nil, err
+    }
+}

sys/configure/structs/Game.ExpeditionBoosData.go

@@ -21,7 +21,7 @@ type GameExpeditionBoosData struct {
     FailReward []*Gameatn
     Race []int32
     Job []int32
-    Hid []int32
+    Hid []string
     Color []int32
     Fight int32
 }
@@ -87,11 +87,11 @@ func (_v *GameExpeditionBoosData)Deserialize(_buf map[string]interface{}) (err e
                 var _ok_ bool
                 if _arr_, _ok_ = _buf["hid"].([]interface{}); !_ok_ { err = errors.New("hid error"); return }
 
-                _v.Hid = make([]int32, 0, len(_arr_))
+                _v.Hid = make([]string, 0, len(_arr_))
                 
                 for _, _e_ := range _arr_ {
-                    var _list_v_ int32
+                    var _list_v_ string
-                    { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+                    {  if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
                     _v.Hid = append(_v.Hid, _list_v_)
                 }
             }

sys/configure/structs/Tables.go

@@ -184,6 +184,7 @@ type Tables struct {
     BuzkashiFm *GameBuzkashiFm
     BuzkashiOpen *GameBuzkashiOpen
     BuzkashiTrack *GameBuzkashiTrack
+    BuzkashiTrackLottery *GameBuzkashiTrackLottery
     Pricegroup *GamePricegroup
     Loading *GameLoading
     RuleDesc *GameRuleDesc
@@ -344,6 +345,7 @@ type Tables struct {
     FightingSkilllv *GameFightingSkilllv
     FightingSkill *GameFightingSkill
     FightingSkillStar *GameFightingSkillStar
+    ExpeditionBoos *GameExpeditionBoos
 }
 
 func NewTables(loader JsonLoader) (*Tables, error) {
@@ -1389,6 +1391,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.BuzkashiTrack, err = NewGameBuzkashiTrack(buf) ; err != nil {
         return nil, err
     }
+    if buf, err = loader("game_buzkashitracklottery") ; err != nil {
+        return nil, err
+    }
+    if tables.BuzkashiTrackLottery, err = NewGameBuzkashiTrackLottery(buf) ; err != nil {
+        return nil, err
+    }
     if buf, err = loader("game_pricegroup") ; err != nil {
         return nil, err
     }
@@ -2349,5 +2357,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
     if tables.FightingSkillStar, err = NewGameFightingSkillStar(buf) ; err != nil {
         return nil, err
     }
+    if buf, err = loader("game_expeditionboos") ; err != nil {
+        return nil, err
+    }
+    if tables.ExpeditionBoos, err = NewGameExpeditionBoos(buf) ; err != nil {
+        return nil, err
+    }
     return tables, nil
 }

sys/configure/structs/game.globalData.go

@@ -220,6 +220,7 @@ type GameGlobalData struct {
     BuzkashiRecentPlayer int32
     BuzkashiTrackpartdis int32
     BuzkashiTrackpartcount int32
+    BuzkashiTrackpartStartDis int32
     TaskActivation int32
     FavorabilityAttenuation []*Gamekv
     Mounts string
@@ -281,7 +282,7 @@ type GameGlobalData struct {
     GuildSignIn int32
     EnhancebossPs int32
     PlunderPvpBattlereadyid int32
-    PlunderPvpCollegeNum int32
+    PlunderPvpCollegeNum *Gameatn
     PlunderPvpCollegeTime int32
 }
 
@@ -930,6 +931,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_recentPlayer"].(float64); !_ok_ { err = errors.New("buzkashi_recentPlayer error"); return }; _v.BuzkashiRecentPlayer = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_trackpartdis"].(float64); !_ok_ { err = errors.New("buzkashi_trackpartdis error"); return }; _v.BuzkashiTrackpartdis = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_trackpartcount"].(float64); !_ok_ { err = errors.New("buzkashi_trackpartcount error"); return }; _v.BuzkashiTrackpartcount = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_trackpartStartDis"].(float64); !_ok_ { err = errors.New("buzkashi_trackpartStartDis error"); return }; _v.BuzkashiTrackpartStartDis = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["task_activation"].(float64); !_ok_ { err = errors.New("task_activation error"); return }; _v.TaskActivation = int32(_tempNum_) }
      {
                 var _arr_ []interface{}
@@ -1095,7 +1097,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["guild_sign_in"].(float64); !_ok_ { err = errors.New("guild_sign_in error"); return }; _v.GuildSignIn = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["enhanceboss_ps"].(float64); !_ok_ { err = errors.New("enhanceboss_ps error"); return }; _v.EnhancebossPs = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_battlereadyid"].(float64); !_ok_ { err = errors.New("plunder_pvp_battlereadyid error"); return }; _v.PlunderPvpBattlereadyid = int32(_tempNum_) }
-    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_college_num"].(float64); !_ok_ { err = errors.New("plunder_pvp_college_num error"); return }; _v.PlunderPvpCollegeNum = int32(_tempNum_) }
+    { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["plunder_pvp_college_num"].(map[string]interface{}); !_ok_ { err = errors.New("plunder_pvp_college_num error"); return }; if _v.PlunderPvpCollegeNum, err = DeserializeGameatn(_x_); err != nil { return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["plunder_pvp_college_time"].(float64); !_ok_ { err = errors.New("plunder_pvp_college_time error"); return }; _v.PlunderPvpCollegeTime = int32(_tempNum_) }
     return
 }