From ddb6879c02ce8cdfa461ad180c31046518b1f0b2 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Tue, 13 Sep 2022 17:59:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=88=98=E6=96=97=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fight/attribute/attributenumeric.go | 4 + .../battle/fight/component/fightroledata.go | 64 +++----- modules/battle/fight/core/core.go | 138 ++++++++++++++++++ .../fight/{fightenum.go => core/enum.go} | 6 +- modules/battle/fight/fightai.go | 16 ++ modules/battle/fight/fightbase.go | 125 ++++++++-------- modules/battle/fight/fightevent.go | 16 +- modules/battle/fight/fightlog.go | 14 -- modules/battle/fight/fightrole.go | 7 - modules/battle/fight/fighttarget.go | 99 ++++++++++++- modules/battle/fight/fightutils.go | 1 - modules/battle/fight/skill/fightafterskill.go | 1 - .../battle/fight/skill/fightleffectskill.go | 1 - modules/battle/fight/skill/fightskill.go | 10 -- modules/battle/fight/utils.go | 18 +++ 15 files changed, 359 insertions(+), 161 deletions(-) create mode 100644 modules/battle/fight/core/core.go rename modules/battle/fight/{fightenum.go => core/enum.go} (98%) delete mode 100644 modules/battle/fight/fightlog.go delete mode 100644 modules/battle/fight/fightrole.go delete mode 100644 modules/battle/fight/fightutils.go delete mode 100644 modules/battle/fight/skill/fightafterskill.go delete mode 100644 modules/battle/fight/skill/fightleffectskill.go delete mode 100644 modules/battle/fight/skill/fightskill.go create mode 100644 modules/battle/fight/utils.go diff --git a/modules/battle/fight/attribute/attributenumeric.go b/modules/battle/fight/attribute/attributenumeric.go index 71bd1012b..464a56ccc 100644 --- a/modules/battle/fight/attribute/attributenumeric.go +++ b/modules/battle/fight/attribute/attributenumeric.go @@ -37,6 +37,10 @@ type AttributeNumeric struct { BuffProValue *FixedNumeric } +func (this *AttributeNumeric) Value() float32 { + return this.fixedValue.Scalar() +} + func (this *AttributeNumeric) SetBase(value float32) float32 { this.BaseValue.Set(value) this.onChange() diff --git a/modules/battle/fight/component/fightroledata.go b/modules/battle/fight/component/fightroledata.go index 548df961a..79900ab55 100644 --- a/modules/battle/fight/component/fightroledata.go +++ b/modules/battle/fight/component/fightroledata.go @@ -1,105 +1,79 @@ package component -import ( - "go_dreamfactory/modules/battle/fight/attribute" -) +import "go_dreamfactory/modules/battle/fight/attribute" type FightRoleData struct { - //基础属性--------------------------------------------------------------------------------------------------------------------------- - /// - /// 角色名 - /// - Name string /// /// 阵营 1=我 2=敌 /// Side byte /// - /// 种族 1灼热, 2涌动, 3呼啸, 4闪耀 - /// - Race byte - /// - /// 站位 1~5 - /// - Pos byte - /// /// 唯一标记，同时也是List FightBase.Roles的索引 /// Rid byte - /// - /// 是否活着 - /// - ALive bool - /// - /// 是否队长 - /// - Captain bool - /// - /// 队长技 id - /// - CaptainSkillId int - /// - /// 英雄ID - /// - HeroID string - //战斗属性--------------------------------------------------------------------------------------------------------------------------- + //region 战斗属性 /// /// 行动值 /// - Operate attribute.AttributeNumeric + Operate *attribute.AttributeNumeric /// /// 最大生命 /// - MaxHp attribute.AttributeNumeric + MaxHp *attribute.AttributeNumeric /// /// 当前生命 /// - Hp attribute.AttributeNumeric + Hp *attribute.AttributeNumeric /// /// 攻击 /// - Atk attribute.AttributeNumeric + Atk *attribute.AttributeNumeric /// /// 防御 /// - Def attribute.AttributeNumeric + Def *attribute.AttributeNumeric /// /// 速度 /// - Speed attribute.AttributeNumeric + Speed *attribute.AttributeNumeric /// /// 暴击率 /// - Critical attribute.AttributeNumeric + Critical *attribute.AttributeNumeric /// /// 暴击伤害 /// - CriticalPower attribute.AttributeNumeric + CriticalPower *attribute.AttributeNumeric /// /// 效果命中 /// - EffectHit attribute.AttributeNumeric + EffectHit *attribute.AttributeNumeric /// /// 效果抵抗 /// - EfectResist attribute.AttributeNumeric + EfectResist *attribute.AttributeNumeric /// /// 失手率 /// - LostHold attribute.AttributeNumeric + LostHold *attribute.AttributeNumeric /// /// 会心率 /// - UnderStand attribute.AttributeNumeric + UnderStand *attribute.AttributeNumeric + + /// + /// 最后一次skillAtk技能选择的目标 + /// + LastChooseTarget []byte } diff --git a/modules/battle/fight/core/core.go b/modules/battle/fight/core/core.go new file mode 100644 index 000000000..17dec3158 --- /dev/null +++ b/modules/battle/fight/core/core.go @@ -0,0 +1,138 @@ +package core + +import "go_dreamfactory/modules/battle/fight/component" + +type ( + ///战斗控制器 + IFight interface { + GetRoles() []IFightRole + /// 战前逻辑 + BeforeStart() + ///开始战斗 + StartFight() + /// 开始一个回合 + TurnRound() + /// 校验战斗结束 + CheckFightEnd() + /// + /// 获取行动角色 + /// 计算当前可以行动的角色，没有时返回null + /// + GetActionRole() IFightRole + + /// 增加一个参战角色 + AddRole(role IFightRole) + /// 触发队长技，队长技配置在atk表中，触发顺序无所谓 + EmitCaptainSkill() + /// + /// LastActionRole触发SkillId技能，选择的目标是TargetRid + /// 手动时，表现层在玩家操作后，调用本方法 + /// 自动战斗或服务端里，通过FightAI逻辑来自动触发 + /// + /// 技能ID + /// 选择的目标rid + EmitSkill(skillId int32, targetRid []int32) + } + //战斗角色 + IFightRole interface { + GetData() component.FightRoleData + /// 获取行动令牌 + StartAction() + /// 结束行动令牌 + StopAction() + /// 修改行动值 + ModifyOperateValue(newNum float32) + ///接收伤害 + ReceiveDamage(damageValue float32) int + /// 是否致死伤害 + WillDead(damageValue float32) bool + /// 接收治疗 + ReceiveCure(cureValue float32) int + /// + /// 当前是否能进行攻击行为 + /// 如果有行动类控制buff，如昏迷，冰冻等，则不能攻击 + /// + CanAtk() bool + /// 是否死亡 + IsDead() bool + /// 获取下一个技能id + GetNextSkillId() int32 + /// 获取后续子技能 + GetAfterAtk(skillId int) ISkil + /// 触发SkillId技能，选择的目标是TargetRid + EmitSkill(skillId int32, targetRid []int32) + /// 自身的 Buff 和 被动 是否有指定标签 + HasTag(pTag string) bool + ///战斗结束清理 + Clear() + } + //AI + IFightAI interface { + /// 自动触发技能 + AutoEmitSkill(pFightRole IFightRole) + } + //技能对象 + ISkil interface { + /// + /// 触发 + /// 遍历所有ChildSkills，生成对应的实例，并Emit触发 + /// + Emit() + /// + /// 减少CD回合数 + /// + /// 新的回合数 + MinusCD() int32 + /// + /// 增加CD回合数 + /// + /// 新的回合数 + ResetCD() int32 + /// + /// 设置CD回合数为新的值 + /// + /// + /// + SetCD(newVal byte) int32 + /// + /// 战斗结束时的清理 + /// + Clear() + } + //Buff对象 + IBuff interface { + /// 激活Buff + Activate() + /// 结束Buff + End() + /// 增加CD回合数 + AddCD(pVal int32) int32 + /// 减少CD回合数 + MinusCD(pVal int32) int32 + /// 设置CD回合数为新的值 + SetCD(newVal int32) int32 + /// + /// 是否存在指定Tag + /// + HasTag(pTag string) bool + + /// 战斗结束时的清理 + Clear() + } + + ///事件管理 + IFightEvent interface { + //发送事件 + EmitForInt(eventNumber int, args ...interface{}) + //发送事件 + EmitForStr(eventName string, args ...interface{}) + /// 监听消息 + OnForStr(eventName string, f interface{}) + /// 监听消息 + OnForInt(eventNumber int, f interface{}) + /// 移除监听消息 + OffForStr(eventName string, f interface{}) + /// 移除监听消息 + OffForInt(eventNumber int, f interface{}) + } +) diff --git a/modules/battle/fight/fightenum.go b/modules/battle/fight/core/enum.go similarity index 98% rename from modules/battle/fight/fightenum.go rename to modules/battle/fight/core/enum.go index 36077afd8..7e420fff6 100644 --- a/modules/battle/fight/fightenum.go +++ b/modules/battle/fight/core/enum.go @@ -1,4 +1,4 @@ -package fight +package core import "fmt" @@ -164,8 +164,8 @@ const ( type EOrderType int8 const ( - Asc EOrderType = iota - Desc + EOrderType_Asc EOrderType = iota + EOrderType_Desc ) type ComModifyOperate struct { diff --git a/modules/battle/fight/fightai.go b/modules/battle/fight/fightai.go index 706359747..72da27824 100644 --- a/modules/battle/fight/fightai.go +++ b/modules/battle/fight/fightai.go @@ -1,4 +1,20 @@ package fight +import "go_dreamfactory/modules/battle/fight/core" + type FightAI struct { + fight core.IFight +} + +/// +/// 自动触发技能 +/// +func (this *FightAI) AutoEmitSkill(pFightRole core.IFightRole) { + //todo...根据规则，设置对应技能和目标 + skillid := pFightRole.GetNextSkillId() // fightRole.Data.SkillsInfo.Keys.ToArray()[0]; + //临时，随机取一个敌人 + targets := FightTargetFrom(this.fight.GetRoles(), pFightRole, int32(core.AferSkillFromType_Enemy)) + + // FightBase.EmitSkill(skillid, new int[] { targets[0].Data.Rid }) ; + this.fight.EmitSkill(skillid, []int32{int32(targets[0].GetData().Rid)}) } diff --git a/modules/battle/fight/fightbase.go b/modules/battle/fight/fightbase.go index 1305c8470..95b44b48e 100644 --- a/modules/battle/fight/fightbase.go +++ b/modules/battle/fight/fightbase.go @@ -1,81 +1,80 @@ package fight -func NewFightBase() *FightBase { - return &FightBase{} -} +import ( + "go_dreamfactory/modules/battle/fight/core" +) -/// -/// 每场战斗需要new一个类，因为客户端有同时进行多场战斗的需求，所以这里不能是单例 -/// type FightBase struct { - /// + /// 战斗控制器 + fight core.IFight /// 战斗类型 - /// - fightType FightType - /// + fightType core.FightType /// 战斗是否进行中 - /// fightIng bool - /// /// 所有参战角色集合 - /// - Roles []*FightRole - /// + Roles []core.IFightRole /// 当前回合满足行动值大于等于100的所有角色 - /// - CanAtkRoles []*FightRole - /// + CanAtkRoles []core.IFightRole /// 最后一次攻击的角色 - /// - LastActionRole FightRole - /// - /// 是否自动战斗 - /// - AutoFight bool - /// + LastActionRole core.IFightRole /// 战斗AI - /// - FightAI FightAI - /// - /// 随机数种子 - /// - RandSeed int64 - /// - /// 事件系统 - /// - FightEvent IFightEvent - /// - /// 战报 - /// - FightLog FightLog + FightAI core.IFightAI + ///事件系统 + FightEvent core.IFightEvent +} - /// - /// 是否可进入下个循环 - /// - /// - /// 客户端专用逻辑 - /// - ToNextRound bool +/// 开始战斗 +func (this *FightBase) StartFight() { + //战斗开始事件触发 + this.FightEvent.EmitForInt(int(core.EventType_OnFightStart)) + ///战斗开始触发 + this.fight.BeforeStart() + ///触发队长技 + this.fight.EmitCaptainSkill() + ///初始化参战角色行动值 + this.InitRoleOperateValue() + ///开始新的回合 + this.fight.TurnRound() +} + +/// 开始一个回合 +func (this *FightBase) TurnRound() { + //获取当前出手的角色 + actionRole := this.fight.GetActionRole() + if actionRole != nil { + //开始行动 + actionRole.StartAction() + if actionRole.CanAtk() { + this.FightEvent.EmitForInt((int)(core.EventType_OnRoundStart), actionRole) + //自动战斗逻辑 + this.FightAI.AutoEmitSkill(actionRole) + } + } else { + + } } /// -/// 开始战斗 +/// 初始化所有角色的行动值 /// -func (this *FightBase) StartFight() { - this.fightIng = true +func (this *FightBase) InitRoleOperateValue() { - // FightDebug.Log("=========开始战斗=========") - - //记录战报 - // var com = new(ComStartFight) - // FightLog.AddCommand(com) - //不直接用enum，防止装箱拆箱 - this.FightEvent.Emit(int(EventType_OnFightStart)) - - // BeforeStart() - // EmitCaptainSkill() - // EmitPassiveSkillSkill() - // //todo...符文技？？ - // InitRoleOperateValue() - // TurnRound() +} + +/// +/// 排序所有角色 +/// +/// 排序方式 +/// 升序还是降序：asc/desc +func (this *FightBase) Order(orderBy string, pOrder core.EOrderType) { + if len(this.Roles) <= 1 { + return + } + + // if (pOrder == core.EOrderType_Asc){ + + // } + // else{ + + // } } diff --git a/modules/battle/fight/fightevent.go b/modules/battle/fight/fightevent.go index 6d932bfa1..34bb5c0c5 100644 --- a/modules/battle/fight/fightevent.go +++ b/modules/battle/fight/fightevent.go @@ -1,17 +1,5 @@ package fight -type IFightEvent interface { - Emit(eventNumber int, args ...interface{}) -} - type FightEvent struct { -} - -/// -/// 发送消息 -/// -/// -/// -func (this *FightEvent) Emit(eventNumber int, args ...interface{}) { - -} + +} \ No newline at end of file diff --git a/modules/battle/fight/fightlog.go b/modules/battle/fight/fightlog.go deleted file mode 100644 index 2d0338deb..000000000 --- a/modules/battle/fight/fightlog.go +++ /dev/null @@ -1,14 +0,0 @@ -package fight - -type FightLog struct { - Commands []interface{} -} - -/// -/// 增加战报日志 -/// -/// -func (this *FightLog) AddCommand(log interface{}) { - //FightDebug.Log($"战报：{log.ToString()}"); - // this.Commands = app -} diff --git a/modules/battle/fight/fightrole.go b/modules/battle/fight/fightrole.go deleted file mode 100644 index 309dcf949..000000000 --- a/modules/battle/fight/fightrole.go +++ /dev/null @@ -1,7 +0,0 @@ -package fight - -import "go_dreamfactory/modules/battle/fight/component" - -type FightRole struct { - Data component.FightRoleData -} diff --git a/modules/battle/fight/fighttarget.go b/modules/battle/fight/fighttarget.go index 22b9bf415..ad3701a59 100644 --- a/modules/battle/fight/fighttarget.go +++ b/modules/battle/fight/fighttarget.go @@ -1,7 +1,102 @@ package fight +import "go_dreamfactory/modules/battle/fight/core" + /// -/// 子技能目标选择 +/// 从roles里，过滤出符合设定的对象List /// -type FightTarget struct { +/// 筛选前List +/// 当前行动role +/// afterSkill里设置的From +/// +func FightTargetFrom(roles []core.IFightRole, actionRole core.IFightRole, from int32) []core.IFightRole { + switch from { + case int32(core.AferSkillFromType_All): + // 选所有 + return roles + case int32(core.AferSkillFromType_Friend): + // 只选友方 + result := make([]core.IFightRole, 0) + // roles.FindAll(role => role.Data.Side == actionRole.Data.Side); + for _, v := range roles { + if v.GetData().Side == actionRole.GetData().Side { + result = append(result, v) + } + } + return result + case int32(core.AferSkillFromType_Enemy): + // 只选敌方 + // return roles.FindAll(role => role.Data.Side != actionRole.Data.Side); + // 只选友方 + result := make([]core.IFightRole, 0) + // roles.FindAll(role => role.Data.Side == actionRole.Data.Side); + for _, v := range roles { + if v.GetData().Side != actionRole.GetData().Side { + result = append(result, v) + } + } + return result + case int32(core.AferSkillFromType_Self): + // 只选自己 + return []core.IFightRole{actionRole} + case int32(core.AferSkillFromType_PlayerChoose): + // 只选skillAtk里选择的目标 + // return roles.FindAll(role => actionRole.Data.LastChooseTarget.Contains(role.Data.Rid)); + result := make([]core.IFightRole, 0) + // roles.FindAll(role => role.Data.Side == actionRole.Data.Side); + for _, v := range roles { + for _, v1 := range actionRole.GetData().LastChooseTarget { + if v.GetData().Rid == v1 { + result = append(result, v) + break + } + } + } + return result + + case int32(core.AferSkillFromType_FriendExceptSelf): + // 除自己外的友方 + // return roles.FindAll(role => role.Data.Side == actionRole.Data.Side && role != actionRole); + result := make([]core.IFightRole, 0) + // roles.FindAll(role => role.Data.Side == actionRole.Data.Side); + for _, v := range roles { + if v.GetData().Side == actionRole.GetData().Side && v != actionRole { + result = append(result, v) + } + } + return result + case int32(core.AferSkillFromType_EnemyExceptChoose): + // 除选定目标外的其他敌方 + // return roles.FindAll(role => role.Data.Side != actionRole.Data.Side && !actionRole.Data.LastChooseTarget.Contains(role.Data.Rid)); + result := make([]core.IFightRole, 0) + for _, v := range roles { + if v.GetData().Side != actionRole.GetData().Side { + for _, v1 := range actionRole.GetData().LastChooseTarget { + if v.GetData().Rid == v1 { + result = append(result, v) + break + } + } + } + } + return result + case int32(core.AferSkillFromType_FriendExceptChoose): + // 除选定目标外的其他敌方 + // return roles.FindAll(role => role.Data.Side != actionRole.Data.Side && !actionRole.Data.LastChooseTarget.Contains(role.Data.Rid)); + result := make([]core.IFightRole, 0) + for _, v := range roles { + if v.GetData().Side != actionRole.GetData().Side { + for _, v1 := range actionRole.GetData().LastChooseTarget { + if v.GetData().Rid == v1 { + result = append(result, v) + break + } + } + } + } + return result + // 除选定目标外的其他友方 + // return roles.FindAll(role => role.Data.Side == actionRole.Data.Side && !actionRole.Data.LastChooseTarget.Contains(role.Data.Rid)); + } + return []core.IFightRole{} } diff --git a/modules/battle/fight/fightutils.go b/modules/battle/fight/fightutils.go deleted file mode 100644 index 34907e96c..000000000 --- a/modules/battle/fight/fightutils.go +++ /dev/null @@ -1 +0,0 @@ -package fight diff --git a/modules/battle/fight/skill/fightafterskill.go b/modules/battle/fight/skill/fightafterskill.go deleted file mode 100644 index 0ebd324fa..000000000 --- a/modules/battle/fight/skill/fightafterskill.go +++ /dev/null @@ -1 +0,0 @@ -package skill diff --git a/modules/battle/fight/skill/fightleffectskill.go b/modules/battle/fight/skill/fightleffectskill.go deleted file mode 100644 index 0ebd324fa..000000000 --- a/modules/battle/fight/skill/fightleffectskill.go +++ /dev/null @@ -1 +0,0 @@ -package skill diff --git a/modules/battle/fight/skill/fightskill.go b/modules/battle/fight/skill/fightskill.go deleted file mode 100644 index eb80789c1..000000000 --- a/modules/battle/fight/skill/fightskill.go +++ /dev/null @@ -1,10 +0,0 @@ -package skill - -/// -/// 主动/队长技能 -/// -/// -/// 遍历触发子技能 -/// -type FightSkill struct { -} diff --git a/modules/battle/fight/utils.go b/modules/battle/fight/utils.go new file mode 100644 index 000000000..2ba2cbc64 --- /dev/null +++ b/modules/battle/fight/utils.go @@ -0,0 +1,18 @@ +package fight + +import ( + "go_dreamfactory/modules/battle/fight/core" + "sort" +) + +type FightRoleSlice []core.IFightRole + +func (x FightRoleSlice) Len() int { return len(x) } +func (x FightRoleSlice) Less(i, j int) bool { + return x[i].GetData().Operate.Value() < x[j].GetData().Operate.Value() +} +func (x FightRoleSlice) Swap(i, j int) { x[i], x[j] = x[j], x[i] } + +func (x FightRoleSlice) Sort(pType string) { + sort.Sort(x) +}