Compare commits

..

No commits in common. "0df3e0938c566f7d776930b1cd79966da1b4403b" and "fa1d1648ac955ce00b237596604dbe51a3edc545" have entirely different histories.

2 changed files with 4 additions and 4 deletions

View File

@ -1964,7 +1964,7 @@ func (this *TienLenSceneData) TrySmallGameBilled() {
score = int64(this.roundScore) * int64(baseScore) / 100 //百分比
}
losePlayerCoin := losePlayer.GetCoin()
if !this.IsMatchScene() && !this.IsCustom() && losePlayerCoin < score { //输完
if !this.IsMatchScene() && losePlayerCoin < score { //输完
score = losePlayerCoin
}
//判断宠物技能生不生效
@ -1983,7 +1983,7 @@ func (this *TienLenSceneData) TrySmallGameBilled() {
gainScore := int64(float64(score) * float64(10000-taxRate) / 10000.0) //税后
bombTaxScore := score - gainScore
// win
if this.IsMatchScene() || this.IsCustom() {
if this.IsMatchScene() {
winPlayer.AddCoinNoLog(gainScore, 0)
} else {
winPlayer.AddCoin(gainScore, common.GainWay_CoinSceneWin, 0, "system", this.GetSceneName())
@ -1997,7 +1997,7 @@ func (this *TienLenSceneData) TrySmallGameBilled() {
winPlayer.bombRankScore += rankScore * rule.RankBaseScore
}
//lose
if this.IsMatchScene() && this.IsCustom() {
if this.IsMatchScene() {
losePlayer.AddCoinNoLog(-score, 0)
} else {
losePlayer.AddCoin(-score, common.GainWay_CoinSceneLost, 0, "system", this.GetSceneName())

View File

@ -1344,7 +1344,7 @@ func CSCreatePrivateRoomHandler(s *netlib.Session, packetId int, data interface{
return nil
}
if costType == 2 {
if cfg.GetCostType() == 2 {
sp.CostPayment(scene, p)
}