From d5b82a06295b3e15d68301ff79b66d8b023ff7e2 Mon Sep 17 00:00:00 2001 From: cd <-> Date: Thu, 1 Jun 2023 00:36:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90component?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Scripts/ECS/Component/AIComponent.cs | 2 - .../Scripts/ECS/Component/ViewComponent.cs | 2 +- .../Game/Scripts/ECS/System/AISystem.cs | 5 --- .../Game/Scripts/ECS/System/BulletSystem.cs | 33 --------------- .../Game/Scripts/MonoScript/Blueprint.meta | 8 ---- .../Blueprint/BlueprintBasicData.cs | 11 ----- .../Blueprint/BlueprintBasicData.cs.meta | 11 ----- .../Assets/Game/Scripts/_Define/GameConst.cs | 6 --- .../Game/Scripts/_Define/GameConstEntity.cs | 4 -- client/Assets/Generated/Contexts.cs | 4 +- .../Game/Components/GameAIComponent.cs | 42 +++++++++---------- .../Game/Components/GameAnimationComponent.cs | 30 +++++++------ .../Game/Components/GameBagComponent.cs | 24 ++++------- .../Game/Components/GameBuffComponent.cs | 24 ++++------- .../Game/Components/GameBulletComponent.cs | 26 +++++------- .../Game/Components/GameComboComponent.cs | 26 +++++------- .../Game/Components/GameHpComponent.cs | 36 ++++++++-------- .../Game/Components/GameInteractComponent.cs | 28 ++++++------- .../Components/GameMasterSoulComponent.cs | 12 +++++- .../Game/Components/GameMoveComponent.cs | 18 ++++++-- .../Game/Components/GamePauseComponent.cs | 10 +++-- .../Game/Components/GameViewComponent.cs | 42 ++++++++++++------- 22 files changed, 159 insertions(+), 245 deletions(-) delete mode 100644 client/Assets/Game/Scripts/MonoScript/Blueprint.meta delete mode 100644 client/Assets/Game/Scripts/MonoScript/Blueprint/BlueprintBasicData.cs delete mode 100644 client/Assets/Game/Scripts/MonoScript/Blueprint/BlueprintBasicData.cs.meta diff --git a/client/Assets/Game/Scripts/ECS/Component/AIComponent.cs b/client/Assets/Game/Scripts/ECS/Component/AIComponent.cs index 387f20c..1775404 100644 --- a/client/Assets/Game/Scripts/ECS/Component/AIComponent.cs +++ b/client/Assets/Game/Scripts/ECS/Component/AIComponent.cs @@ -17,7 +17,6 @@ namespace Game [Game] public class AIComponent : IComponent { - public bool IsInit = false; public float ThinkCdMax; //思考频率 public float ThinkCdNow; public MetaData Hungry = new MetaData(); @@ -37,7 +36,6 @@ namespace Game public static void ClearAI(GameEntity entity) { var ai = entity.aI; - ai.IsInit = false; ai.Hungry.Value = 0; ai.HungryMax.Value = 1; ai.IsHungryFull.Value = false; diff --git a/client/Assets/Game/Scripts/ECS/Component/ViewComponent.cs b/client/Assets/Game/Scripts/ECS/Component/ViewComponent.cs index c5e7722..cc4487f 100644 --- a/client/Assets/Game/Scripts/ECS/Component/ViewComponent.cs +++ b/client/Assets/Game/Scripts/ECS/Component/ViewComponent.cs @@ -22,7 +22,7 @@ public class ViewComponent : IComponent public Vector3 PositionPre; public SpriteRenderer SpriteRenderer; //物体的主要sprite - public readonly MetaData PosView = new MetaData(); + public MetaData PosView = new MetaData(); //额外对象 public List EffectObject = new List(); //挂在实体上的特效 diff --git a/client/Assets/Game/Scripts/ECS/System/AISystem.cs b/client/Assets/Game/Scripts/ECS/System/AISystem.cs index 087fe62..bae1448 100644 --- a/client/Assets/Game/Scripts/ECS/System/AISystem.cs +++ b/client/Assets/Game/Scripts/ECS/System/AISystem.cs @@ -58,11 +58,6 @@ public class AISystem : IExecuteSystem, IInitializeSystem return; } - if (!ai.IsInit) - { - ai.IsInit = true; - } - ai.ThinkCdNow -= Time.deltaTime; if (ai.ThinkCdNow > 0) { diff --git a/client/Assets/Game/Scripts/ECS/System/BulletSystem.cs b/client/Assets/Game/Scripts/ECS/System/BulletSystem.cs index 3c55a38..dc6dd3e 100644 --- a/client/Assets/Game/Scripts/ECS/System/BulletSystem.cs +++ b/client/Assets/Game/Scripts/ECS/System/BulletSystem.cs @@ -39,39 +39,6 @@ public class BulletSystem : IExecuteSystem, IInitializeSystem Util.DestroyEntity(entity); } } - // public void UpdateBullet(GameEntity entity) - // { - // var id = entity.iD; - // var bullet = entity.bullet; - // var cfg = id.data; - // var bp = cfg.blueprint; - // var view = entity.view; - // bullet.data.target = bullet.target; - // switch (bullet.state) - // { - // case EBpState.Enter: - // Util.RunBP(bp, GameConst.BP_ENTRANCE_Enter, bullet.data); - // bullet.state = EBpState.Update; - // break; - // case EBpState.Update: - // var timePast = Mathf.Min(Time.deltaTime, bullet.timeLeft); - // bullet.timeLeft -= timePast; - // if (bullet.timeLeft == 0) - // { - // bullet.state = EBpState.Leave; - // } - // if (bullet.positionPre != Vector3.zero) - // { - // Util.RunBP(bp, GameConst.BP_ENTRANCE_Update, bullet.data); - // } - // bullet.positionPre = entity.GetPos(); //刷新上一次位置 - // break; - // case EBpState.Leave: - // Util.RunBP(bp, GameConst.BP_ENTRANCE_Leave, bullet.data); - // Util.DestroyEntity(entity); - // break; - // } - // } public void UpdateBulletViewRot(GameEntity entity) { var view = entity.view; diff --git a/client/Assets/Game/Scripts/MonoScript/Blueprint.meta b/client/Assets/Game/Scripts/MonoScript/Blueprint.meta deleted file mode 100644 index 76ad8f2..0000000 --- a/client/Assets/Game/Scripts/MonoScript/Blueprint.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eaf184399c555614f8980150de8da698 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/client/Assets/Game/Scripts/MonoScript/Blueprint/BlueprintBasicData.cs b/client/Assets/Game/Scripts/MonoScript/Blueprint/BlueprintBasicData.cs deleted file mode 100644 index 4211a03..0000000 --- a/client/Assets/Game/Scripts/MonoScript/Blueprint/BlueprintBasicData.cs +++ /dev/null @@ -1,11 +0,0 @@ -using UnityEngine; - -namespace Game -{ - public class BlueprintBasicData2 : MonoBehaviour - { - public int entity; - public int target; - public int owner; - } -} \ No newline at end of file diff --git a/client/Assets/Game/Scripts/MonoScript/Blueprint/BlueprintBasicData.cs.meta b/client/Assets/Game/Scripts/MonoScript/Blueprint/BlueprintBasicData.cs.meta deleted file mode 100644 index 181d91f..0000000 --- a/client/Assets/Game/Scripts/MonoScript/Blueprint/BlueprintBasicData.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f550512c89805df4b93b7f51457783bf -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/client/Assets/Game/Scripts/_Define/GameConst.cs b/client/Assets/Game/Scripts/_Define/GameConst.cs index 6b312d3..ce5bb97 100644 --- a/client/Assets/Game/Scripts/_Define/GameConst.cs +++ b/client/Assets/Game/Scripts/_Define/GameConst.cs @@ -5,12 +5,6 @@ namespace Game { public abstract partial class GameConst { - //通用蓝图入口标记 - public const string BpEntranceEnter = "Enter"; //进入 初始化 - public const string BpEntranceUpdate = "Update"; //tick更新 - public const string BpEntranceLeave = "Leave"; //退出 - public const string BpEntranceExecute = "Execute"; //执行特殊逻辑 - //全局 public const int FPS = 60; public const float LoadingMinTime = 0.5f; //过图最少loading时间 diff --git a/client/Assets/Game/Scripts/_Define/GameConstEntity.cs b/client/Assets/Game/Scripts/_Define/GameConstEntity.cs index 380be92..f5fb1ef 100644 --- a/client/Assets/Game/Scripts/_Define/GameConstEntity.cs +++ b/client/Assets/Game/Scripts/_Define/GameConstEntity.cs @@ -32,9 +32,5 @@ namespace Game public const string EffectHitShieldBreak = "effect_hit_shield_break01"; // 默认护盾击破 public const string EffectHitKill = "effect_hit_kill01"; // 默认击杀 - //通用蓝图 - public const string BlueprintAICommon = "AICommon/monster"; - public const string BlueprintAIDirectorCommon = "AICommon/director"; - } } \ No newline at end of file diff --git a/client/Assets/Generated/Contexts.cs b/client/Assets/Generated/Contexts.cs index 1969125..76847b1 100644 --- a/client/Assets/Generated/Contexts.cs +++ b/client/Assets/Generated/Contexts.cs @@ -71,8 +71,8 @@ public partial class Contexts { public static class ContextsExtensions { - public static GameEntity GetEntityWithID(this GameContext context, int value) { - return ((Entitas.PrimaryEntityIndex)context.GetEntityIndex(Contexts.ID)).GetEntity(value); + public static GameEntity GetEntityWithID(this GameContext context, int Value) { + return ((Entitas.PrimaryEntityIndex)context.GetEntityIndex(Contexts.ID)).GetEntity(Value); } } //------------------------------------------------------------------------------ diff --git a/client/Assets/Generated/Game/Components/GameAIComponent.cs b/client/Assets/Generated/Game/Components/GameAIComponent.cs index 73d8264..3aa400f 100644 --- a/client/Assets/Generated/Game/Components/GameAIComponent.cs +++ b/client/Assets/Generated/Game/Components/GameAIComponent.cs @@ -6,42 +6,44 @@ // the code is regenerated. // //------------------------------------------------------------------------------ -public partial class GameEntity -{ +public partial class GameEntity { public AIComponent aI { get { return (AIComponent)GetComponent(GameComponentsLookup.AI); } } public bool hasAI { get { return HasComponent(GameComponentsLookup.AI); } } - public void AddAI( bool newIsInit, Game.EAIModuleType newModuleType, int newTarget, float newThinkCDMax, float newThinkCDNow, Game.MetaData newHungry, Game.MetaData newHungryMax, float newHungryIncrease, float newHungryIncreaseRate) - { + public void AddAI(float newThinkCdMax, float newThinkCdNow, Game.MetaData newHungry, Game.MetaData newHungryMax, Game.MetaData newModuleType, float newHungryIncrease, float newHungryIncreaseRate, Game.MetaData newIsHungryFull, Game.MetaData newAttackPermit, Game.BehaviorTreePoolItem newBehaviorTree) { var index = GameComponentsLookup.AI; var component = (AIComponent)CreateComponent(index, typeof(AIComponent)); - component.IsInit = newIsInit; - component.ThinkCdMax = newThinkCDMax; - component.ThinkCdNow = newThinkCDNow; + component.ThinkCdMax = newThinkCdMax; + component.ThinkCdNow = newThinkCdNow; component.Hungry = newHungry; component.HungryMax = newHungryMax; + component.ModuleType = newModuleType; component.HungryIncrease = newHungryIncrease; component.HungryIncreaseRate = newHungryIncreaseRate; + component.IsHungryFull = newIsHungryFull; + component.AttackPermit = newAttackPermit; + component.BehaviorTree = newBehaviorTree; AddComponent(index, component); } - public void ReplaceAI( bool newIsInit, Game.EAIModuleType newModuleType, int newTarget, float newThinkCDMax, float newThinkCDNow, Game.MetaData newHungry, Game.MetaData newHungryMax, float newHungryIncrease, float newHungryIncreaseRate) - { + public void ReplaceAI(float newThinkCdMax, float newThinkCdNow, Game.MetaData newHungry, Game.MetaData newHungryMax, Game.MetaData newModuleType, float newHungryIncrease, float newHungryIncreaseRate, Game.MetaData newIsHungryFull, Game.MetaData newAttackPermit, Game.BehaviorTreePoolItem newBehaviorTree) { var index = GameComponentsLookup.AI; var component = (AIComponent)CreateComponent(index, typeof(AIComponent)); - component.IsInit = newIsInit; - component.ThinkCdMax = newThinkCDMax; - component.ThinkCdNow = newThinkCDNow; + component.ThinkCdMax = newThinkCdMax; + component.ThinkCdNow = newThinkCdNow; component.Hungry = newHungry; component.HungryMax = newHungryMax; + component.ModuleType = newModuleType; component.HungryIncrease = newHungryIncrease; component.HungryIncreaseRate = newHungryIncreaseRate; + component.IsHungryFull = newIsHungryFull; + component.AttackPermit = newAttackPermit; + component.BehaviorTree = newBehaviorTree; ReplaceComponent(index, component); } - public void RemoveAI() - { + public void RemoveAI() { RemoveComponent(GameComponentsLookup.AI); } } @@ -54,17 +56,13 @@ public partial class GameEntity // the code is regenerated. // //------------------------------------------------------------------------------ -public sealed partial class GameMatcher -{ +public sealed partial class GameMatcher { static Entitas.IMatcher _matcherAI; - public static Entitas.IMatcher AI - { - get - { - if (_matcherAI == null) - { + public static Entitas.IMatcher AI { + get { + if (_matcherAI == null) { var matcher = (Entitas.Matcher)Entitas.Matcher.AllOf(GameComponentsLookup.AI); matcher.componentNames = GameComponentsLookup.componentNames; _matcherAI = matcher; diff --git a/client/Assets/Generated/Game/Components/GameAnimationComponent.cs b/client/Assets/Generated/Game/Components/GameAnimationComponent.cs index a954a5e..f4634c4 100644 --- a/client/Assets/Generated/Game/Components/GameAnimationComponent.cs +++ b/client/Assets/Generated/Game/Components/GameAnimationComponent.cs @@ -6,20 +6,21 @@ // the code is regenerated. // //------------------------------------------------------------------------------ -public partial class GameEntity -{ +public partial class GameEntity { public AnimationComponent animation { get { return (AnimationComponent)GetComponent(GameComponentsLookup.Animation); } } public bool hasAnimation { get { return HasComponent(GameComponentsLookup.Animation); } } - public void AddAnimation(UnityEngine.Animator newAnimator, UnityEngine.AnimatorOverrideController newAnimatorOverrideController, bool newIsFreeControl, bool newIsTimelineAnother, bool newHitMsg, bool newAirHitMsg, bool newReboundMsg, bool newDieMsg, bool newResetMsg) - { + public void AddAnimation(UnityEngine.Animator newAnimator, UnityEngine.AnimatorOverrideController newAnimatorOverrideController, bool newIsTimelineAnother, bool newHitMsg, bool newMHitMsg, bool newLHitMsg, bool newStunHitMsg, bool newAirHitMsg, bool newReboundMsg, bool newDieMsg, bool newResetMsg) { var index = GameComponentsLookup.Animation; var component = (AnimationComponent)CreateComponent(index, typeof(AnimationComponent)); component.Animator = newAnimator; component.AnimatorOverrideController = newAnimatorOverrideController; component.IsTimelineAnother = newIsTimelineAnother; component.HitMsg = newHitMsg; + component.MHitMsg = newMHitMsg; + component.LHitMsg = newLHitMsg; + component.StunHitMsg = newStunHitMsg; component.AirHitMsg = newAirHitMsg; component.ReboundMsg = newReboundMsg; component.DieMsg = newDieMsg; @@ -27,14 +28,16 @@ public partial class GameEntity AddComponent(index, component); } - public void ReplaceAnimation(UnityEngine.Animator newAnimator, UnityEngine.AnimatorOverrideController newAnimatorOverrideController, bool newIsFreeControl, bool newIsTimelineAnother, bool newHitMsg, bool newAirHitMsg, bool newReboundMsg, bool newDieMsg, bool newResetMsg) - { + public void ReplaceAnimation(UnityEngine.Animator newAnimator, UnityEngine.AnimatorOverrideController newAnimatorOverrideController, bool newIsTimelineAnother, bool newHitMsg, bool newMHitMsg, bool newLHitMsg, bool newStunHitMsg, bool newAirHitMsg, bool newReboundMsg, bool newDieMsg, bool newResetMsg) { var index = GameComponentsLookup.Animation; var component = (AnimationComponent)CreateComponent(index, typeof(AnimationComponent)); component.Animator = newAnimator; component.AnimatorOverrideController = newAnimatorOverrideController; component.IsTimelineAnother = newIsTimelineAnother; component.HitMsg = newHitMsg; + component.MHitMsg = newMHitMsg; + component.LHitMsg = newLHitMsg; + component.StunHitMsg = newStunHitMsg; component.AirHitMsg = newAirHitMsg; component.ReboundMsg = newReboundMsg; component.DieMsg = newDieMsg; @@ -42,8 +45,7 @@ public partial class GameEntity ReplaceComponent(index, component); } - public void RemoveAnimation() - { + public void RemoveAnimation() { RemoveComponent(GameComponentsLookup.Animation); } } @@ -56,17 +58,13 @@ public partial class GameEntity // the code is regenerated. // //------------------------------------------------------------------------------ -public sealed partial class GameMatcher -{ +public sealed partial class GameMatcher { static Entitas.IMatcher _matcherAnimation; - public static Entitas.IMatcher Animation - { - get - { - if (_matcherAnimation == null) - { + public static Entitas.IMatcher Animation { + get { + if (_matcherAnimation == null) { var matcher = (Entitas.Matcher)Entitas.Matcher.AllOf(GameComponentsLookup.Animation); matcher.componentNames = GameComponentsLookup.componentNames; _matcherAnimation = matcher; diff --git a/client/Assets/Generated/Game/Components/GameBagComponent.cs b/client/Assets/Generated/Game/Components/GameBagComponent.cs index 6ec792d..9b05466 100644 --- a/client/Assets/Generated/Game/Components/GameBagComponent.cs +++ b/client/Assets/Generated/Game/Components/GameBagComponent.cs @@ -6,14 +6,12 @@ // the code is regenerated. // //------------------------------------------------------------------------------ -public partial class GameEntity -{ +public partial class GameEntity { public BagComponent bag { get { return (BagComponent)GetComponent(GameComponentsLookup.Bag); } } public bool hasBag { get { return HasComponent(GameComponentsLookup.Bag); } } - public void AddBag(Game.MetaDictionary newAllBless, Game.MetaDictionary newMainBless, System.Collections.Generic.List newChooseBless) - { + public void AddBag(Game.MetaDictionary newAllBless, System.Collections.Generic.List newChooseBless) { var index = GameComponentsLookup.Bag; var component = (BagComponent)CreateComponent(index, typeof(BagComponent)); component.AllBless = newAllBless; @@ -21,8 +19,7 @@ public partial class GameEntity AddComponent(index, component); } - public void ReplaceBag(Game.MetaDictionary newAllBless, Game.MetaDictionary newMainBless, System.Collections.Generic.List newChooseBless) - { + public void ReplaceBag(Game.MetaDictionary newAllBless, System.Collections.Generic.List newChooseBless) { var index = GameComponentsLookup.Bag; var component = (BagComponent)CreateComponent(index, typeof(BagComponent)); component.AllBless = newAllBless; @@ -30,8 +27,7 @@ public partial class GameEntity ReplaceComponent(index, component); } - public void RemoveBag() - { + public void RemoveBag() { RemoveComponent(GameComponentsLookup.Bag); } } @@ -44,17 +40,13 @@ public partial class GameEntity // the code is regenerated. // //------------------------------------------------------------------------------ -public sealed partial class GameMatcher -{ +public sealed partial class GameMatcher { static Entitas.IMatcher _matcherBag; - public static Entitas.IMatcher Bag - { - get - { - if (_matcherBag == null) - { + public static Entitas.IMatcher Bag { + get { + if (_matcherBag == null) { var matcher = (Entitas.Matcher)Entitas.Matcher.AllOf(GameComponentsLookup.Bag); matcher.componentNames = GameComponentsLookup.componentNames; _matcherBag = matcher; diff --git a/client/Assets/Generated/Game/Components/GameBuffComponent.cs b/client/Assets/Generated/Game/Components/GameBuffComponent.cs index b618a89..1b9735f 100644 --- a/client/Assets/Generated/Game/Components/GameBuffComponent.cs +++ b/client/Assets/Generated/Game/Components/GameBuffComponent.cs @@ -6,30 +6,26 @@ // the code is regenerated. // //------------------------------------------------------------------------------ -public partial class GameEntity -{ +public partial class GameEntity { public BuffComponent buff { get { return (BuffComponent)GetComponent(GameComponentsLookup.Buff); } } public bool hasBuff { get { return HasComponent(GameComponentsLookup.Buff); } } - public void AddBuff(Game.MetaDictionary newBuffMap, Game.MetaData newElementMask, System.Collections.Generic.List> newElementBuffList) - { + public void AddBuff(Game.MetaDictionary newBuffMap) { var index = GameComponentsLookup.Buff; var component = (BuffComponent)CreateComponent(index, typeof(BuffComponent)); component.BuffMap = newBuffMap; AddComponent(index, component); } - public void ReplaceBuff(Game.MetaDictionary newBuffMap, Game.MetaData newElementMask, System.Collections.Generic.List> newElementBuffList) - { + public void ReplaceBuff(Game.MetaDictionary newBuffMap) { var index = GameComponentsLookup.Buff; var component = (BuffComponent)CreateComponent(index, typeof(BuffComponent)); component.BuffMap = newBuffMap; ReplaceComponent(index, component); } - public void RemoveBuff() - { + public void RemoveBuff() { RemoveComponent(GameComponentsLookup.Buff); } } @@ -42,17 +38,13 @@ public partial class GameEntity // the code is regenerated. // //------------------------------------------------------------------------------ -public sealed partial class GameMatcher -{ +public sealed partial class GameMatcher { static Entitas.IMatcher _matcherBuff; - public static Entitas.IMatcher Buff - { - get - { - if (_matcherBuff == null) - { + public static Entitas.IMatcher Buff { + get { + if (_matcherBuff == null) { var matcher = (Entitas.Matcher)Entitas.Matcher.AllOf(GameComponentsLookup.Buff); matcher.componentNames = GameComponentsLookup.componentNames; _matcherBuff = matcher; diff --git a/client/Assets/Generated/Game/Components/GameBulletComponent.cs b/client/Assets/Generated/Game/Components/GameBulletComponent.cs index 62e4f66..41e855a 100644 --- a/client/Assets/Generated/Game/Components/GameBulletComponent.cs +++ b/client/Assets/Generated/Game/Components/GameBulletComponent.cs @@ -6,30 +6,28 @@ // the code is regenerated. // //------------------------------------------------------------------------------ -public partial class GameEntity -{ +public partial class GameEntity { public BulletComponent bullet { get { return (BulletComponent)GetComponent(GameComponentsLookup.Bullet); } } public bool hasBullet { get { return HasComponent(GameComponentsLookup.Bullet); } } - public void AddBullet( int newTarget, int newOwner, UnityEngine.Vector3 newCastDir, float newTimeLeft, UnityEngine.Vector3 newPositionPre) - { + public void AddBullet(UnityEngine.Vector3 newCastDir, string newTimeline) { var index = GameComponentsLookup.Bullet; var component = (BulletComponent)CreateComponent(index, typeof(BulletComponent)); component.CastDir = newCastDir; + component.Timeline = newTimeline; AddComponent(index, component); } - public void ReplaceBullet(int newTarget, int newOwner, UnityEngine.Vector3 newCastDir, float newTimeLeft, UnityEngine.Vector3 newPositionPre) - { + public void ReplaceBullet(UnityEngine.Vector3 newCastDir, string newTimeline) { var index = GameComponentsLookup.Bullet; var component = (BulletComponent)CreateComponent(index, typeof(BulletComponent)); component.CastDir = newCastDir; + component.Timeline = newTimeline; ReplaceComponent(index, component); } - public void RemoveBullet() - { + public void RemoveBullet() { RemoveComponent(GameComponentsLookup.Bullet); } } @@ -42,17 +40,13 @@ public partial class GameEntity // the code is regenerated. // //------------------------------------------------------------------------------ -public sealed partial class GameMatcher -{ +public sealed partial class GameMatcher { static Entitas.IMatcher _matcherBullet; - public static Entitas.IMatcher Bullet - { - get - { - if (_matcherBullet == null) - { + public static Entitas.IMatcher Bullet { + get { + if (_matcherBullet == null) { var matcher = (Entitas.Matcher)Entitas.Matcher.AllOf(GameComponentsLookup.Bullet); matcher.componentNames = GameComponentsLookup.componentNames; _matcherBullet = matcher; diff --git a/client/Assets/Generated/Game/Components/GameComboComponent.cs b/client/Assets/Generated/Game/Components/GameComboComponent.cs index 364650d..0d93c7d 100644 --- a/client/Assets/Generated/Game/Components/GameComboComponent.cs +++ b/client/Assets/Generated/Game/Components/GameComboComponent.cs @@ -6,18 +6,17 @@ // the code is regenerated. // //------------------------------------------------------------------------------ -public partial class GameEntity -{ +public partial class GameEntity { public ComboComponent combo { get { return (ComboComponent)GetComponent(GameComponentsLookup.Combo); } } public bool hasCombo { get { return HasComponent(GameComponentsLookup.Combo); } } - public void AddCombo(System.Collections.Generic.List newWeaponList, Game.MetaData newWeaponNow, System.Collections.Generic.Dictionary, string> newSkillDict, System.Collections.Generic.Dictionary newSkillAnyDict, System.Collections.Generic.HashSet newSkillSet, Game.EComboStance newStance, Game.EComboStance newPreStance, System.Collections.Generic.List newInputQueue, float newTriggerCancelSafeTime, System.Collections.Generic.HashSet newKeyPressSet, Game.EMoveCommand newMoveCommand, bool newIsJumpCancelable, bool newIsGroundCancelable, bool newIsSkillCancelable, int newTargetLock, System.Collections.Generic.Dictionary newTargetLastLockTime, Game.MetaData newTargetInteract) - { + public void AddCombo(System.Collections.Generic.List newWeaponList, Game.MetaData newWeaponNow, System.Collections.Generic.Dictionary newWeaponSkillDict, Game.EComboStance newStance, Game.EComboStance newPreStance, System.Collections.Generic.List newInputQueue, float newTriggerCancelSafeTime, System.Collections.Generic.HashSet newKeyPressSet, Game.EMoveCommand newMoveCommand, bool newIsJumpCancelable, bool newIsGroundCancelable, bool newIsSkillCancelable, int newTargetLock, System.Collections.Generic.Dictionary newTargetLastLockTime, Game.MetaData newTargetInteract) { var index = GameComponentsLookup.Combo; var component = (ComboComponent)CreateComponent(index, typeof(ComboComponent)); component.WeaponList = newWeaponList; component.WeaponNow = newWeaponNow; + component.WeaponSkillDict = newWeaponSkillDict; component.Stance = newStance; component.PreStance = newPreStance; component.InputQueue = newInputQueue; @@ -33,12 +32,12 @@ public partial class GameEntity AddComponent(index, component); } - public void ReplaceCombo(System.Collections.Generic.List newWeaponList, Game.MetaData newWeaponNow, System.Collections.Generic.Dictionary, string> newSkillDict, System.Collections.Generic.Dictionary newSkillAnyDict, System.Collections.Generic.HashSet newSkillSet, Game.EComboStance newStance, Game.EComboStance newPreStance, System.Collections.Generic.List newInputQueue, float newTriggerCancelSafeTime, System.Collections.Generic.HashSet newKeyPressSet, Game.EMoveCommand newMoveCommand, bool newIsJumpCancelable, bool newIsGroundCancelable, bool newIsSkillCancelable, int newTargetLock, System.Collections.Generic.Dictionary newTargetLastLockTime, Game.MetaData newTargetInteract) - { + public void ReplaceCombo(System.Collections.Generic.List newWeaponList, Game.MetaData newWeaponNow, System.Collections.Generic.Dictionary newWeaponSkillDict, Game.EComboStance newStance, Game.EComboStance newPreStance, System.Collections.Generic.List newInputQueue, float newTriggerCancelSafeTime, System.Collections.Generic.HashSet newKeyPressSet, Game.EMoveCommand newMoveCommand, bool newIsJumpCancelable, bool newIsGroundCancelable, bool newIsSkillCancelable, int newTargetLock, System.Collections.Generic.Dictionary newTargetLastLockTime, Game.MetaData newTargetInteract) { var index = GameComponentsLookup.Combo; var component = (ComboComponent)CreateComponent(index, typeof(ComboComponent)); component.WeaponList = newWeaponList; component.WeaponNow = newWeaponNow; + component.WeaponSkillDict = newWeaponSkillDict; component.Stance = newStance; component.PreStance = newPreStance; component.InputQueue = newInputQueue; @@ -54,8 +53,7 @@ public partial class GameEntity ReplaceComponent(index, component); } - public void RemoveCombo() - { + public void RemoveCombo() { RemoveComponent(GameComponentsLookup.Combo); } } @@ -68,17 +66,13 @@ public partial class GameEntity // the code is regenerated. // //------------------------------------------------------------------------------ -public sealed partial class GameMatcher -{ +public sealed partial class GameMatcher { static Entitas.IMatcher _matcherCombo; - public static Entitas.IMatcher Combo - { - get - { - if (_matcherCombo == null) - { + public static Entitas.IMatcher Combo { + get { + if (_matcherCombo == null) { var matcher = (Entitas.Matcher)Entitas.Matcher.AllOf(GameComponentsLookup.Combo); matcher.componentNames = GameComponentsLookup.componentNames; _matcherCombo = matcher; diff --git a/client/Assets/Generated/Game/Components/GameHpComponent.cs b/client/Assets/Generated/Game/Components/GameHpComponent.cs index 3780ada..003f218 100644 --- a/client/Assets/Generated/Game/Components/GameHpComponent.cs +++ b/client/Assets/Generated/Game/Components/GameHpComponent.cs @@ -6,14 +6,12 @@ // the code is regenerated. // //------------------------------------------------------------------------------ -public partial class GameEntity -{ +public partial class GameEntity { public HpComponent hp { get { return (HpComponent)GetComponent(GameComponentsLookup.Hp); } } public bool hasHp { get { return HasComponent(GameComponentsLookup.Hp); } } - public void AddHp(Game.MetaData newHp, Game.MetaData newHpMax, Game.MetaData newShield, Game.MetaData newShieldMax, Game.MetaData newStun, Game.MetaData newStunMax, Game.MetaData newExecute, Game.MetaData newExecuteMax, Game.MetaData newIsDamaged, UnityEngine.Vector3 newLastDamageDir, float newShieldRecoverTimeMax, float newShieldRecoverTime, float newShieldRecover, int newLastDmg, float newDmgShowTime, bool newIsAlive, bool newIsDying, float newDyingTime) - { + public void AddHp(Game.MetaData newHp, Game.MetaData newHpMax, Game.MetaData newShield, Game.MetaData newShieldMax, Game.MetaData newStun, Game.MetaData newStunMax, Game.MetaData newIsDamaged, UnityEngine.Vector3 newLastDamageDir, Game.EHitLevel newLastDamageLevel, int newLastDmg, float newShieldRecoverTimeMax, float newShieldRecoverTime, float newShieldRecover, float newStunRecoverTimeMax, float newStunRecoverTime, float newStunRecover, float newDmgShowTime, bool newIsAlive, bool newIsDying, float newDyingTime) { var index = GameComponentsLookup.Hp; var component = (HpComponent)CreateComponent(index, typeof(HpComponent)); component.Hp = newHp; @@ -24,10 +22,14 @@ public partial class GameEntity component.StunMax = newStunMax; component.IsDamaged = newIsDamaged; component.LastDamageDir = newLastDamageDir; + component.LastDamageLevel = newLastDamageLevel; + component.LastDmg = newLastDmg; component.ShieldRecoverTimeMax = newShieldRecoverTimeMax; component.ShieldRecoverTime = newShieldRecoverTime; component.ShieldRecover = newShieldRecover; - component.LastDmg = newLastDmg; + component.StunRecoverTimeMax = newStunRecoverTimeMax; + component.StunRecoverTime = newStunRecoverTime; + component.StunRecover = newStunRecover; component.DmgShowTime = newDmgShowTime; component.IsAlive = newIsAlive; component.IsDying = newIsDying; @@ -35,8 +37,7 @@ public partial class GameEntity AddComponent(index, component); } - public void ReplaceHp(Game.MetaData newHp, Game.MetaData newHpMax, Game.MetaData newShield, Game.MetaData newShieldMax, Game.MetaData newStun, Game.MetaData newStunMax, Game.MetaData newExecute, Game.MetaData newExecuteMax, Game.MetaData newIsDamaged, UnityEngine.Vector3 newLastDamageDir, float newShieldRecoverTimeMax, float newShieldRecoverTime, float newShieldRecover, int newLastDmg, float newDmgShowTime, bool newIsAlive, bool newIsDying, float newDyingTime) - { + public void ReplaceHp(Game.MetaData newHp, Game.MetaData newHpMax, Game.MetaData newShield, Game.MetaData newShieldMax, Game.MetaData newStun, Game.MetaData newStunMax, Game.MetaData newIsDamaged, UnityEngine.Vector3 newLastDamageDir, Game.EHitLevel newLastDamageLevel, int newLastDmg, float newShieldRecoverTimeMax, float newShieldRecoverTime, float newShieldRecover, float newStunRecoverTimeMax, float newStunRecoverTime, float newStunRecover, float newDmgShowTime, bool newIsAlive, bool newIsDying, float newDyingTime) { var index = GameComponentsLookup.Hp; var component = (HpComponent)CreateComponent(index, typeof(HpComponent)); component.Hp = newHp; @@ -47,10 +48,14 @@ public partial class GameEntity component.StunMax = newStunMax; component.IsDamaged = newIsDamaged; component.LastDamageDir = newLastDamageDir; + component.LastDamageLevel = newLastDamageLevel; + component.LastDmg = newLastDmg; component.ShieldRecoverTimeMax = newShieldRecoverTimeMax; component.ShieldRecoverTime = newShieldRecoverTime; component.ShieldRecover = newShieldRecover; - component.LastDmg = newLastDmg; + component.StunRecoverTimeMax = newStunRecoverTimeMax; + component.StunRecoverTime = newStunRecoverTime; + component.StunRecover = newStunRecover; component.DmgShowTime = newDmgShowTime; component.IsAlive = newIsAlive; component.IsDying = newIsDying; @@ -58,8 +63,7 @@ public partial class GameEntity ReplaceComponent(index, component); } - public void RemoveHp() - { + public void RemoveHp() { RemoveComponent(GameComponentsLookup.Hp); } } @@ -72,17 +76,13 @@ public partial class GameEntity // the code is regenerated. // //------------------------------------------------------------------------------ -public sealed partial class GameMatcher -{ +public sealed partial class GameMatcher { static Entitas.IMatcher _matcherHp; - public static Entitas.IMatcher Hp - { - get - { - if (_matcherHp == null) - { + public static Entitas.IMatcher Hp { + get { + if (_matcherHp == null) { var matcher = (Entitas.Matcher)Entitas.Matcher.AllOf(GameComponentsLookup.Hp); matcher.componentNames = GameComponentsLookup.componentNames; _matcherHp = matcher; diff --git a/client/Assets/Generated/Game/Components/GameInteractComponent.cs b/client/Assets/Generated/Game/Components/GameInteractComponent.cs index 2567520..9631197 100644 --- a/client/Assets/Generated/Game/Components/GameInteractComponent.cs +++ b/client/Assets/Generated/Game/Components/GameInteractComponent.cs @@ -6,32 +6,32 @@ // the code is regenerated. // //------------------------------------------------------------------------------ -public partial class GameEntity -{ +public partial class GameEntity { public InteractComponent interact { get { return (InteractComponent)GetComponent(GameComponentsLookup.Interact); } } public bool hasInteract { get { return HasComponent(GameComponentsLookup.Interact); } } - public void AddInteract(bool newIsActive, EInteractType newInteractType, string newTargetId) - { + public void AddInteract(Game.MetaData newIsActive, Game.MetaData newIsTarget, EInteractType newInteractType, string newTargetId) { var index = GameComponentsLookup.Interact; var component = (InteractComponent)CreateComponent(index, typeof(InteractComponent)); + component.IsActive = newIsActive; + component.IsTarget = newIsTarget; component.InteractType = newInteractType; component.TargetId = newTargetId; AddComponent(index, component); } - public void ReplaceInteract(bool newIsActive, EInteractType newInteractType, string newTargetId) - { + public void ReplaceInteract(Game.MetaData newIsActive, Game.MetaData newIsTarget, EInteractType newInteractType, string newTargetId) { var index = GameComponentsLookup.Interact; var component = (InteractComponent)CreateComponent(index, typeof(InteractComponent)); + component.IsActive = newIsActive; + component.IsTarget = newIsTarget; component.InteractType = newInteractType; component.TargetId = newTargetId; ReplaceComponent(index, component); } - public void RemoveInteract() - { + public void RemoveInteract() { RemoveComponent(GameComponentsLookup.Interact); } } @@ -44,17 +44,13 @@ public partial class GameEntity // the code is regenerated. // //------------------------------------------------------------------------------ -public sealed partial class GameMatcher -{ +public sealed partial class GameMatcher { static Entitas.IMatcher _matcherInteract; - public static Entitas.IMatcher Interact - { - get - { - if (_matcherInteract == null) - { + public static Entitas.IMatcher Interact { + get { + if (_matcherInteract == null) { var matcher = (Entitas.Matcher)Entitas.Matcher.AllOf(GameComponentsLookup.Interact); matcher.componentNames = GameComponentsLookup.componentNames; _matcherInteract = matcher; diff --git a/client/Assets/Generated/Game/Components/GameMasterSoulComponent.cs b/client/Assets/Generated/Game/Components/GameMasterSoulComponent.cs index 3a93311..557f714 100644 --- a/client/Assets/Generated/Game/Components/GameMasterSoulComponent.cs +++ b/client/Assets/Generated/Game/Components/GameMasterSoulComponent.cs @@ -11,17 +11,25 @@ public partial class GameEntity { public MasterSoulComponent masterSoul { get { return (MasterSoulComponent)GetComponent(GameComponentsLookup.MasterSoul); } } public bool hasMasterSoul { get { return HasComponent(GameComponentsLookup.MasterSoul); } } - public void AddMasterSoul(float newShakeTimeLeft) { + public void AddMasterSoul(float newShakeTimeLeft, FluidDynamics.Fluid_Dynamics_Game_Emitter newEmitter, float newShootTimeLeft, System.Collections.Generic.Queue newShootTargetQueue, System.Collections.Generic.List newShootPreList) { var index = GameComponentsLookup.MasterSoul; var component = (MasterSoulComponent)CreateComponent(index, typeof(MasterSoulComponent)); component.ShakeTimeLeft = newShakeTimeLeft; + component.Emitter = newEmitter; + component.ShootTimeLeft = newShootTimeLeft; + component.ShootTargetQueue = newShootTargetQueue; + component.ShootPreList = newShootPreList; AddComponent(index, component); } - public void ReplaceMasterSoul(float newShakeTimeLeft) { + public void ReplaceMasterSoul(float newShakeTimeLeft, FluidDynamics.Fluid_Dynamics_Game_Emitter newEmitter, float newShootTimeLeft, System.Collections.Generic.Queue newShootTargetQueue, System.Collections.Generic.List newShootPreList) { var index = GameComponentsLookup.MasterSoul; var component = (MasterSoulComponent)CreateComponent(index, typeof(MasterSoulComponent)); component.ShakeTimeLeft = newShakeTimeLeft; + component.Emitter = newEmitter; + component.ShootTimeLeft = newShootTimeLeft; + component.ShootTargetQueue = newShootTargetQueue; + component.ShootPreList = newShootPreList; ReplaceComponent(index, component); } diff --git a/client/Assets/Generated/Game/Components/GameMoveComponent.cs b/client/Assets/Generated/Game/Components/GameMoveComponent.cs index ec056fc..e98954d 100644 --- a/client/Assets/Generated/Game/Components/GameMoveComponent.cs +++ b/client/Assets/Generated/Game/Components/GameMoveComponent.cs @@ -11,10 +11,11 @@ public partial class GameEntity { public MoveComponent move { get { return (MoveComponent)GetComponent(GameComponentsLookup.Move); } } public bool hasMove { get { return HasComponent(GameComponentsLookup.Move); } } - public void AddMove(UnityEngine.Transform newTransform, UnityEngine.Rigidbody newRigidbody, MoveParam newMoveParam, float newJumpTimeNow, bool newIsRight, bool newIsGround, bool newIsGroundLogic, bool newIsAgainstWall, bool newIsFlowing, bool newIsWalk, bool newIsJumpCommand, bool newIsJumpPressed, bool newIsTurning, float newTurnRate, bool newIsFreeTurn, bool newIsSlide, bool newIsSkillable, float newMoveSpeedScale, Game.EJumpState newJumpState, UnityEngine.Vector3 newGroundPosition, UnityEngine.Vector3 newMoveDir, bool newSkillMoveFlag, Game.EMovestepType newStepType, UnityEngine.Vector3 newStepValue, UnityEngine.Vector3 newPosition, UnityEngine.Vector3 newVelocity) { + public void AddMove(UnityEngine.Transform newTransform, UnityEngine.Transform newTransformViewMain, UnityEngine.Rigidbody newRigidbody, MoveParam newMoveParam, float newJumpTimeNow, bool newIsRight, bool newIsGround, bool newIsGroundLogic, bool newIsAgainstWall, bool newIsCrashToWall, bool newIsFlowing, bool newIsWalk, bool newIsJumpCommand, bool newIsJumpPressed, bool newIsFreeTurn, bool newIsSlide, bool newIsSkillAble, float newMoveSpeedScale, float newTempMoveForceScale, Game.EJumpState newJumpState, UnityEngine.Vector3 newGroundPosition, UnityEngine.Vector3 newCrashWallPosition, UnityEngine.Vector3 newCrashWallNormal, UnityEngine.Vector3 newMoveDir, Game.EMovestepType newStepType, UnityEngine.Vector3 newStepValue, UnityEngine.Vector3 newPosition, UnityEngine.Vector3 newVelocity) { var index = GameComponentsLookup.Move; var component = (MoveComponent)CreateComponent(index, typeof(MoveComponent)); component.Transform = newTransform; + component.TransformViewMain = newTransformViewMain; component.Rigidbody = newRigidbody; component.MoveParam = newMoveParam; component.JumpTimeNow = newJumpTimeNow; @@ -22,16 +23,20 @@ public partial class GameEntity { component.IsGround = newIsGround; component.IsGroundLogic = newIsGroundLogic; component.IsAgainstWall = newIsAgainstWall; + component.IsCrashToWall = newIsCrashToWall; component.IsFlowing = newIsFlowing; component.IsWalk = newIsWalk; component.IsJumpCommand = newIsJumpCommand; component.IsJumpPressed = newIsJumpPressed; component.IsFreeTurn = newIsFreeTurn; component.IsSlide = newIsSlide; - component.IsSkillAble = newIsSkillable; + component.IsSkillAble = newIsSkillAble; component.MoveSpeedScale = newMoveSpeedScale; + component.TempMoveForceScale = newTempMoveForceScale; component.JumpState = newJumpState; component.GroundPosition = newGroundPosition; + component.CrashWallPosition = newCrashWallPosition; + component.CrashWallNormal = newCrashWallNormal; component.MoveDir = newMoveDir; component.StepType = newStepType; component.StepValue = newStepValue; @@ -40,10 +45,11 @@ public partial class GameEntity { AddComponent(index, component); } - public void ReplaceMove(UnityEngine.Transform newTransform, UnityEngine.Rigidbody newRigidbody, MoveParam newMoveParam, float newJumpTimeNow, bool newIsRight, bool newIsGround, bool newIsGroundLogic, bool newIsAgainstWall, bool newIsFlowing, bool newIsWalk, bool newIsJumpCommand, bool newIsJumpPressed, bool newIsTurning, float newTurnRate, bool newIsFreeTurn, bool newIsSlide, bool newIsSkillable, float newMoveSpeedScale, Game.EJumpState newJumpState, UnityEngine.Vector3 newGroundPosition, UnityEngine.Vector3 newMoveDir, bool newSkillMoveFlag, Game.EMovestepType newStepType, UnityEngine.Vector3 newStepValue, UnityEngine.Vector3 newPosition, UnityEngine.Vector3 newVelocity) { + public void ReplaceMove(UnityEngine.Transform newTransform, UnityEngine.Transform newTransformViewMain, UnityEngine.Rigidbody newRigidbody, MoveParam newMoveParam, float newJumpTimeNow, bool newIsRight, bool newIsGround, bool newIsGroundLogic, bool newIsAgainstWall, bool newIsCrashToWall, bool newIsFlowing, bool newIsWalk, bool newIsJumpCommand, bool newIsJumpPressed, bool newIsFreeTurn, bool newIsSlide, bool newIsSkillAble, float newMoveSpeedScale, float newTempMoveForceScale, Game.EJumpState newJumpState, UnityEngine.Vector3 newGroundPosition, UnityEngine.Vector3 newCrashWallPosition, UnityEngine.Vector3 newCrashWallNormal, UnityEngine.Vector3 newMoveDir, Game.EMovestepType newStepType, UnityEngine.Vector3 newStepValue, UnityEngine.Vector3 newPosition, UnityEngine.Vector3 newVelocity) { var index = GameComponentsLookup.Move; var component = (MoveComponent)CreateComponent(index, typeof(MoveComponent)); component.Transform = newTransform; + component.TransformViewMain = newTransformViewMain; component.Rigidbody = newRigidbody; component.MoveParam = newMoveParam; component.JumpTimeNow = newJumpTimeNow; @@ -51,16 +57,20 @@ public partial class GameEntity { component.IsGround = newIsGround; component.IsGroundLogic = newIsGroundLogic; component.IsAgainstWall = newIsAgainstWall; + component.IsCrashToWall = newIsCrashToWall; component.IsFlowing = newIsFlowing; component.IsWalk = newIsWalk; component.IsJumpCommand = newIsJumpCommand; component.IsJumpPressed = newIsJumpPressed; component.IsFreeTurn = newIsFreeTurn; component.IsSlide = newIsSlide; - component.IsSkillAble = newIsSkillable; + component.IsSkillAble = newIsSkillAble; component.MoveSpeedScale = newMoveSpeedScale; + component.TempMoveForceScale = newTempMoveForceScale; component.JumpState = newJumpState; component.GroundPosition = newGroundPosition; + component.CrashWallPosition = newCrashWallPosition; + component.CrashWallNormal = newCrashWallNormal; component.MoveDir = newMoveDir; component.StepType = newStepType; component.StepValue = newStepValue; diff --git a/client/Assets/Generated/Game/Components/GamePauseComponent.cs b/client/Assets/Generated/Game/Components/GamePauseComponent.cs index 96cfcc9..973e813 100644 --- a/client/Assets/Generated/Game/Components/GamePauseComponent.cs +++ b/client/Assets/Generated/Game/Components/GamePauseComponent.cs @@ -11,25 +11,27 @@ public partial class GameEntity { public PauseComponent pause { get { return (PauseComponent)GetComponent(GameComponentsLookup.Pause); } } public bool hasPause { get { return HasComponent(GameComponentsLookup.Pause); } } - public void AddPause(bool newIsPause, int newPausePreFrame, float newPauseTime, UnityEngine.Vector3 newVelocityCache, float newAnimeSpeedCache) { + public void AddPause(bool new_isPause, int newPausePreFrame, float newPauseTime, UnityEngine.Vector3 newVelocityCache, float newAnimeSpeedCache, bool newIsPause) { var index = GameComponentsLookup.Pause; var component = (PauseComponent)CreateComponent(index, typeof(PauseComponent)); - component.IsPause = newIsPause; + component._isPause = new_isPause; component.PausePreFrame = newPausePreFrame; component.PauseTime = newPauseTime; component.VelocityCache = newVelocityCache; component.AnimeSpeedCache = newAnimeSpeedCache; + component.IsPause = newIsPause; AddComponent(index, component); } - public void ReplacePause(bool newIsPause, int newPausePreFrame, float newPauseTime, UnityEngine.Vector3 newVelocityCache, float newAnimeSpeedCache) { + public void ReplacePause(bool new_isPause, int newPausePreFrame, float newPauseTime, UnityEngine.Vector3 newVelocityCache, float newAnimeSpeedCache, bool newIsPause) { var index = GameComponentsLookup.Pause; var component = (PauseComponent)CreateComponent(index, typeof(PauseComponent)); - component.IsPause = newIsPause; + component._isPause = new_isPause; component.PausePreFrame = newPausePreFrame; component.PauseTime = newPauseTime; component.VelocityCache = newVelocityCache; component.AnimeSpeedCache = newAnimeSpeedCache; + component.IsPause = newIsPause; ReplaceComponent(index, component); } diff --git a/client/Assets/Generated/Game/Components/GameViewComponent.cs b/client/Assets/Generated/Game/Components/GameViewComponent.cs index b269d1e..54912df 100644 --- a/client/Assets/Generated/Game/Components/GameViewComponent.cs +++ b/client/Assets/Generated/Game/Components/GameViewComponent.cs @@ -6,14 +6,12 @@ // the code is regenerated. // //------------------------------------------------------------------------------ -public partial class GameEntity -{ +public partial class GameEntity { public ViewComponent view { get { return (ViewComponent)GetComponent(GameComponentsLookup.View); } } public bool hasView { get { return HasComponent(GameComponentsLookup.View); } } - public void AddView(Game.EntityPoolItem newEntityPoolItem, UnityEngine.GameObject newGameObject, UnityEngine.GameObject newGameObjectLogic, UnityEngine.Transform newTransformLogic, UnityEngine.Transform newTransformView, UnityEngine.Transform newTransformViewMain, UnityEngine.Transform newTransformViewOther, UnityEngine.Collider newCollider, UnityEngine.Material newMaterial, UnityEngine.SpriteRenderer newSpriteRenderer, System.Collections.Generic.List newBindSpriteRenderers, System.Collections.Generic.List newEffectObject, Game.ShadowPoolItem newShadowObject, Game.ShadowPoolItem newSkillPointerObject, UnityEngine.Vector3 newLocalPositionPre, UnityEngine.Vector3 newLocalPositionOhterPre, UnityEngine.Vector3 newLocalPositionShake, float newShakeTimeLeft, float newFlashTimeLeft) - { + public void AddView(Game.EntityPoolItem newEntityPoolItem, UnityEngine.GameObject newGameObject, UnityEngine.GameObject newGameObjectLogic, UnityEngine.Transform newTransformLogic, UnityEngine.Transform newTransformView, UnityEngine.Transform newTransformViewRot, UnityEngine.Transform newTransformViewOffset, UnityEngine.Transform newTransformViewMain, UnityEngine.Transform newTransformViewOther, UnityEngine.Collider newCollider, UnityEngine.Material newMaterial, UnityEngine.Vector3 newPositionPre, UnityEngine.SpriteRenderer newSpriteRenderer, Game.MetaData newPosView, System.Collections.Generic.List newEffectObject, Game.ShadowPoolItem newSkillPointerObject, UnityEngine.Vector3 newLocalPositionOrder, UnityEngine.Vector3 newLocalPositionShake, UnityEngine.Vector3 newScaleDir, UnityEngine.Color newFlashColor, float newShakeTimeLeft, float newFlashTimeLeft, float newScaleTimeLeft, float newScaleRate) { var index = GameComponentsLookup.View; var component = (ViewComponent)CreateComponent(index, typeof(ViewComponent)); component.EntityPoolItem = newEntityPoolItem; @@ -21,21 +19,29 @@ public partial class GameEntity component.GameObjectLogic = newGameObjectLogic; component.TransformLogic = newTransformLogic; component.TransformView = newTransformView; + component.TransformViewRot = newTransformViewRot; + component.TransformViewOffset = newTransformViewOffset; component.TransformViewMain = newTransformViewMain; component.TransformViewOther = newTransformViewOther; component.Collider = newCollider; component.Material = newMaterial; + component.PositionPre = newPositionPre; component.SpriteRenderer = newSpriteRenderer; + component.PosView = newPosView; component.EffectObject = newEffectObject; component.SkillPointerObject = newSkillPointerObject; + component.LocalPositionOrder = newLocalPositionOrder; component.LocalPositionShake = newLocalPositionShake; + component.ScaleDir = newScaleDir; + component.FlashColor = newFlashColor; component.ShakeTimeLeft = newShakeTimeLeft; component.FlashTimeLeft = newFlashTimeLeft; + component.ScaleTimeLeft = newScaleTimeLeft; + component.ScaleRate = newScaleRate; AddComponent(index, component); } - public void ReplaceView(Game.EntityPoolItem newEntityPoolItem, UnityEngine.GameObject newGameObject, UnityEngine.GameObject newGameObjectLogic, UnityEngine.Transform newTransformLogic, UnityEngine.Transform newTransformView, UnityEngine.Transform newTransformViewMain, UnityEngine.Transform newTransformViewOther, UnityEngine.Collider newCollider, UnityEngine.Material newMaterial, UnityEngine.SpriteRenderer newSpriteRenderer, System.Collections.Generic.List newBindSpriteRenderers, System.Collections.Generic.List newEffectObject, Game.ShadowPoolItem newShadowObject, Game.ShadowPoolItem newSkillPointerObject, UnityEngine.Vector3 newLocalPositionPre, UnityEngine.Vector3 newLocalPositionOhterPre, UnityEngine.Vector3 newLocalPositionShake, float newShakeTimeLeft, float newFlashTimeLeft) - { + public void ReplaceView(Game.EntityPoolItem newEntityPoolItem, UnityEngine.GameObject newGameObject, UnityEngine.GameObject newGameObjectLogic, UnityEngine.Transform newTransformLogic, UnityEngine.Transform newTransformView, UnityEngine.Transform newTransformViewRot, UnityEngine.Transform newTransformViewOffset, UnityEngine.Transform newTransformViewMain, UnityEngine.Transform newTransformViewOther, UnityEngine.Collider newCollider, UnityEngine.Material newMaterial, UnityEngine.Vector3 newPositionPre, UnityEngine.SpriteRenderer newSpriteRenderer, Game.MetaData newPosView, System.Collections.Generic.List newEffectObject, Game.ShadowPoolItem newSkillPointerObject, UnityEngine.Vector3 newLocalPositionOrder, UnityEngine.Vector3 newLocalPositionShake, UnityEngine.Vector3 newScaleDir, UnityEngine.Color newFlashColor, float newShakeTimeLeft, float newFlashTimeLeft, float newScaleTimeLeft, float newScaleRate) { var index = GameComponentsLookup.View; var component = (ViewComponent)CreateComponent(index, typeof(ViewComponent)); component.EntityPoolItem = newEntityPoolItem; @@ -43,21 +49,29 @@ public partial class GameEntity component.GameObjectLogic = newGameObjectLogic; component.TransformLogic = newTransformLogic; component.TransformView = newTransformView; + component.TransformViewRot = newTransformViewRot; + component.TransformViewOffset = newTransformViewOffset; component.TransformViewMain = newTransformViewMain; component.TransformViewOther = newTransformViewOther; component.Collider = newCollider; component.Material = newMaterial; + component.PositionPre = newPositionPre; component.SpriteRenderer = newSpriteRenderer; + component.PosView = newPosView; component.EffectObject = newEffectObject; component.SkillPointerObject = newSkillPointerObject; + component.LocalPositionOrder = newLocalPositionOrder; component.LocalPositionShake = newLocalPositionShake; + component.ScaleDir = newScaleDir; + component.FlashColor = newFlashColor; component.ShakeTimeLeft = newShakeTimeLeft; component.FlashTimeLeft = newFlashTimeLeft; + component.ScaleTimeLeft = newScaleTimeLeft; + component.ScaleRate = newScaleRate; ReplaceComponent(index, component); } - public void RemoveView() - { + public void RemoveView() { RemoveComponent(GameComponentsLookup.View); } } @@ -70,17 +84,13 @@ public partial class GameEntity // the code is regenerated. // //------------------------------------------------------------------------------ -public sealed partial class GameMatcher -{ +public sealed partial class GameMatcher { static Entitas.IMatcher _matcherView; - public static Entitas.IMatcher View - { - get - { - if (_matcherView == null) - { + public static Entitas.IMatcher View { + get { + if (_matcherView == null) { var matcher = (Entitas.Matcher)Entitas.Matcher.AllOf(GameComponentsLookup.View); matcher.componentNames = GameComponentsLookup.componentNames; _matcherView = matcher;