Merge remote-tracking branch 'origin/develop' into dev_slots

gamesrv/clawdoll/player_clawdoll.go

@@ -117,6 +117,8 @@ func (this *PlayerEx) CostPlayCoin() bool {
 		GameFreeId: int64(sceneEx.GetGameFreeId()),
 	})
 
+	sceneEx.PayCoinCount++
+
 	logger.Logger.Tracef("Clawdoll (*PlayerEx) CostPlayCoin, items = %v", items)
 	return true
 }

gamesrv/clawdoll/scene_clawdoll.go

@@ -428,6 +428,10 @@ func (this *SceneEx) TimeOutPlayGrab() bool {
 	playerEx := this.players[this.playingSnid]
 	if playerEx != nil {
 		grapType := this.GetPlayGrabType(playerEx)
+		if grapType == rule.ClawStrong {
+			this.PayCoinCount = 0
+		}
+
 		this.OnPlayerSMGrabOp(this.playingSnid, int32(this.machineId), grapType)
 
 	}

gamesrv/clawdoll/scenepolicy_clawdoll.go

@@ -684,6 +684,9 @@ func (this *PlayGame) OnPlayerOp(s *base.Scene, p *base.Player, opcode int, para
 		}
 
 		grapType := sceneEx.GetPlayGrabType(playerEx)
+		if grapType == rule.ClawStrong {
+			sceneEx.PayCoinCount = 0
+		}
 
 		logger.Logger.Trace("ClawDoll StatePlayGame OnPlayerOp Grab-----SnId:", p.SnId, " grapType: ", grapType)
 		//1-弱力抓 2 -强力抓
@@ -840,7 +843,7 @@ func (this *StateBilled) OnEnter(s *base.Scene) {
 		}
 
 		playerEx.lastIsWin = playerEx.IsWin
-		sceneEx.PayCoinCount++
+
 		playerEx.ReStartGame()
 	}
 }

model/player.go

@@ -122,8 +122,14 @@ const (
 	ActivityLog_PhoneLottery              //积分抽奖
 	ActivityLog_DiamondLottery            //钻石抽奖
 	ActivityLog_CollectBox                //开启礼盒集卡
-	ActivityLog_WeekCard                  //领取周卡奖励
+	ActivityLog_WeekCard                  //周卡
 	ActivityLog_Permit                    //通行证
+	ActivityLog_FirstPay                  // 超值首冲
+	ActivityLog_BlindBox                  // 开盲盒
+	ActivityLog_ContinuousPay             // 累计充值
+	ActivityLog_PigBank                   // 购买存钱罐
+	ActivityLog_Shop                      //商城购买
+	ActivityLog_Exchange                  //商城兑换
 )
 
 type PlayerGameCtrlData struct {

worldsrv/shopmgr.go

@@ -84,16 +84,6 @@ const (
 	Shop_Status_NotSend        // 3为审核不通过
 	Shop_Status_Revoke         // 4为撤单
 )
-const (
-	Shop_Type_FirstPay      = iota + 1 // 超值首冲
-	Shop_Type_BlindBox                 // 开盲盒
-	SHop_Type_ContinuousPay            // 累计充值
-	Shop_Type_WeekCard                 // 购买周卡
-	Shop_Type_PigBank                  // 购买存钱罐
-	Shop_Type_Permit                   //购买通行证
-	Shop_Type_Shop                     //商城购买
-	Shop_Type_Exchange                 //商城兑换
-)
 
 /*
 1.兑换成功：兑换成功，请等待审核
@@ -1339,15 +1329,15 @@ func (this *ShopMgr) SendAPICreateOrder(p *Player, ConfigPayId int32, data any,
 				logger.Logger.Errorf("model.InsertDbShopLog err:", err)
 				return nil
 			}
-			buyType := Shop_Type_Shop
+			buyType := model.ActivityLog_Shop
 			if shopInfo.Page == ShopPagePermit {
-				buyType = Shop_Type_Permit
+				buyType = model.ActivityLog_Permit
 			}
 			if shopInfo.Page == ShopPageDiamondBank {
-				buyType = Shop_Type_PigBank
+				buyType = model.ActivityLog_PigBank
 			}
 			if shopInfo.Page == ShopPageGift {
-				buyType = Shop_Type_WeekCard
+				buyType = model.ActivityLog_WeekCard
 			}
 			return webapi.API_CreateOrder(common.GetAppId(), dbShop.LogId.Hex(), ConfigPayId, p.SnId, shopInfo.Id, p.Platform, p.PackageID, p.DeviceOS,
 				p.DeviceId, shopInfo.Name, amount, costNum, webItemInfo, "", p.Channel, p.ChannelId, int32(buyType))
@@ -1375,7 +1365,7 @@ func (this *ShopMgr) SendAPICreateOrder(p *Player, ConfigPayId int32, data any,
 			//兑换 充值订单
 			logger.Logger.Infof("客户端请求兑换 创建支付订单！AppId = %v,SnId = %v,Id = %v,dbShop.LogId.Hex() = %v,cash = %v", common.GetAppId(), p.SnId, cdata.Id, dbShop.LogId.Hex(), info.Cash*cdata.ExchangeNum)
 			return webapi.API_CreateOrder(common.GetAppId(), dbShop.LogId.Hex(), ConfigPayId, p.SnId, cdata.Id, p.Platform, p.PackageID, p.DeviceOS,
-				p.DeviceId, cdata.Name, amount, info.Cash*cdata.ExchangeNum, nil, orderId, p.Channel, p.ChannelId, Shop_Type_Exchange)
+				p.DeviceId, cdata.Name, amount, info.Cash*cdata.ExchangeNum, nil, orderId, p.Channel, p.ChannelId, model.ActivityLog_Exchange)
 		} else if bbd, ok := data.(*webapi_proto.BlindBoxData); ok {
 			if bbd.Type == ShopTypeCoin {
 				//金币
@@ -1392,7 +1382,7 @@ func (this *ShopMgr) SendAPICreateOrder(p *Player, ConfigPayId int32, data any,
 				return nil
 			}
 			return webapi.API_CreateOrder(common.GetAppId(), dbShop.LogId.Hex(), ConfigPayId, p.SnId, 0, p.Platform, p.PackageID, p.DeviceOS,
-				p.DeviceId, bbd.Name, amount, int32(bbd.Price2), nil, "", p.Channel, p.ChannelId, Shop_Type_BlindBox)
+				p.DeviceId, bbd.Name, amount, int32(bbd.Price2), nil, "", p.Channel, p.ChannelId, model.ActivityLog_BlindBox)
 		} else if wfs, ok := data.(*webapi_proto.WelfareSpree); ok {
 			var items []model.ItemInfo
 			var webItemInfo []*webapi_proto.ItemInfo
@@ -1413,10 +1403,10 @@ func (this *ShopMgr) SendAPICreateOrder(p *Player, ConfigPayId int32, data any,
 				}
 			}
 			var gainWay int32 = common.GainWay_ActFirstPay
-			buyType := Shop_Type_FirstPay
+			buyType := model.ActivityLog_FirstPay
 			if remark == "ContinuousPay" {
 				gainWay = common.GainWay_ActContinuousPay
-				buyType = SHop_Type_ContinuousPay
+				buyType = model.ActivityLog_ContinuousPay
 			}
 			dbShop = this.NewDbShop(p, 0, amount[:], ShopConsumeMoney, int32(wfs.Price2), gainWay, items, 0, "", 0, remark, []int32{wfs.Day})
 			err := model.InsertDbShopLog(dbShop)