pet_home/pet_home_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

七日签到优化

Browse Source
This commit is contained in:
hahwu 2026-03-19 18:48:18 +08:00
parent 3c8f9a8eb6
commit d2d31d94ab
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/server/game/mod/seven_login/seven_login_func.go
View File

@ -54,6 +54,9 @@ func randReward(rewardData *gamedata.SevenLoginRewardData, lastType []int, jackp
// 召回玩家 每日体力数*2
energyNum = energyNum * energyMul
items1 := []*item.Item{item.NewItem(item.ITEM_ENERGY_ID, int(energyNum))}
if rewardData.RewardNum == 3 {
remainEnergy -= 5
}
// 奖励2
newJackpot := make([]*gamedata.SevenLoginJackpotData, 0, len(jackpot))
for _, v := range jackpot {
@ -63,9 +66,6 @@ func randReward(rewardData *gamedata.SevenLoginRewardData, lastType []int, jackp
}
var items2 []*item.Item
itemType := []int{}
if rewardData.RewardNum == 3 {
remainEnergy -= 5
}
if GoUtil.InArray(rewardData.Id, cardPackIds) {
cardJackpot := make([]*gamedata.SevenLoginJackpotData, 0, len(jackpot))
for _, v := range jackpot {
@ -114,6 +114,13 @@ func randReward(rewardData *gamedata.SevenLoginRewardData, lastType []int, jackp
newJackpot3 = append(newJackpot3, v)
}
}
if len(newJackpot3) == 0 {
newJackpot3 := make([]*gamedata.SevenLoginJackpotData, 0, len(jackpot))
for _, v := range jackpot {
if v.Energy <= remainEnergy {
newJackpot3 = append(newJackpot3, v)
}
}
if len(newJackpot3) == 0 {
items3 = []*item.Item{item.NewItem(item.ITEM_ENERGY_ID, int(remainEnergy))}
return Reward{
@ -125,6 +132,15 @@ func randReward(rewardData *gamedata.SevenLoginRewardData, lastType []int, jackp
sort.Slice(newJackpot3, func(i, j int) bool {
return newJackpot3[i].Energy > newJackpot3[j].Energy
})
return Reward{
Item1: items1,
Item2: items2,
Item3: newJackpot3[0].Items,
}, itemType
}
sort.Slice(newJackpot3, func(i, j int) bool {
return newJackpot3[i].Energy > newJackpot3[j].Energy
})
items3 = newJackpot3[0].Items
itemType = append(itemType, newJackpot3[0].Type)
}

9
src/server/test/seven_test.go
View File

@ -18,15 +18,12 @@ func TestSevenLoginZeroUpdate(t *testing.T) {
p1 := new(game.Player)
p1.InitPlayer("3625212")
SevenLoginMod := p1.GetSevenLoginMod()
for i := 0; i < 100; i++ {
SevenLoginMod.WeekResetTime = 0
SevenLoginMod.MonthResetTime = 0
SevenLoginMod.ZeroUpdate(0, 0, p1.GetOrderFactor())
SevenLoginMod.BackData()
fmt.Printf("order factor:%v\n", p1.GetOrderFactor())
for k, v := range SevenLoginMod.LoginReward {
t.Logf("Reward:%v\n", v)
fmt.Printf("id :%d ; Reward:%v\n", k, v)
fmt.Printf("id :%d ; Reward:%v\n", 7, SevenLoginMod.LoginReward[7])
}
t.Logf("SevenLoginMod:%v\n", SevenLoginMod.MonthReward)
fmt.Printf("SevenLoginMod:%v\n", SevenLoginMod.MonthReward)
}