From 18ccd3ca0d6293616485c2c3f238bfd7a0751d2d Mon Sep 17 00:00:00 2001
From: liwei1dao <liwei1dao@gmail.com>
Date: Mon, 30 Oct 2023 17:09:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=B5=B7=E7=9B=97=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/island/module.go |  2 +-
 pb/errorcode.pb.go       | 24 +++++++++++++++++-------
 services/worker/main.go  |  2 ++
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/modules/island/module.go b/modules/island/module.go
index cba5fc0f8..abf3f2938 100644
--- a/modules/island/module.go
+++ b/modules/island/module.go
@@ -28,7 +28,7 @@ type IsLand struct {
 }
 
 func (this *IsLand) GetType() core.M_Modules {
-	return comm.ModuleGameInvite
+	return comm.ModuleIsLand
 }
 
 func (this *IsLand) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) {
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index f619efa7d..3cc651a4d 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -451,10 +451,12 @@ const (
 	//捕羊大赛的
 	ErrorCode_CapturesheepRankCloseed ErrorCode = 5101 //排位比赛不在开启时间内
 	// xxl
-	ErrorCode_EntertainCantSwap    ErrorCode = 5201 //不能交换
-	ErrorCode_EntertainNoPower     ErrorCode = 5202 //对方操作
-	ErrorCode_EntertainNoHeroSkill ErrorCode = 5203 //没找到该英雄对应的技能
-	ErrorCode_EntertainNoEnergy    ErrorCode = 5204 //技能能量不足
+	ErrorCode_EntertainCantSwap      ErrorCode = 5201 //不能交换
+	ErrorCode_EntertainNoPower       ErrorCode = 5202 //对方操作
+	ErrorCode_EntertainNoHeroSkill   ErrorCode = 5203 //没找到该英雄对应的技能
+	ErrorCode_EntertainNoEnergy      ErrorCode = 5204 //技能能量不足
+	ErrorCode_EntertainCreateFailed  ErrorCode = 5205 // 创建房间失败
+	ErrorCode_EntertainPlayerNoReady ErrorCode = 5206 // 玩家1还没准备不能开始游戏
 )
 
 // Enum value maps for ErrorCode.
@@ -847,6 +849,8 @@ var (
 		5202: "EntertainNoPower",
 		5203: "EntertainNoHeroSkill",
 		5204: "EntertainNoEnergy",
+		5205: "EntertainCreateFailed",
+		5206: "EntertainPlayerNoReady",
 	}
 	ErrorCode_value = map[string]int32{
 		"Success":                       0,
@@ -1236,6 +1240,8 @@ var (
 		"EntertainNoPower":              5202,
 		"EntertainNoHeroSkill":          5203,
 		"EntertainNoEnergy":             5204,
+		"EntertainCreateFailed":         5205,
+		"EntertainPlayerNoReady":        5206,
 	}
 )
 
@@ -1270,7 +1276,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, 0xe4, 0x47, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
+	0x6f, 0x2a, 0x9d, 0x48, 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,
@@ -1844,8 +1850,12 @@ var file_errorcode_proto_rawDesc = []byte{
 	0x65, 0x72, 0x10, 0xd2, 0x28, 0x12, 0x19, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61,
 	0x69, 0x6e, 0x4e, 0x6f, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x10, 0xd3, 0x28,
 	0x12, 0x16, 0x0a, 0x11, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4e, 0x6f, 0x45,
-	0x6e, 0x65, 0x72, 0x67, 0x79, 0x10, 0xd4, 0x28, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x65, 0x72, 0x67, 0x79, 0x10, 0xd4, 0x28, 0x12, 0x1a, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65,
+	0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x65,
+	0x64, 0x10, 0xd5, 0x28, 0x12, 0x1b, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69,
+	0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4e, 0x6f, 0x52, 0x65, 0x61, 0x64, 0x79, 0x10, 0xd6,
+	0x28, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
 var (
diff --git a/services/worker/main.go b/services/worker/main.go
index fea7f9c3a..9b738acb9 100644
--- a/services/worker/main.go
+++ b/services/worker/main.go
@@ -36,6 +36,7 @@ import (
 	"go_dreamfactory/modules/herotask"
 	"go_dreamfactory/modules/horoscope"
 	"go_dreamfactory/modules/hunting"
+	"go_dreamfactory/modules/island"
 	"go_dreamfactory/modules/items"
 	"go_dreamfactory/modules/jielong"
 	"go_dreamfactory/modules/kftask"
@@ -180,6 +181,7 @@ func main() {
 		treasuremap.NewModule(),
 		gameinvite.NewModule(),
 		caninerabbit.NewModule(),
+		island.NewModule(),
 	)
 }