diff --git a/model/awardlog.go b/model/awardlog.go index ea1b872..3aa708f 100644 --- a/model/awardlog.go +++ b/model/awardlog.go @@ -8,7 +8,7 @@ import ( ) type AwardLog struct { - AwardMap map[int32]int64 //key1:1话费 2实物 key2 itemId value:数量 + AwardMap map[int32]map[int32]int64 //key1:1话费 2实物 key2 itemId value:数量 Ts int64 } diff --git a/public b/public index 06d6be8..d789cca 160000 --- a/public +++ b/public @@ -1 +1 @@ -Subproject commit 06d6be8fa6d928f7eb30a4c567abfc43e571cbc4 +Subproject commit d789cca81a36ddbaf30e5414b6c4fe530e0631f6 diff --git a/worldsrv/awardlogmgr.go b/worldsrv/awardlogmgr.go index ec14c4d..159a546 100644 --- a/worldsrv/awardlogmgr.go +++ b/worldsrv/awardlogmgr.go @@ -30,25 +30,8 @@ func (this *AwardLogManager) ModuleName() string { func (this *AwardLogManager) GetAwardLog(plt string, typeId int32) map[int32]int64 { d := PlatformMgrSingleton.GetConfig(plt).AwardItem ret := make(map[int32]int64) - // 1 话费 2实物 - switch typeId { - case 1: - for _, v := range srvdata.GameItemMgr.GetArr(plt) { - if v.GetType() == common.ItemTypeChange { - if d.AwardMap[v.GetId()] > 0 { - ret[v.GetId()] += d.AwardMap[v.GetId()] - } - } - } - case 2: - for _, v := range srvdata.GameItemMgr.GetArr(plt) { - if v.GetType() == common.ItemTypeObjective { - if d.AwardMap[v.GetId()] > 0 { - ret[v.GetId()] += d.AwardMap[v.GetId()] - } - } - } - + if d.AwardMap[typeId] != nil { + ret = d.AwardMap[typeId] } return ret } @@ -70,7 +53,11 @@ func (this *AwardLogManager) GetAnnouncerLog(plt string, typeId int32) []model.A func (this *AwardLogManager) UpdateAwardLog(plt string, itemId int32, num int64) { if srvdata.GameItemMgr.Get(plt, itemId).Type == common.ItemTypeObjective || srvdata.GameItemMgr.Get(plt, itemId).Type == common.ItemTypeChange { - PlatformMgrSingleton.AddAwardItem(plt, itemId, num) + typeId := int32(1) + if srvdata.GameItemMgr.Get(plt, itemId).Type == common.ItemTypeChange { + typeId = 2 + } + PlatformMgrSingleton.AddAwardItem(plt, itemId, num, typeId) } }