diff --git a/src/server/game/mod/limited_time_event/limited_time_event.go b/src/server/game/mod/limited_time_event/limited_time_event.go index 3739d4aa..c3752db2 100644 --- a/src/server/game/mod/limited_time_event/limited_time_event.go +++ b/src/server/game/mod/limited_time_event/limited_time_event.go @@ -281,17 +281,7 @@ func (l *LimitedTimeEventMod) GetMeteorReward(MergeList, EmitList []int) []*item // 获取宝箱雨奖励 func (l *LimitedTimeEventMod) GetChestReward(MergeList, EmitList []int) []*item.Item { - eneryg := 0 - for _, v := range MergeList { - ChessLv := mergeDataCfg.GetLvById(v) - Color := mergeDataCfg.GetColorById(v) - EmitId := order.GetEmitByColor(EmitList, Color) - if EmitId == 0 { - continue - } - NewChessLv := mergeDataCfg.DynamicLevRev(ChessLv, EmitId, Color) - eneryg += int(math.Pow(2, float64(NewChessLv-1))) - } + eneryg := order.GetVirtualEnergy(MergeList, EmitList) star := math.Ceil(float64(eneryg) / 10 / 2.5) return []*item.Item{item.NewItem(item.ITEM_DIAMOND_ID, int(star))} } diff --git a/src/server/game/mod/order/order_func.go b/src/server/game/mod/order/order_func.go index ac8cefdc..9b6337b9 100644 --- a/src/server/game/mod/order/order_func.go +++ b/src/server/game/mod/order/order_func.go @@ -421,7 +421,7 @@ func GetVirtualEnergy(MergeList, EmitList []int) int { continue } NewChessLv := mergeDataCfg.DynamicLevRev(ChessLv, EmitId, Color) - eneryg += int(math.Pow(2, float64(NewChessLv))) + eneryg += int(math.Pow(2, float64(NewChessLv-1))) } return eneryg }