admin/bl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 重构 CurrentPet 为 CurPet
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
Details

Browse Source
This commit is contained in:
xinian
2026-04-04 04:34:43 +08:00
committed by cnb
parent 6439995434
commit 9c6f3988de
395 changed files with 1424 additions and 1424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
logic/service/fight/fightc.go
View File

@@ -33,8 +33,8 @@ func (f *FightC) processSkillAttack(attacker, defender *input.Input, skill *info
var originalProps [2][6]int8
var originalPetInfo [2]model.PetInfo
//复制属性
originalProps[0], originalProps[1] = f.Our[0].Prop, f.Opp[0].Prop //先复制能力提升
originalPetInfo[0], originalPetInfo[1] = f.Our[0].CurrentPet[0].Info, f.Opp[0].CurrentPet[0].Info //先复制宠物信息
originalProps[0], originalProps[1] = f.Our[0].Prop, f.Opp[0].Prop //先复制能力提升
originalPetInfo[0], originalPetInfo[1] = f.Our[0].CurPet[0].Info, f.Opp[0].CurPet[0].Info //先复制宠物信息
attacker.Exec(func(effect input.Effect) bool {
//计算变威力
effect.Ctx().SkillEntity = skill
@@ -56,7 +56,7 @@ func (f *FightC) processSkillAttack(attacker, defender *input.Input, skill *info
//还原属性
f.Our[0].Prop, f.Opp[0].Prop = originalProps[0], originalProps[1]
f.Our[0].CurrentPet[0].Info, f.Opp[0].CurrentPet[0].Info = originalPetInfo[0], originalPetInfo[1]
f.Our[0].CurPet[0].Info, f.Opp[0].CurPet[0].Info = originalPetInfo[0], originalPetInfo[1]
if attacker.IsCritical == 1 { //命中了才有暴击
//暴击破防
@@ -234,7 +234,7 @@ func (f *FightC) enterturn(firstAttack, secondAttack *action.SelectSkillAction)
return effect.ActionStart(firstAttack, secondAttack)
})
canUse := canUseSkill && action.CanUse(currentSkill) && attacker.CurrentPet[0].Info.Hp > 0
canUse := canUseSkill && action.CanUse(currentSkill) && attacker.CurPet[0].Info.Hp > 0
if !canUse {
@@ -257,7 +257,7 @@ func (f *FightC) enterturn(firstAttack, secondAttack *action.SelectSkillAction)
f.processSkillAttack(attacker, defender, currentSkill)
currentSkill = originalSkill //还原技能
_, skill, ok := utils.FindWithIndex(attacker.CurrentPet[0].Info.SkillList, func(item model.SkillInfo) bool {
_, skill, ok := utils.FindWithIndex(attacker.CurPet[0].Info.SkillList, func(item model.SkillInfo) bool {
return item.ID == currentSkill.Info.ID
})
if ok {
@@ -270,7 +270,7 @@ func (f *FightC) enterturn(firstAttack, secondAttack *action.SelectSkillAction)
skill.Use(usecount)
}
}
if defender.CurrentPet[0].Info.Hp > 0 {
if defender.CurPet[0].Info.Hp > 0 {
//技能使用后
defender.Exec(func(effect input.Effect) bool { //技能使用后的我方效果
effect.Ctx().SkillEntity = currentSkill
@@ -279,7 +279,7 @@ func (f *FightC) enterturn(firstAttack, secondAttack *action.SelectSkillAction)
})
}
if attacker.CurrentPet[0].Info.Hp > 0 {
if attacker.CurPet[0].Info.Hp > 0 {
//技能使用后
attacker.Exec(func(effect input.Effect) bool { //技能使用后的我方效果
effect.Ctx().SkillEntity = currentSkill
@@ -300,16 +300,16 @@ func (f *FightC) enterturn(firstAttack, secondAttack *action.SelectSkillAction)
return true
})
if defender.CurrentPet[0].Info.Hp <= 0 && attacker.CurrentPet[0].Info.Hp <= 0 { //先手方死亡,触发反同归于尽
attacker.CurrentPet[0].Info.Hp = 1
if defender.CurPet[0].Info.Hp <= 0 && attacker.CurPet[0].Info.Hp <= 0 { //先手方死亡,触发反同归于尽
attacker.CurPet[0].Info.Hp = 1
}
if defender.CurrentPet[0].Info.Hp <= 0 {
if defender.CurPet[0].Info.Hp <= 0 {
f.TURNOVER(defender)
break
}
if attacker.CurrentPet[0].Info.Hp <= 0 {
if attacker.CurPet[0].Info.Hp <= 0 {
f.TURNOVER(attacker)
break