worldsrv/action_friend.go

@@ -532,22 +532,6 @@ func (this *CSInviteFriendOpHandler) Process(s *netlib.Session, packetid int, da
 				opRetCode = friend.OpResultCode_OPRC_Error //进入房间失败
 				send(p)
 				return nil
-			} else {
-				// 进入成功
-				for _, v := range scene.players {
-					if v == nil || len(v.TaskInviteList) == 0 || v.SnId == p.SnId {
-						continue
-					}
-					if v.TaskInviteList[p.SnId] == scene.sceneId {
-						delete(v.TaskInviteList, p.SnId)
-						TaskSubjectSingleton.Touch(common.TaskTypeInvitePlay, &TaskData{
-							SnId:       v.SnId,
-							GameID:     scene.gameId,
-							GameFreeID: scene.dbGameFree.GetId(),
-							Num:        1,
-						})
-					}
-				}
 			}
 		case Invite_Refuse:
 			logger.Logger.Trace("拒绝邀请")

worldsrv/action_game.go

@@ -167,6 +167,22 @@ func (this *CSEnterRoomHandler) Process(s *netlib.Session, packetid int, data in
 
 	if !scene.PlayerEnter(p, -1, true) {
 		code = gamehall.OpResultCode_Game_OPRC_Error_Game
+	} else {
+		// 进入成功
+		for _, v := range scene.players {
+			if v == nil || len(v.TaskInviteList) == 0 || v.SnId == p.SnId {
+				continue
+			}
+			if v.TaskInviteList[p.SnId] == scene.sceneId {
+				delete(v.TaskInviteList, p.SnId)
+				TaskSubjectSingleton.Touch(common.TaskTypeInvitePlay, &TaskData{
+					SnId:       v.SnId,
+					GameID:     scene.gameId,
+					GameFreeID: scene.dbGameFree.GetId(),
+					Num:        1,
+				})
+			}
+		}
 	}
 
 failed:

worldsrv/action_shop.go

@@ -432,13 +432,6 @@ func (this *CSPayInfoHandler) Process(s *netlib.Session, packetid int, data inte
 									return nil
 								}*/
 			}
-			if shopInfo.Page == ShopPagePermit {
-				if p.GetIsPermit() {
-					logger.Logger.Error("已购买典藏通行证")
-					SendClient(shop.OpResultCode_OPRC_Error)
-					return nil
-				}
-			}
 			ShopMgrSington.SendAPICreateOrder(p, msg.ConfigPayId, shopInfo, "shop_goods_xj")
 
 		} else {

worldsrv/tournament.go

@@ -1546,7 +1546,7 @@ func (this *Tournament) MakeMatchLog(platform string, tmId int32, sortId int64)
 			Item:        items,
 			Rank:        rankId,
 		})
-		if rankId >= 1 && rankId <= 10 {
+		if rankId >= 10 {
 			TaskSubjectSingleton.Touch(common.TaskTypeMatchRank10, &TaskData{
 				SnId: v.p.SnId,
 				Num:  1,