好友优化

src/server/GoUtil/GoUtil.go

@@ -211,7 +211,7 @@ func GobUnmarshal(data []byte, obj interface{}) error {
 }
 
 func GetServerIdByUid(uid int) int {
-	return int(uid / 100000)
+	return int((uid % 100000000) / 100000)
 }
 
 func CreateOrderSn(uid int) string {

src/server/cluster/ClusterFunc.go

@@ -120,6 +120,7 @@ func SendServerMsg(m *msg.Msg, serverId int) error {
 			return err
 		}
 		v.(network.Agent).WriteMsg(data)
+		return nil
 	}
 	return fmt.Errorf("server %d not online", serverId)
 }

src/server/game/FriendMgr.go

@@ -110,10 +110,12 @@ func FriendMgrSend(m *msg.Msg) error {
 		err := mergeCluster.SendServerMsg(m, ToServer)
 		if err != nil { // 区服不在线
 			G_GameLogicPtr.FriendMgrSend(m)
+			log.Debug("send to server %d error : %s\n", ToServer, err)
 			return err
 		}
 		return nil
 	}
+	log.Debug("send to server %d success, %d", ToServer, conf.Server.ServerID)
 	G_GameLogicPtr.FriendMgrSend(m)
 	return nil
 }

src/server/game/RegisterNetworkFunc.go

@@ -1319,7 +1319,7 @@ func ReqApplyFriend(args []interface{}) error {
 		})
 		return fmt.Errorf("already friend")
 	}
-	if FriendMod.CheckSendApply(Uid) {
+	if FriendMod.AddSendApply(Uid) {
 		player.SendErrClienRes(&msg.ResApplyFriend{
 			Code: msg.RES_CODE_FAIL,
 			Msg:  "already apply",

src/server/game/mod/friend/Friend.go

@@ -56,6 +56,9 @@ func (f *FriendMod) InitData() {
 	if f.Card == nil {
 		f.Card = make(map[string]*card.CardInfo)
 	}
+	if f.SendApply == nil {
+		f.SendApply = make(map[int]int64)
+	}
 }
 
 func (f *FriendMod) AddFriend(id int) {
@@ -113,8 +116,12 @@ func (f *FriendMod) AddFriendApply(Uid int) {
 }
 
 // 发送申请
-func (f *FriendMod) AddSendApply(Uid int) {
+func (f *FriendMod) AddSendApply(Uid int) bool {
+	if _, ok := f.SendApply[Uid]; ok {
+		return true
+	}
 	f.SendApply[Uid] = GoUtil.Now()
+	return false
 }
 
 func (f *FriendMod) CheckSendApply(Id int) bool {