diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index b2430bf..bb45af7 100644 Binary files a/data/DB_PropExchange.dat and b/data/DB_PropExchange.dat differ diff --git a/data/DB_Task.dat b/data/DB_Task.dat index 942b1e6..9f3a97b 100644 Binary files a/data/DB_Task.dat and b/data/DB_Task.dat differ diff --git a/data/DB_Task.json b/data/DB_Task.json index 34e041c..9fdfcc2 100644 --- a/data/DB_Task.json +++ b/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, diff --git a/model/permit.go b/model/permit.go index 9fb30d9..5484e28 100644 --- a/model/permit.go +++ b/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 // 时间戳 diff --git a/public b/public index 6c801ea..a3715c5 160000 --- a/public +++ b/public @@ -1 +1 @@ -Subproject commit 6c801eab0d99ba3c8878278677bb5ef17a1370bd +Subproject commit a3715c53645aad259b6e3dce0d334cf5f8d6e8cb diff --git a/worldsrv/action_welfare.go b/worldsrv/action_welfare.go index b4fca7d..20e532d 100644 --- a/worldsrv/action_welfare.go +++ b/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(), diff --git a/xlsx/DB_Task.xlsx b/xlsx/DB_Task.xlsx index 6525091..acefb28 100644 Binary files a/xlsx/DB_Task.xlsx and b/xlsx/DB_Task.xlsx differ