Compare commits

..

No commits in common. "8de4b8045869122ab3286d82737736a895abdee0" and "bd3871aa10a82b1249943608d78e0d7779cf0375" have entirely different histories.

7 changed files with 12 additions and 14 deletions

Binary file not shown.

Binary file not shown.

View File

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

View File

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

2
public

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

View File

@ -1068,7 +1068,6 @@ 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(),

Binary file not shown.