Compare commits

..

No commits in common. "a9b8b5af021fd52da7d1250a8b008d93d3c3dc6d" and "78feeb2595aed9d31338d8a5278fd6829466c796" have entirely different histories.

6 changed files with 16 additions and 18 deletions

Binary file not shown.

Binary file not shown.

View File

@ -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,

2
public

@ -1 +1 @@
Subproject commit 53453537bf3f0d0ac118b2efbc0548d0af069ecd
Subproject commit 039c56c5078e6e4167d58c1f73b92e2131a30044

View File

@ -240,13 +240,11 @@ func (this *Tournament) UpdateData(init bool, data *webapiproto.GameMatchDateLis
}
this.GameMatchDateList[data.Platform] = configs
//拉取数据
if this.MatchAwardNum == nil {
ret, err := model.GetMatchAwardLog(data.Platform)
logger.Logger.Tracef("ret = %v,err = %v", ret, err)
if err == nil {
this.MatchAwardNum = ret.AwardNum
}
}
// 通知平台玩家数据更新
if !init {
//todo 优化

Binary file not shown.