Merge branch 'dev_pigbank' into develop

gamesrv/tienlen/playerdata_tienlen.go

@@ -264,9 +264,7 @@ func (this *TienLenPlayerData) UpdatePigbankCoin(gainTexCoin int64) {
 	pack.BankCoinMax = BankCoinMax
 	pack.BankCoin = this.WelfData.PigBank.BankCoin
 
-	proto.SetDefaults(pack)
-
-	logger.Logger.Trace("-------(this *TienLenPlayerData) UpdatePigbankCoin player SnId:", this.SnId, ";pack: ", pack)
+	logger.Logger.Trace("-------(this *TienLenPlayerData) UpdatePigbankCoin player SnId:", this.SnId, ";pack: ", pack, ";gainTexCoin: ", gainTexCoin)
 
 	this.SendToClient(int(player.PlayerPacketID_PACKET_SCPigBankCoin), pack)
 }

gamesrv/tienlen/scenepolicy_tienlen.go

@@ -2582,7 +2582,7 @@ func (this *SceneBilledStateTienLen) OnEnter(s *base.Scene) {
 
 					// 刷新存钱罐
 					playerEx, _ := s.GetPlayer(o_player.UserId).GetExtraData().(*TienLenPlayerData)
-					if playerEx != nil && (s.IsRankMatch() || s.IsCoinScene()) {
+					if playerEx != nil && (!(s.IsFreePublic() || s.IsMatchScene())) {
 						playerEx.UpdatePigbankCoin(o_player.GainCoin)
 					}