Compare commits

...

2 Commits

Author SHA1 Message Date
sk eb791c364e Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop 2024-09-09 10:25:54 +08:00
sk ea6ef0be41 房卡扣除问题 2024-09-09 10:24:37 +08:00
3 changed files with 6 additions and 6 deletions

View File

@ -354,7 +354,7 @@ func (this *CSInviteFriendHandler) Process(s *netlib.Session, packetid int, data
return nil
}
//私有房间
if p.scene.sceneMode != common.SceneModePrivate {
if !p.scene.IsPrivateScene() && !p.scene.IsCustom() {
logger.Logger.Warn("CSInviteFriendHandler scene is common.SceneMode_Private")
opRetCode = friend.OpResultCode_OPRC_InviteFriend_RoomLimit
send(p)

View File

@ -1249,7 +1249,7 @@ func CSCreatePrivateRoomHandler(s *netlib.Session, packetId int, data interface{
costType = int64(msg.GetCostType())
}
if costType < 1 || costType > 2 {
costType = 1 // 默认房主支付
costType = 1 // 默认AA
}
// 语音
if cfg.GetVoice() != 3 {
@ -1335,7 +1335,7 @@ func CSCreatePrivateRoomHandler(s *netlib.Session, packetId int, data interface{
return nil
}
if cfg.GetCostType() == 1 {
if cfg.GetCostType() == 2 {
sp.CostPayment(scene, p)
}

View File

@ -66,7 +66,7 @@ func (spd *ScenePolicyData) OnSceneState(s *Scene, state int) {
case common.SceneStateStart:
s.NotifyPrivateRoom(common.ListModify)
if s.IsCustom() {
if s.GetCostType() == 2 {
if s.GetCostType() == 1 {
for _, v := range s.players {
spd.CostPayment(s, v)
}
@ -96,7 +96,7 @@ func (spd *ScenePolicyData) CanEnter(s *Scene, p *Player) int {
func (spd *ScenePolicyData) costEnough(costType, playerNum int, roomConfig *webapi.RoomConfig, snid int32, f func(items []*model.Item)) bool {
isEnough := true
var items []*model.Item
if costType == 1 {
if costType == 2 {
// 房主
for _, v := range roomConfig.GetCost() {
if item := BagMgrSingleton.GetItem(snid, v.GetItemId()); item == nil || item.ItemNum < v.GetItemNum() {
@ -119,7 +119,7 @@ func (spd *ScenePolicyData) costEnough(costType, playerNum int, roomConfig *weba
} else {
items = append(items, &model.Item{
ItemId: v.GetItemId(),
ItemNum: v.GetItemNum(),
ItemNum: n,
})
}
}