diff --git a/servers/game/data_old/battle_pass_season_ext.go b/servers/game/data_old/battle_pass_season_ext.go index c720126..15133aa 100644 --- a/servers/game/data_old/battle_pass_season_ext.go +++ b/servers/game/data_old/battle_pass_season_ext.go @@ -23,7 +23,7 @@ func (this *BattlePassSeasonTableExtend) init() error { } for _, d := range this.l { - beginTime, err := util.ParseUnitx(time.DateTime, d.BeginTime) + beginTime, err := util.ParseUnix(time.DateTime, d.BeginTime) if err != nil { return err } diff --git a/servers/game/logic/manager_player.go b/servers/game/logic/manager_player.go index 24e4ad0..44b8b99 100644 --- a/servers/game/logic/manager_player.go +++ b/servers/game/logic/manager_player.go @@ -223,6 +223,7 @@ func (this *PlayerManager) NewPlayer() *Player { return &Player{ manager: this, //BattlePassReward: []*PlayerBattlePassRewrad{}, + Artifact: map[uint64]*PlayerArtifact{}, //Achievement: map[uint64]*PlayerAchievement{}, //BattlePass: map[uint32]*PlayerBattlePass{}, //Cdkey: map[string]*PlayerCdkey{}, @@ -252,6 +253,7 @@ func (this *PlayerManager) NewPlayer() *Player { //StorePool: map[uint32]*PlayerStorePool{}, //Task: map[uint32]*PlayerTask{}, //TaskActive: map[uint32]*PlayerTaskActive{}, + Treasure: map[uint64]*PlayerTreasure{}, } } diff --git a/servers/game/logic/player.go b/servers/game/logic/player.go index e868437..3e0c013 100644 --- a/servers/game/logic/player.go +++ b/servers/game/logic/player.go @@ -73,7 +73,6 @@ type Player struct { Hero map[uint32]*PlayerHero `bson:"hero"` Item map[uint32]*PlayerItem `bson:"item"` Equip map[uint64]*PlayerEquip `bson:"rig_equip"` - //GiftPack map[uint32]*PlayerGiftPack `bson:"gift_pack"` //Mail map[uint64]*PlayerMail `bson:"mail"` Money map[uint32]*PlayerMoney `bson:"money"` @@ -93,7 +92,7 @@ type Player struct { //StorePool map[uint32]*PlayerStorePool `bson:"store_pool"` //Task map[uint32]*PlayerTask `bson:"task"` //TaskActive map[uint32]*PlayerTaskActive `bson:"task_active"` - Treasure map[uint64]*PlayerTreasures `bson:"treasures"` + Treasure map[uint64]*PlayerTreasure `bson:"treasures"` //Temporary Temp PlayerTemp `bson:"-" json:"-"` diff --git a/servers/game/logic/player_check_correct.go b/servers/game/logic/player_check_correct.go index 636f97d..fa37945 100644 --- a/servers/game/logic/player_check_correct.go +++ b/servers/game/logic/player_check_correct.go @@ -18,6 +18,10 @@ func (this *Player) checkCorrect(firstLogin bool, cur *GameTime) { } func (this *Player) checkCorrectModules(cur *GameTime) { + if this.Artifact == nil { + this.Artifact = make(map[uint64]*PlayerArtifact) + this.SaveField("achievement", this.Artifact) + } //if this.Achievement == nil { // this.Achievement = make(map[uint64]*PlayerAchievement) // this.SaveField("achievement", this.Achievement) @@ -134,6 +138,10 @@ func (this *Player) checkCorrectModules(cur *GameTime) { // this.TaskActive = make(map[uint32]*PlayerTaskActive) // this.SaveField("task_active", this.TaskActive) //} + if this.Treasure == nil { + this.Treasure = make(map[uint64]*PlayerTreasure) + this.SaveField("achievement", this.Treasure) + } } func (this *Player) initRole(cur *GameTime) { diff --git a/servers/game/logic/player_treasures.go b/servers/game/logic/player_treasures.go index 1004530..ff6a6a5 100644 --- a/servers/game/logic/player_treasures.go +++ b/servers/game/logic/player_treasures.go @@ -1,6 +1,6 @@ package logic -type PlayerTreasures struct { +type PlayerTreasure struct { Uid uint64 `bson:"uid" key:"1"` Id uint32 `bson:"id"` }