diff --git a/src/server/conf/limitedTimeEvent/LimitedTimeEventCfg.go b/src/server/conf/limitedTimeEvent/LimitedTimeEventCfg.go index 6bc19d4c..7a227254 100644 --- a/src/server/conf/limitedTimeEvent/LimitedTimeEventCfg.go +++ b/src/server/conf/limitedTimeEvent/LimitedTimeEventCfg.go @@ -17,7 +17,7 @@ const ( CFG_LIMITED_TIME_EVENT_FAST = "LimitedTimeEventFast" CFG_LIMITED_TIME_EVENT_JACKPOT = "LimitedTimeEventJackpot" CFG_LIMITED_TIME_EVENT_CONST = "LimitedTimeEventConst" - CFG_LIMITED_TIME_EVENT_BOUNS = "LimitedTimeEventBouns" + CFG_LIMITED_TIME_EVENT_BONUS = "LimitedTimeEventBonus" ) func init() { @@ -30,7 +30,7 @@ func init() { gamedata.InitCfg(CFG_LIMITED_TIME_EVENT_FAST) gamedata.InitCfg(CFG_LIMITED_TIME_EVENT_JACKPOT) gamedata.InitCfg(CFG_LIMITED_TIME_EVENT_CONST) - gamedata.InitCfg(CFG_LIMITED_TIME_EVENT_BOUNS) + gamedata.InitCfg(CFG_LIMITED_TIME_EVENT_BONUS) } // 获取限时事件触发列表 @@ -139,7 +139,7 @@ func GetFastProduceReward(Times, Energy int) []*item.Item { // 获取进度最大值 func GetProgressMax(Lv, Num int) int { - data, err := gamedata.GetData(CFG_LIMITED_TIME_EVENT_BOUNS) + data, err := gamedata.GetData(CFG_LIMITED_TIME_EVENT_BONUS) if err != nil { log.Debug("GetProgressMax err:%v", err) return 0 @@ -160,8 +160,8 @@ func GetProgressMax(Lv, Num int) int { return 0 } -func GetBounsLv(Lv int) int { - data, err := gamedata.GetData(CFG_LIMITED_TIME_EVENT_BOUNS) +func GetBonusLv(Lv int) int { + data, err := gamedata.GetData(CFG_LIMITED_TIME_EVENT_BONUS) if err != nil { log.Debug("GetProgressMax err:%v", err) return 0 @@ -185,7 +185,7 @@ func GetProgressRewardRand(Lv int) map[int]int { } r := make(map[int]int) for k, v := range data { - if Lv >= gamedata.GetIntValue(v, "BounsLv") { + if Lv >= gamedata.GetIntValue(v, "BonusLv") { Id := GoUtil.Int(k) r[Id] = gamedata.GetIntValue(v, "Prob") } @@ -195,7 +195,7 @@ func GetProgressRewardRand(Lv int) map[int]int { // 获取进度选择数量 func GetProgressSelectNum(Lv int) int { - data, err := gamedata.GetData(CFG_LIMITED_TIME_EVENT_BOUNS) + data, err := gamedata.GetData(CFG_LIMITED_TIME_EVENT_BONUS) if err != nil { log.Debug("GetProgressMax err:%v", err) return 0 diff --git a/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go b/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go index bf0b8670..fe395298 100644 --- a/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go +++ b/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go @@ -36,7 +36,7 @@ type LimitedTimeEventMod struct { Lv int // 玩家等级 零点更新 ProgressMax int LastOption []int - BounsNum int + BonusNum int } type LTEInfo struct { @@ -57,15 +57,15 @@ func (l *LimitedTimeEventMod) InitData(Lv int) { } if l.ProgressMax == 0 { l.Lv = Lv - l.ProgressMax = limitedTimeEventCfg.GetProgressMax(Lv, l.BounsNum) + l.ProgressMax = limitedTimeEventCfg.GetProgressMax(Lv, l.BonusNum) } l.Progress = 0 // todo 临时 屏蔽bouns } func (l *LimitedTimeEventMod) ZeroUpdate(Lv int) { l.Lv = Lv - l.BounsNum = 0 - l.ProgressMax = limitedTimeEventCfg.GetProgressMax(Lv, l.BounsNum) + l.BonusNum = 0 + l.ProgressMax = limitedTimeEventCfg.GetProgressMax(Lv, l.BonusNum) } // 判断限时事件是否存在 @@ -236,8 +236,8 @@ func (l *LimitedTimeEventMod) AddProgress(Lv int) { l.Progress++ if l.Progress == l.ProgressMax { SelectNum := limitedTimeEventCfg.GetProgressSelectNum(l.Lv) - BounsLv := limitedTimeEventCfg.GetBounsLv(l.Lv) - RandMap := limitedTimeEventCfg.GetProgressRewardRand(BounsLv) + BonusLv := limitedTimeEventCfg.GetBonusLv(l.Lv) + RandMap := limitedTimeEventCfg.GetProgressRewardRand(BonusLv) n := 0 r := make([]int, 0) LastOption := l.LastOption @@ -268,8 +268,8 @@ func (l *LimitedTimeEventMod) SelectProgressReward(Id int) ([]*item.Item, error) l.LastSelect = RewardId l.ProgressReward = make(map[int]int) l.Progress = 0 - l.BounsNum++ - l.ProgressMax = limitedTimeEventCfg.GetProgressMax(l.Lv, l.BounsNum) + l.BonusNum++ + l.ProgressMax = limitedTimeEventCfg.GetProgressMax(l.Lv, l.BonusNum) return Item, nil }