Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

bin/json/game_item.json

@@ -20680,10 +20680,10 @@
     "id": "27000001",
     "name": {
       "key": "item_item_name_417",
-      "text": "骇客蛛"
+      "text": "豺狼小怪"
     },
     "usetype": 1,
-    "color": 3,
+    "color": 2,
     "bagtype": 0,
     "index": 1,
     "special_type": 0,
@@ -20701,18 +20701,18 @@
     "access": [],
     "use_skip": 0,
     "upper_limit": 0,
-    "img": "tx_js_44004",
+    "img": "tx_js_51004",
     "intr": {
       "key": "item_item_intr_412",
-      "text": "骇客蛛的三消英雄卡，运用黑客的智慧在这里嘎嘎乱杀"
+      "text": "豺狼小怪的三消英雄卡。"
     },
     "describe": {
       "key": "item_item_describe_412",
-      "text": "电脑专业户，脚本编写大师，有扎实的三消基础，但运气不怎么好。"
+      "text": "豺狼小怪怎么叫？"
     },
     "dialogue": {
       "key": "item_item_dialogue_410",
-      "text": "【脚本，启动！】"
+      "text": "【启动！】"
     },
     "sale": [],
     "gm": 0
@@ -20721,10 +20721,10 @@
     "id": "27000002",
     "name": {
       "key": "item_item_name_418",
-      "text": "阿宝"
+      "text": "小猴子"
     },
     "usetype": 1,
-    "color": 4,
+    "color": 2,
     "bagtype": 0,
     "index": 1,
     "special_type": 0,
@@ -20742,14 +20742,14 @@
     "access": [],
     "use_skip": 0,
     "upper_limit": 0,
