Merge branch 'dev_pigbank2' into develop

worldsrv/welfmgr.go

@@ -1118,7 +1118,7 @@ func (this *WelfareMgr) BlindBoxInfo(p *Player, bid int32) {
 			if cyc == 1 || blindBox.Cycle == model.WelfareOpen {
 				p.WelfData.BlindBoxId = 0
 			}
-		}                               // == 1代表当日循环
+		} // == 1代表当日循环
 		if p.WelfData.BlindBoxId == 0 { // 未领取过发随机Date
 
 			idx := bid
@@ -1988,7 +1988,7 @@ func (this *WelfareMgr) DiamondBankGetInfo(p *Player) {
 		bankInfo.Price = int64(data.DiamondPrice)
 		bankInfo.NowPrice = int64(data.DiamondNowPrice)
 		bankInfo.ShopId = data.DiamondId
-		for _, v := range data.GoldExc {
+		for _, v := range data.DiamondExc {
 			bankInfo.DiamondExc[int64(v.ItemId)] = v.ItemNum
 		}