tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: tl_server_2:8de4b8045869122ab3286d82737736a895abdee0
Branches Tags
tl_server_2:main
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
..
compare: tl_server_2:bd3871aa10a82b1249943608d78e0d7779cf0375
Branches Tags
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
tl_server_2:main

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

7 changed files with 12 additions and 14 deletions
Show Stats Expand all files Collapse all files

BIN
data/DB_PropExchange.dat
View File

Binary file not shown.

BIN
data/DB_Task.dat
View File

Binary file not shown.

22
data/DB_Task.json
View File

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

1
model/permit.go
View File

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

2
public

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

1
worldsrv/action_welfare.go
View File

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

BIN
xlsx/DB_Task.xlsx
View File

Binary file not shown.