Merge branch 'develop' of git.pogorockgames.com:mango-games/server/game into develop

gamesrv/tienlen/scenepolicy_tienlen.go

@@ -1790,7 +1790,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) {
 						}
 					}
 					losePlayerCoin := losePlayer.GetCoin()
-					if !sceneEx.IsMatchScene() && losePlayerCoin < gainScore {
+					if !sceneEx.IsMatchScene() && !sceneEx.IsCustom() && losePlayerCoin < gainScore {
 						gainScore = losePlayerCoin
 					}
 					losePlayerScore = gainScore
@@ -1932,7 +1932,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) {
 								}
 							}
 							lastWinPlayerCoin := lastWinPlayer.GetCoin()
-							if !sceneEx.IsMatchScene() && lastWinPlayerCoin < astWinGainScore {
+							if !sceneEx.IsMatchScene() && !sceneEx.IsCustom() && lastWinPlayerCoin < astWinGainScore {
 								astWinGainScore = lastWinPlayerCoin
 							}
 							lastWinPlayerScore = astWinGainScore
@@ -2292,7 +2292,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) {
 						}
 					}
 					losePlayerCoin := playerEx.GetCoin()
-					if !sceneEx.IsMatchScene() && losePlayerCoin < gainScore {
+					if !sceneEx.IsMatchScene() && !sceneEx.IsCustom() && losePlayerCoin < gainScore {
 						gainScore = losePlayerCoin
 					}
 					winScore += gainScore

worldsrv/player.go

@@ -1799,7 +1799,12 @@ func (this *Player) CanDelete() bool {
 }
 
 func (this *Player) Time2Save() {
-	this.Save(false)
+	logger.Logger.Tracef("player save %v", this.SnId)
+	if common.Config.IsDevMode {
+		this.Save(true)
+	} else {
+		this.Save(false)
+	}
 	if this != nil && this.CanDelete() {
 		PlayerMgrSington.DelPlayer(this.SnId)
 	}