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

data/DB_Task.json

@@ -807,7 +807,7 @@
 			"TargetTimes": 1,
 			"FinishTimes": 1,
 			"Award": {
-				"100011": 20
+				"100011": 200
 			}
 		},
 		{
@@ -818,7 +818,7 @@
 			"TargetTimes": 3600,
 			"FinishTimes": 1,
 			"Award": {
-				"100011": 20
+				"100011": 200
 			},
 			"Position": [
 				1,
@@ -833,7 +833,7 @@
 			"TargetTimes": 1,
 			"FinishTimes": 1,
 			"Award": {
-				"100011": 30
+				"100011": 300
 			},
 			"Position": [
 				0,
@@ -848,7 +848,7 @@
 			"TargetTimes": 1,
 			"FinishTimes": 1,
 			"Award": {
-				"100011": 30
+				"100011": 300
 			}
 		},
 		{
@@ -859,7 +859,7 @@
 			"TargetTimes": 3,
 			"FinishTimes": 1,
 			"Award": {
-				"100011": 30
+				"100011": 300
 			},
 			"GameType": 1
 		},
@@ -871,7 +871,7 @@
 			"TargetTimes": 3,
 			"FinishTimes": 1,
 			"Award": {
-				"100011": 30
+				"100011": 300
 			},
 			"GameType": 1
 		},
@@ -883,7 +883,7 @@
 			"TargetTimes": 1,
 			"FinishTimes": 1,
 			"Award": {
-				"100011": 30
+				"100011": 300
 			},
 			"GameType": 1
 		},
@@ -895,7 +895,7 @@
 			"TargetTimes": 3,
 			"FinishTimes": 1,
 			"Award": {
-				"100011": 50
+				"100011": 500
 			},
 			"GameType": 1
 		},
@@ -907,7 +907,7 @@
 			"TargetTimes": 1,
 			"FinishTimes": 1,
 			"Award": {
-				"100011": 50
+				"100011": 500
 			},
 			"GameType": 1
 		},
@@ -919,7 +919,7 @@
 			"TargetTimes": 100,
 			"FinishTimes": 1,
 			"Award": {
-				"100011": 80
+				"100011": 800
 			},
 			"Position": [
 				1,
@@ -934,7 +934,7 @@
 			"TargetTimes": 1,
 			"FinishTimes": 1,
 			"Award": {
-				"100011": 80
+				"100011": 800
 			},
 			"Position": [
 				1,

model/permit.go

@@ -26,6 +26,7 @@ type BackendPermitExchange struct {
 	Platform string      // 平台
 	StartTs  int64       // 活动开始时间
 	SnId     int32       // 玩家id
+	Id       int32       // 商品id
 	Cost     []AwardItem // 消耗
 	Gain     []AwardItem // 获得
 	Ts       int64       // 时间戳

public

@@ -1 +1 @@
-Subproject commit aef8c489a27508831d69b4f66dee10c5258abb92
+Subproject commit 039c56c5078e6e4167d58c1f73b92e2131a30044

worldsrv/action_welfare.go

@@ -1068,6 +1068,7 @@ func CSPermitExchange(s *netlib.Session, packetid int, data interface{}, sid int
 				Platform: p.Platform,
 				StartTs:  startTs,
 				SnId:     p.SnId,
+				Id:       exchangeConfig.Id,
 				Cost:     cost,
 				Gain:     gain,
 				Ts:       now.Unix(),