11

RO_Server_Trunk-branch_0.1.39/roserver/game/model/role.go

@@ -4014,11 +4014,16 @@ func (this *Role) payInfoGet(goodsType, goodsId, count int32, rushStage, rushRou
 func (this *Role) OnPayCallback(payRewardInfo *serverproto.PayOrderSaveInfo, bSave bool, bAck, bCash bool) {
 	//获取充值奖励
 	var addItemList = map[int32]int32{}
+	var itemlist = []*serverproto.KeyValueType{}
 	for idx := 0; idx < len(payRewardInfo.RewardList); idx++ {
 		if bCash && (payRewardInfo.RewardList[idx].Key == int32(serverproto.ResType_Res_ROCoin) || payRewardInfo.RewardList[idx].Key == int32(serverproto.ResType_Res_VipExp)) {
 			continue
 		}
 		addItemList[payRewardInfo.RewardList[idx].Key] += payRewardInfo.RewardList[idx].Value
+		itemlist = append(itemlist, &serverproto.KeyValueType{
+			Key:   payRewardInfo.RewardList[idx].Key,
+			Value: payRewardInfo.RewardList[idx].Value,
+		})
 	}
 	if this.GetRoleBag().CanAddItemList(addItemList) == serverproto.ErrorCode_ERROR_OK {
 		if payRewardInfo.GoodsType == int32(serverproto.PayGoodsType_EPayType_MonthCard) ||
@@ -4092,7 +4097,7 @@ func (this *Role) OnPayCallback(payRewardInfo *serverproto.PayOrderSaveInfo, bSa
 
 	ntfMsg := &serverproto.SCPayForGoodsNtf{}
 	ntfMsg.GoodsId = payRewardInfo.GoodsId
-	ntfMsg.ItemList = payRewardInfo.RewardList
+	ntfMsg.ItemList = itemlist
 	ntfMsg.GoodsType = payRewardInfo.GoodsType
 	ntfMsg.GoodsNum = payRewardInfo.Count
 	ntfMsg.CpOrderId = payRewardInfo.CpOrderId
@@ -4100,7 +4105,7 @@ func (this *Role) OnPayCallback(payRewardInfo *serverproto.PayOrderSaveInfo, bSa
 
 	//充值金额 payRewardInfo.Amount
 	// 充值成功后的系统相关处理,代金券购买的不计入
-	if bCash {
+	if !bCash {
 		this.GetRoleBase().AddPayRecharge(payRewardInfo)
 	}
 	////////

RO_Server_Trunk-branch_0.1.39/roserver/game/model/role_activity.go

@@ -852,7 +852,7 @@ func (this *RoleActivity) DailyReset(notify bool) {
 			this.role.ReplayGate(addActivityNtfMsg, true)
 		}
 	}
-	util.ErrorF("reset activity notify=%v")
+	//util.ErrorF("reset activity notify=%v")
 	this.SuperChargeUnlockCheck(serverproto.UnlockChargeType_UChargeType_DailyGift, &SuperChargeUnlockST{oldValue: 0})
 }