修改底层map

logic/controller/map.go

@@ -3,7 +3,6 @@ package controller
 import (
 	"blazing/common/socket/errorcode"
 
-	"blazing/logic/service/common"
 	"blazing/logic/service/maphot"
 	"blazing/logic/service/maps"
 	"blazing/logic/service/player"
@@ -14,9 +13,9 @@ import (
 
 func (h *Controller) MapEnter(data *maps.InInfo, c *player.Player) (result *maps.OutInfo, err errorcode.ErrorCode) { //这个时候player应该是空的
 
-	c.Info.MapID = data.MapId //登录地图
-	t := space.GetSpace(c.Info.MapID)
-	t.Set(c.Info.UserID, c) //添加玩家
+	c.Info.MapID = data.MapId                               //登录地图
+	space.GetSpace(c.Info.MapID).User.Set(c.Info.UserID, c) //添加玩家
+
 	result = maps.NewOutInfo()
 	c.Info.Pos = data.Point
 	copier.Copy(result, c.Info)
@@ -38,7 +37,7 @@ func (h *Controller) MapLeave(data *maps.LeaveMapInboundInfo, c *player.Player)
 	//result = &maps.LeaveMapOutboundInfo{UserID: c.GetUserID()}
 	c.Canmon = false                                                                //可以刷怪
 	data.Broadcast(c.Info.MapID, space.LeaveMapOutboundInfo{UserID: c.Info.UserID}) //同步广播
-	space.GetSpace(c.Info.MapID).Delete(c.Info.UserID)
+	space.GetSpace(c.Info.MapID).User.Remove(c.Info.UserID)
 	// 如果有正在运行的刷怪协程，发送停止信号
 
 	c.Info.MapID = 0 // 重置当前地图
@@ -49,12 +48,11 @@ func (h *Controller) MapList(data *maps.ListMapPlayerInboundInfo, c *player.Play
 	result = &maps.ListMapPlayerOutboundInfo{}
 	result.Player = make([]maps.OutInfo, 0)
 
-	space.GetSpace(c.Info.MapID).Range(func(userID uint32, player common.PlayerI) bool {
+	for _, v := range space.GetSpace(c.Info.MapID).User.Items() {
 		result1 := maps.NewOutInfo()
-		copier.Copy(result1, player.GetInfo())
+		copier.Copy(result1, v.GetInfo())
 		result.Player = append(result.Player, *result1)
-		return true
-	})
+	}
 	c.Canmon = true //可以刷怪
 	return
 }