Merge branch 'develop' into release

data/DB_GameItem.json

@@ -2955,12 +2955,12 @@
 			"Id": 300000,
 			"Name": "财神送福",
 			"ShowLocation": [
-				1,
+				0,
 				1
 			],
 			"Classify": [
-				0,
+				1,
-				0,
+				1,
 				0
 			],
 			"Type": 21,

public

@@ -1 +1 @@
-Subproject commit 4206616316ed483d02fc9fc13299c51a278ae53e
+Subproject commit 3d5fc5c6e4eeb3b8008ff098751c1bd6b211793c

worldsrv/action_phonelottery.go

@@ -237,7 +237,7 @@ func (this *CSDiamondLotteryInfoHandler) Process(s *netlib.Session, packetid int
 		info := WelfareMgrSington.GetConfig(p.Platform)
 		if info != nil && info.DiamondLotteryConfig != nil {
 			for _, value := range info.DiamondLotteryConfig.LotteryData {
-				if value.Channel == p.Channel {
+				if value.Channel == p.LastChannel {
 					pack.MaxScore = value.MaxScore
 					pack.DiamondNum = value.DiamondNum
 					for _, lotteryInfo := range value.Info {
@@ -294,13 +294,13 @@ func (this *CSDiamondLotteryHandler) Process(s *netlib.Session, packetid int, da
 		var config *webapi.DiamondLotteryData
 		if info != nil && info.LotteryData != nil {
 			for _, value := range info.LotteryData {
-				if value.Channel == p.Channel {
+				if value.Channel == p.LastChannel {
 					config = value
 					break
 				}
 			}
 			if config == nil {
-				logger.Logger.Error("钻石抽奖，未找到配置！p.Channel = ", p.Channel)
+				logger.Logger.Error("钻石抽奖，未找到配置！p.LastChannel = ", p.LastChannel)
 				return nil
 			}
 			//判断钻石数量
@@ -443,13 +443,13 @@ func (this *CSDiamondLotteryLuckyAwardHandler) Process(s *netlib.Session, packet
 		var config *webapi.DiamondLotteryData
 		if info != nil && info.LotteryData != nil {
 			for _, value := range info.LotteryData {
-				if value.Channel == p.Channel {
+				if value.Channel == p.LastChannel {
 					config = value
 					break
 				}
 			}
 			if config == nil {
-				logger.Logger.Error("钻石抽奖，未找到配置！p.Channel = ", p.Channel)
+				logger.Logger.Error("钻石抽奖，未找到配置！p.LastChannel = ", p.LastChannel)
 				return nil
 			}
 			if p.DiamondLotteryScore < int64(config.MaxScore) {