Compare commits

..

No commits in common. "70673450dfdfec720bedd88315ad1d9da1f89df8" and "1961caad122ccd4cfc25e189a26b958c1a602c17" have entirely different histories.

3 changed files with 2 additions and 11 deletions

View File

@ -2659,7 +2659,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) {
// 刷新存钱罐 // 刷新存钱罐
playerEx := s.GetPlayer(o_player.UserId) playerEx := s.GetPlayer(o_player.UserId)
if playerEx != nil && (!(s.IsFreePublic() || s.IsMatchScene() || s.IsCustom())) { if playerEx != nil && (!(s.IsFreePublic() || s.IsMatchScene())) {
playerEx.UpdatePigBankCoin(o_player.GainCoin) playerEx.UpdatePigBankCoin(o_player.GainCoin)
} }

View File

@ -103,15 +103,6 @@ func (this *CSEnterRoomHandler) Process(s *netlib.Session, packetid int, data in
logger.Logger.Trace("CSEnterRoomHandler password error") logger.Logger.Trace("CSEnterRoomHandler password error")
goto failed goto failed
} }
// 房费是否充足
if scene.IsCustom() {
cfg := PlatformMgrSingleton.GetConfig(p.Platform).RoomConfig[scene.RoomConfigId]
if !scene.sp.CostEnough(int(scene.CostType), scene.playerNum, cfg, p) {
code = gamehall.OpResultCode_Game_OPRC_CostNotEnough
logger.Logger.Trace("CSEnterRoomHandler cost error")
goto failed
}
}
dbGameFree = scene.dbGameFree dbGameFree = scene.dbGameFree
if dbGameFree != nil { if dbGameFree != nil {

View File

@ -32,7 +32,7 @@ func (spd *ScenePolicyData) OnStart(s *Scene) {
func (spd *ScenePolicyData) OnStop(s *Scene) { func (spd *ScenePolicyData) OnStop(s *Scene) {
s.NotifyPrivateRoom(common.ListDel) s.NotifyPrivateRoom(common.ListDel)
// 房主付费,房间没有玩就解散了,返还房主建房费用 // 房主付费,房间没有玩就解散了,返还房主建房费用
if s.IsCustom() && s.GetCostType() == 2 && s.currRound == 0 { if s.IsCustom() && s.GetCostType() == 1 && s.currRound == 0 {
spd.GiveCostPayment(s, s.creator) spd.GiveCostPayment(s, s.creator)
} }
} }