gamesrv/thirteen/scenepolicy.go

@@ -1234,8 +1234,11 @@ func (this *StateHit) OnEnter(s *base.Scene) {
 				}
 			}
 		}
-		// 每个打枪加2秒，全垒打再加2秒
-		sceneEx.hitTime += time.Second * 2 * (time.Duration(hitNum))
+		if sceneEx.isCanAllHitPos != -1 {
+			hitNum++
+		}
+		// 每个打枪加1秒，全垒打再加1秒
+		sceneEx.hitTime += time.Second * (time.Duration(hitNum))
 		sceneEx.ShowCards()
 	}
 }

worldsrv/friendmgr.go

@@ -511,7 +511,7 @@ func (this *FriendMgr) FriendApply(p *Player, destP *model.BindFriend) {
 // p 同意者
 // destP 申请者
 func (this *FriendMgr) FriendAgree(p *Player, destP *model.BindFriend) {
-	var applyList, meApplyList []int32
+	var applyList []int32
 	SendToClick := func(retCode friend.OpResultCode, self ...bool) {
 		pack := &friend.SCFriendOp{
 			OpCode:    proto.Int32(OpTypeAgree),
@@ -534,10 +534,6 @@ func (this *FriendMgr) FriendAgree(p *Player, destP *model.BindFriend) {
 				RoleId:   int32(roleId),
 			}
 			p.SendToClient(int(friend.FriendPacketID_PACKET_SCFriendOp), pack)
-			if meApplyList != nil {
-				p.ApplyList = meApplyList
-				this.SendApplyList(p)
-			}
 		} else {
 			destPs := PlayerMgrSington.GetPlayerBySnId(destP.SnId)
 			if destPs != nil && destPs.IsOnLine() {
@@ -617,42 +613,32 @@ func (this *FriendMgr) FriendAgree(p *Player, destP *model.BindFriend) {
 			// 删除被申请者的申请列表
 			list1, err := model.QueryFriendApplyBySnid(plt, snid)
 			if err != nil {
-				logger.Logger.Errorf("QueryFriendApplyBySnid %v error: %v", snid, err)
 				return friend.OpResultCode_OPRC_Error
 			}
-			if list1 != nil {
-				for k, v := range list1.ApplySnids {
-					if v.SnId == applySnid {
-						list1.ApplySnids = append(list1.ApplySnids[:k], list1.ApplySnids[k+1:]...)
-						model.UpsertFriendApply(plt, snid, list1)
-						break
-					}
+			for k, v := range list1.ApplySnids {
+				if v.SnId == applySnid {
+					list1.ApplySnids = append(list1.ApplySnids[:k], list1.ApplySnids[k+1:]...)
+					model.UpsertFriendApply(plt, snid, list1)
+					break
 				}
 			}
 			// 删除发起方的申请列表
 			list2, err := model.QueryFriendApplyListBySnid(plt, applySnid)
 			if err != nil {
-				logger.Logger.Errorf("QueryFriendApplyListBySnid %v error: %v", applySnid, err)
 				return friend.OpResultCode_OPRC_Error
 			}
-			if list2 != nil {
-				for k, v := range list2.List {
-					if v == snid {
-						list2.List = append(list2.List[:k], list2.List[k+1:]...)
-						model.UpsertApplyList(plt, list2)
-						break
-					}
+			for k, v := range list2.List {
+				if v == snid {
+					list2.List = append(list2.List[:k], list2.List[k+1:]...)
+					model.UpsertApplyList(plt, list2)
+					break
 				}
 			}
 
-			if applySnid == destP.SnId && list2 != nil {
+			if applySnid == destP.SnId {
 				applyList = list2.List
 			}
 
-			if applySnid == p.SnId && list2 != nil {
-				meApplyList = list2.List
-			}
-
 			return friend.OpResultCode_OPRC_Sucess
 		}
 
@@ -672,9 +658,10 @@ func (this *FriendMgr) FriendAgree(p *Player, destP *model.BindFriend) {
 				CreateTime: time.Now().Unix(),
 			})
 			model.UpsertFriend(friendDB)
+			return friend.OpResultCode_OPRC_Sucess
 		}
 
-		return nil
+		return friend.OpResultCode_OPRC_Error
 	}), task.CompleteNotifyWrapper(func(data interface{}, tt task.Task) {
 		if data != nil {
 			logger.Logger.Error("FriendAgree data:", data)