dbproxy/svc/u_bag.go

@@ -101,8 +101,7 @@ func (svc *BagSvc) AddBagItem(args *model.BagInfo, ret *bool) error {
 	for id, v := range args.BagItem {
 		if item, exist := bag.BagItem[id]; !exist {
 			if v.ItemNum <= 0 {
-				err = errors.New("item num not enough")
-				break
+				continue
 			}
 			bag.BagItem[id] = &model.Item{
 				ItemId:     v.ItemId,
@@ -111,8 +110,7 @@ func (svc *BagSvc) AddBagItem(args *model.BagInfo, ret *bool) error {
 			}
 		} else {
 			if v.ItemNum < 0 && -v.ItemNum > item.ItemNum {
-				err = errors.New("item num not enough")
-				break
+				v.ItemNum = -item.ItemNum
 			}
 			item.ItemNum += v.ItemNum
 		}
@@ -121,18 +119,10 @@ func (svc *BagSvc) AddBagItem(args *model.BagInfo, ret *bool) error {
 			vCard = v.ItemNum
 		}
 	}
-
-	if err != nil {
-		*ret = false
-		logger.Logger.Errorf("AddBagItem error: %v", err)
-		return err
-	}
-
 	_, err = cbag.Upsert(bson.M{"_id": bag.BagId}, bag)
 	if err != nil {
 		*ret = false
 		logger.Logger.Info("AddBagItem error ", err)
-		return err
 	}
 
 	// v卡返还

gamesrv/action/action_server.go

@@ -73,7 +73,7 @@ func HandleWGBuyRecTimeItem(session *netlib.Session, packetId int, data interfac
 //	return nil
 //}
 
-func CreateScene(session *netlib.Session, packetId int, data interface{}) error {
+func CreateSceneHandler(session *netlib.Session, packetId int, data interface{}) error {
 	logger.Logger.Tracef("receive CreateScene %v", data)
 	msg, ok := data.(*server.WGCreateScene)
 	if !ok {
@@ -86,53 +86,52 @@ func CreateScene(session *netlib.Session, packetId int, data interface{}) error
 	return nil
 }
 
-func DestroyScene(session *netlib.Session, packetId int, data interface{}) error {
-	logger.Logger.Trace("receive WGDestroyScene:", data)
-	msg, ok := data.(*server.WGDestroyScene)
-	if !ok {
-		return nil
-	}
-
-	if !msg.IsGrace {
-		// 立刻删除，不管游戏是否结束
-		for _, v := range msg.Ids {
-			s := base.SceneMgrSington.GetScene(int(v))
-			if s == nil {
-				continue
-			}
-			if gameScene, ok := s.ExtraData.(base.GameScene); ok {
-				gameScene.SceneDestroy(true)
-			}
-		}
-		return nil
-	}
-
-	// 游戏结束后删除房间
-	for _, v := range msg.Ids {
-		s := base.SceneMgrSington.GetScene(int(v))
-		if s == nil {
-			continue
-		}
-		if s.IsHundredScene() || s.Gaming {
-			s.SetGraceDestroy()
-		} else {
-			if s.IsMatchScene() {
-				s.SetGraceDestroy()
-			}
-			if gameScene, ok := s.ExtraData.(base.GameScene); ok {
-				gameScene.SceneDestroy(true)
-			}
-		}
-	}
-
-	return nil
-}
-
 func init() {
 	// 创建房间
-	netlib.Register(int(server.SSPacketID_PACKET_WG_CREATESCENE), &server.WGCreateScene{}, CreateScene)
-	// 删除房间
-	netlib.Register(int(server.SSPacketID_PACKET_WG_DESTROYSCENE), &server.WGDestroyScene{}, DestroyScene)
+	netlib.Register(int(server.SSPacketID_PACKET_WG_CREATESCENE), &server.WGCreateScene{}, CreateSceneHandler)
+
+	//删除场景
+	// 立刻删除，不管游戏是否结束
+	netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_DESTROYSCENE), netlib.PacketFactoryWrapper(func() interface{} {
+		return &server.WGDestroyScene{}
+	}))
+	netlib.RegisterHandler(int(server.SSPacketID_PACKET_WG_DESTROYSCENE), netlib.HandlerWrapper(func(s *netlib.Session, packetid int, pack interface{}) error {
+		logger.Logger.Trace("receive WGDestroyScene:", pack)
+		msg, ok := pack.(*server.WGDestroyScene)
+		if !ok {
+			return nil
+		}
+		if !msg.IsGrace {
+			// 立刻删除，不管游戏是否结束
+			for _, v := range msg.Ids {
+				s := base.SceneMgrSington.GetScene(int(v))
+				if s != nil {
+					if gameScene, ok := s.ExtraData.(base.GameScene); ok {
+						gameScene.SceneDestroy(true)
+					}
+				}
+			}
+		} else {
+			// 游戏结束后删除房间
+			for _, v := range msg.Ids {
+				s := base.SceneMgrSington.GetScene(int(v))
+				if s != nil {
+					if s.IsHundredScene() || s.Gaming {
+						s.SetGraceDestroy(true)
+					} else {
+						if s.IsMatchScene() {
+							s.SetGraceDestroy(true)
+						}
+						if gameScene, ok := s.ExtraData.(base.GameScene); ok {
+							gameScene.SceneDestroy(true)
+						}
+					}
+				}
+			}
+		}
+
+		return nil
+	}))
 
 	//玩家进入
 	netlib.RegisterFactory(int(server.SSPacketID_PACKET_WG_PLAYERENTER), netlib.PacketFactoryWrapper(func() interface{} {

gamesrv/base/scene.go

@@ -297,8 +297,8 @@ func (this *Scene) SetScenePolicy(sp ScenePolicy) {
 func (this *Scene) GetGraceDestroy() bool {
 	return this.graceDestroy
 }
-func (this *Scene) SetGraceDestroy() {
-	this.graceDestroy = true
+func (this *Scene) SetGraceDestroy(graceDestroy bool) {
+	this.graceDestroy = graceDestroy
 }
 
 func (this *Scene) GetCpControlled() bool {

worldsrv/trascate_webapi.go

@@ -3761,21 +3761,15 @@ func init() {
 			p := PlayerMgrSington.GetPlayerBySnId(msg.GetSnid())
 			if p != nil {
 				//获取道具Id
-				_, _, ok := BagMgrSingleton.AddItemsV2(&model.AddItemParam{
+				BagMgrSingleton.AddItemsV2(&model.AddItemParam{
 					P:        p.PlayerData,
 					Change:   items,
 					GainWay:  msg.GetTypeId(),
 					Operator: "system",
 					Remark:   msg.GetRemark(),
 				})
-				if !ok {
-					logger.Logger.Errorf("player delete %v err: %v", msg, err)
-					pack.Tag = webapiproto.TagCode_FAILED
-					pack.Msg = "修改道具失败"
-					return common.ResponseTag_Ok, pack
-				}
 				pack.Tag = webapiproto.TagCode_SUCCESS
-				pack.Msg = "修改道具成功"
+				pack.Msg = "AddItem success"
 				return common.ResponseTag_Ok, pack
 			} else {
 				BagMgrSingleton.AddItemsOffline(msg.Platform, msg.Snid, items, msg.GetTypeId(),