-    "img": "tx_js_25001",
+    "img": "tx_js_51012",
     "intr": {
       "key": "item_item_intr_413",
-      "text": "阿宝的三消英雄卡，运用功夫的力量在这里嘎嘎乱杀"
+      "text": "小猴子的三消英雄卡。"
     },
     "describe": {
       "key": "item_item_describe_413",
-      "text": "2步专业户，三消可能对他有点难度,但架不住运气好。"
+      "text": "小猴子怎么叫？"
     },
     "dialogue": {
       "key": "item_item_dialogue_411",

modules/entertainment/api_ready.go

@@ -18,9 +18,10 @@ func (this *apiComp) ReadyCheck(session comm.IUserSession, req *pb.EntertainRead
 
 func (this *apiComp) Ready(session comm.IUserSession, req *pb.EntertainReadyReq) (errdata *pb.ErrorData) {
 
-	this.module.gameMgr.RoomDistribute(req.Roomid, session, "ready", req)
+	if errdata = this.module.gameMgr.RoomDistribute(req.Roomid, session, "ready", req); errdata == nil {
-	session.SendMsg(string(this.module.GetType()), "ready", &pb.EntertainReadyResp{
+		session.SendMsg(string(this.module.GetType()), "ready", &pb.EntertainReadyResp{
-		Ready: true,
+			Ready: true,
-	})
+		})
+	}
 	return
 }

modules/entertainment/room.go

@@ -413,6 +413,7 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr
 			this.curPower = this.player1.Uid
 			this.player1.Ps = MaxPs
 			this.player2.Ps = 0
+			this.module.Debugf("match ai")
 			if err := this.module.SendMsgSyncToSession(string(this.module.GetType()), "startgame", &pb.EntertainStartGamePush{
 				User1:   this.player1,
 				User2:   this.player2,
@@ -430,6 +431,7 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr
 			} else if this.player2.Uid == session.GetUserId() {
 				this.rd2 = true
 			}
+			this.module.Debugf("match user1ready:%v,ready2:%v", this.rd1, this.rd2)
 			if this.rd1 && this.rd2 { // 两个玩家都准备好了 那么就开始游戏
 				this.NexPower = this.player1.Uid
 				this.curPower = this.player1.Uid
@@ -490,22 +492,15 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) {
 			bReward = false
 		}
 	}
+	if bReward { // 发奖
+		if user, err := this.module.ModuleUser.GetUser(winner); err == nil {
+			if conf, err := this.module.configure.GetGameConsumeintegral(user.Consumeexp); err == nil {
+				res = append(res, conf.Onereward...)
+				res = append(res, conf.Rewards...)
 
-	if conf, err := this.module.configure.GetGameConsumeintegral(this.player1.Score); err == nil {
+				if errdata, atno = this.module.DispenseAtno(this.szSession[winindex], res, true); errdata != nil {
-		res = append(res, conf.Onereward...)
+					return
-		res = append(res, conf.Rewards...)
+				}
-		if bReward { // 发奖
-			if errdata, atno = this.module.DispenseAtno(this.szSession[winindex], res, true); errdata != nil {
-				return
-			}
-		} else { // AI 不发将 构建一个atno对象
-			for _, v := range res {
-				atno = append(atno, &pb.UserAtno{
-					A: v.A,
-					T: v.T,
-					N: v.N,
-					O: "",
-				})
 			}
 		}
 	}

modules/entertainment/xxlPlat.go

@@ -90,8 +90,8 @@ func (this *MapData) SetMap() {
 		2, 1, 1, 3, 6, 4, 1,
 		4, 1, 1, 4, 3, 6, 3,
 		4, 3, 4, 5, 1, 6, 1,
-		5, 4, 2, 5, 1, 3, 1,
+		5, 4, 2, 5, 3, 3, 1,
-		4, 1, 5, 1, 2, 1, 4,
+		4, 1, 5, 3, 2, 3, 4,
 	}
 	var pos int
 	for index := Width - 1; index >= 0; index-- {
@@ -297,7 +297,7 @@ func (this *MapData) Check4X(color int32) (bEliminate bool, score int32, count i
 						break
 					}
 				}
-				if newElem != 0 {
+				if newElem == 0 {
 					newElem = k + 2*Width // 给个默认值
 				}
 
@@ -581,10 +581,58 @@ func (this *MapData) SkillUp(skillid int32, value int32) (szMap []*pb.MapData) {
 }
 
 // 随机生成 不可消除的 地图
-// func (this *MapData) CheckInitPlat() {
+func (this *MapData) CheckInitPlat() {
-// 	this.Plat = make([]*pb.GirdeData, Width*Height)
+	this.Plat = make([]*pb.GirdeData, Width*Height)
-// 	for i := 0; i < Width*Height; i++ {
+	for i := 0; i < Width*Height; i++ {
-// 		this.Plat[i] = this.CreateGride(int32(i))
+		this.Plat[i] = this.CreateGride(int32(i))
 
+	}
+}
+
+// 1, 1, 2, 5, 1, 5, 2,
+// 3, 2, 3, 1, 2, 4, 4,
+// 2, 1, 1, 3, 6, 4, 1,
+// 4, 1, 1, 4, 3, 6, 3,
+// 4, 3, 4, 5, 1, 6, 1,
+// 5, 4, 2, 5, 3, 3, 1,
+// 4, 1, 5, 3, 2, 3, 4,
+
+// 校验当前地图 有没有能消除的
+// func (this *MapData) CheckAndRefreshPlat() {
+// 	bEliminate := false
+// 	for k, v := range this.Plat {
+// 		if v.Color == 0 {
+// 			continue
+// 		}
+// 		x := int32(k % Height) // x
+// 		y := int32(k / Height) // y
+// 		if x+1 < Height {
+// 			k1 := this.Plat[k].Color
+// 			k2 := this.Plat[k+1].Color
+// 			if k1 == k2 {
+// 				if x > 0 {
+
+// 				}
+// 			}
+
+// 			k3 := this.Plat[k+2].Color
+// 			// 找k+3的 上 左 又
+// 			if k1 == k2 && k2 == k3 {
+// 				bEliminate = true
+// 			}
+// 		}
+
+// 		if k+2*Width < Total {
+// 			k1 := this.Plat[k].Color
+// 			k2 := this.Plat[k+Width].Color
+// 			k3 := this.Plat[k+2*Width].Color
+
+// 			if k1 == k2 && k2 == k3 {
+// 				bEliminate = true
+// 			}
+// 		}
+// 	}
+// 	if bEliminate {
+// 		this.CheckInitPlat()
 // 	}
 // }

pb/entertain_db.pb.go

@@ -257,8 +257,9 @@ type DBXXLMatch struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"`
+	Userinfo   *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"`
-	Cardid   string        `protobuf:"bytes,2,opt,name=cardid,proto3" json:"cardid"` // 选择的卡片ID
+	Cardid     string        `protobuf:"bytes,2,opt,name=cardid,proto3" json:"cardid"`          // 选择的卡片ID
+	Consumeexp int32         `protobuf:"varint,3,opt,name=consumeexp,proto3" json:"consumeexp"` //
 }
 
 func (x *DBXXLMatch) Reset() {
@@ -307,6 +308,13 @@ func (x *DBXXLMatch) GetCardid() string {
 	return ""
 }
 
+func (x *DBXXLMatch) GetConsumeexp() int32 {
+	if x != nil {
+		return x.Consumeexp
+	}
+	return 0
+}
+
 var File_entertain_entertain_db_proto protoreflect.FileDescriptor
 
 var file_entertain_entertain_db_proto_rawDesc = []byte{
@@ -335,12 +343,14 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{
 	0x73, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65,
 	0x72, 0x67, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67,
-	0x79, 0x22, 0x4f, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
+	0x79, 0x22, 0x6f, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
 	0x29, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f,
 	0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x61,
 	0x72, 0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x61, 0x72, 0x64,
-	0x69, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65, 0x78, 0x70,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x65,
+	0x78, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x33,
 }
 

pb/entertain_msg.pb.go

@@ -161,7 +161,7 @@ type EntertainCancelMatchResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Maych bool `protobuf:"varint,1,opt,name=maych,proto3" json:"maych"` // 匹配成功
+	Maych bool `protobuf:"varint,1,opt,name=maych,proto3" json:"maych"` // 取消匹配成功
 }
 
 func (x *EntertainCancelMatchResp) Reset() {
@@ -944,6 +944,148 @@ func (x *EntertainReconnectResp) GetUser2() *PlayerData {
 	return nil
 }
 
+type EntertainRefreshPlatReq struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"`
+}
+
+func (x *EntertainRefreshPlatReq) Reset() {
+	*x = EntertainRefreshPlatReq{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_entertain_entertain_msg_proto_msgTypes[14]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EntertainRefreshPlatReq) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EntertainRefreshPlatReq) ProtoMessage() {}
+
+func (x *EntertainRefreshPlatReq) ProtoReflect() protoreflect.Message {
+	mi := &file_entertain_entertain_msg_proto_msgTypes[14]
+	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 EntertainRefreshPlatReq.ProtoReflect.Descriptor instead.
+func (*EntertainRefreshPlatReq) Descriptor() ([]byte, []int) {
+	return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{14}
+}
+
+func (x *EntertainRefreshPlatReq) GetRoomid() string {
+	if x != nil {
+		return x.Roomid
+	}
+	return ""
+}
+
+type EntertainRefreshPlatResp struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Mpadata *MapData `protobuf:"bytes,1,opt,name=mpadata,proto3" json:"mpadata"` // 地图数据
+}
+
+func (x *EntertainRefreshPlatResp) Reset() {
+	*x = EntertainRefreshPlatResp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_entertain_entertain_msg_proto_msgTypes[15]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EntertainRefreshPlatResp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EntertainRefreshPlatResp) ProtoMessage() {}
+
+func (x *EntertainRefreshPlatResp) ProtoReflect() protoreflect.Message {
+	mi := &file_entertain_entertain_msg_proto_msgTypes[15]
+	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 EntertainRefreshPlatResp.ProtoReflect.Descriptor instead.
+func (*EntertainRefreshPlatResp) Descriptor() ([]byte, []int) {
+	return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{15}
+}
+
+func (x *EntertainRefreshPlatResp) GetMpadata() *MapData {
+	if x != nil {
+		return x.Mpadata
+	}
+	return nil
+}
+
+// 刷新地图推送
+type EntertainRefreshPush struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Mpadata *MapData `protobuf:"bytes,1,opt,name=mpadata,proto3" json:"mpadata"` // 地图数据
+}
+
+func (x *EntertainRefreshPush) Reset() {
+	*x = EntertainRefreshPush{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_entertain_entertain_msg_proto_msgTypes[16]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EntertainRefreshPush) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EntertainRefreshPush) ProtoMessage() {}
+
+func (x *EntertainRefreshPush) ProtoReflect() protoreflect.Message {
+	mi := &file_entertain_entertain_msg_proto_msgTypes[16]
+	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 EntertainRefreshPush.ProtoReflect.Descriptor instead.
+func (*EntertainRefreshPush) Descriptor() ([]byte, []int) {
+	return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{16}
+}
+
+func (x *EntertainRefreshPush) GetMpadata() *MapData {
+	if x != nil {
+		return x.Mpadata
+	}
+	return nil
+}
+
 var File_entertain_entertain_msg_proto protoreflect.FileDescriptor
 
 var file_entertain_entertain_msg_proto_rawDesc = []byte{
@@ -1051,8 +1193,19 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{
 	0x72, 0x31, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65,
 	0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05,
 	0x75, 0x73, 0x65, 0x72, 0x32, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c,
-	0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x42,
+	0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x22,
-	0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x31, 0x0a, 0x17, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72,
+	0x65, 0x73, 0x68, 0x50, 0x6c, 0x61, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f,
+	0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
+	0x69, 0x64, 0x22, 0x3e, 0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52,
+	0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x50, 0x6c, 0x61, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22,
+	0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61,
+	0x74, 0x61, 0x22, 0x3a, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52,
+	0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70,
+	0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61,
+	0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06,
+	0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1067,7 +1220,7 @@ func file_entertain_entertain_msg_proto_rawDescGZIP() []byte {
 	return file_entertain_entertain_msg_proto_rawDescData
 }
 
-var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
+var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
 var file_entertain_entertain_msg_proto_goTypes = []interface{}{
 	(*EntertainMatchReq)(nil),        // 0: EntertainMatchReq
 	(*EntertainMatchResp)(nil),       // 1: EntertainMatchResp
@@ -1083,31 +1236,36 @@ var file_entertain_entertain_msg_proto_goTypes = []interface{}{
 	(*EntertainEnterRoomPush)(nil),   // 11: EntertainEnterRoomPush
 	(*EntertainReconnectReq)(nil),    // 12: EntertainReconnectReq
 	(*EntertainReconnectResp)(nil),   // 13: EntertainReconnectResp
-	(*PlayerData)(nil),               // 14: PlayerData
+	(*EntertainRefreshPlatReq)(nil),  // 14: EntertainRefreshPlatReq
-	(*MapData)(nil),                  // 15: MapData
+	(*EntertainRefreshPlatResp)(nil), // 15: EntertainRefreshPlatResp
-	(*UserAtno)(nil),                 // 16: UserAtno
+	(*EntertainRefreshPush)(nil),     // 16: EntertainRefreshPush
+	(*PlayerData)(nil),               // 17: PlayerData
+	(*MapData)(nil),                  // 18: MapData
+	(*UserAtno)(nil),                 // 19: UserAtno
 }
 var file_entertain_entertain_msg_proto_depIdxs = []int32{
-	14, // 0: EntertainStartGamePush.user1:type_name -> PlayerData
+	17, // 0: EntertainStartGamePush.user1:type_name -> PlayerData
-	14, // 1: EntertainStartGamePush.user2:type_name -> PlayerData
+	17, // 1: EntertainStartGamePush.user2:type_name -> PlayerData
-	15, // 2: EntertainStartGamePush.mpadata:type_name -> MapData
+	18, // 2: EntertainStartGamePush.mpadata:type_name -> MapData
-	15, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData
+	18, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData
-	14, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData
+	17, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData
-	14, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData
+	17, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData
-	14, // 6: EntertainGameOverPush.user1:type_name -> PlayerData
+	17, // 6: EntertainGameOverPush.user1:type_name -> PlayerData
-	14, // 7: EntertainGameOverPush.user2:type_name -> PlayerData
+	17, // 7: EntertainGameOverPush.user2:type_name -> PlayerData
-	15, // 8: EntertainGameOverPush.mpadata:type_name -> MapData
+	18, // 8: EntertainGameOverPush.mpadata:type_name -> MapData
-	16, // 9: EntertainGameOverPush.reward:type_name -> UserAtno
+	19, // 9: EntertainGameOverPush.reward:type_name -> UserAtno
-	14, // 10: EntertainEnterRoomPush.user1:type_name -> PlayerData
+	17, // 10: EntertainEnterRoomPush.user1:type_name -> PlayerData
-	14, // 11: EntertainEnterRoomPush.user2:type_name -> PlayerData
+	17, // 11: EntertainEnterRoomPush.user2:type_name -> PlayerData
-	15, // 12: EntertainReconnectResp.mpadata:type_name -> MapData
+	18, // 12: EntertainReconnectResp.mpadata:type_name -> MapData
-	14, // 13: EntertainReconnectResp.user1:type_name -> PlayerData
+	17, // 13: EntertainReconnectResp.user1:type_name -> PlayerData
-	14, // 14: EntertainReconnectResp.user2:type_name -> PlayerData
+	17, // 14: EntertainReconnectResp.user2:type_name -> PlayerData
-	15, // [15:15] is the sub-list for method output_type
+	18, // 15: EntertainRefreshPlatResp.mpadata:type_name -> MapData
-	15, // [15:15] is the sub-list for method input_type
+	18, // 16: EntertainRefreshPush.mpadata:type_name -> MapData
-	15, // [15:15] is the sub-list for extension type_name
+	17, // [17:17] is the sub-list for method output_type
-	15, // [15:15] is the sub-list for extension extendee
+	17, // [17:17] is the sub-list for method input_type
-	0,  // [0:15] is the sub-list for field type_name
+	17, // [17:17] is the sub-list for extension type_name
+	17, // [17:17] is the sub-list for extension extendee
+	0,  // [0:17] is the sub-list for field type_name
 }
 
 func init() { file_entertain_entertain_msg_proto_init() }
@@ -1286,6 +1444,42 @@ func file_entertain_entertain_msg_proto_init() {
 				return nil
 			}
 		}
+		file_entertain_entertain_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EntertainRefreshPlatReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_entertain_entertain_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EntertainRefreshPlatResp); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_entertain_entertain_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EntertainRefreshPush); 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{
@@ -1293,7 +1487,7 @@ func file_entertain_entertain_msg_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_entertain_entertain_msg_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   14,
+			NumMessages:   17,
 			NumExtensions: 0,
 			NumServices:   0,
 		},