Test_Project_Cocos/JisolGame
1
0
Fork 0
mirror of https://gitee.com/jisol/jisol-game/ synced 2025-09-27 10:46:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

临时提交

Browse Source
This commit is contained in:
PC-20230316NUNE\Administrator
2024-10-18 17:48:59 +08:00
parent 8cea537319
commit 31db916fec
31 changed files with 315 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
JEX_GAS/Assets/GAS/Runtime/Ability/AbilityAreaUtil.cs
View File

@@ -16,11 +16,11 @@ namespace GAS.Runtime
public static Collider2D[] OverlapBox2D(this AbilitySystemComponent asc, Vector2 offset, Vector2 size,
float angle, int layerMask, Transform relativeTransform = null)
{
relativeTransform ??= asc.transform;
relativeTransform ??= asc.GetView().transform;
var center = (Vector2)relativeTransform.position;
offset.x *= relativeTransform.lossyScale.x > 0 ? 1 : -1;
center += offset;
angle += asc.transform.eulerAngles.z;
angle += asc.GetView().transform.eulerAngles.z;
return Physics2D.OverlapBoxAll(center, size, angle, layerMask);
}
@@ -28,11 +28,11 @@ namespace GAS.Runtime
public static int OverlapBox2DNonAlloc(this AbilitySystemComponent asc, Vector2 offset, Vector2 size,
float angle, Collider2D[] results, int layerMask, Transform relativeTransform = null)
{
relativeTransform ??= asc.transform;
relativeTransform ??= asc.GetView().transform;
var center = (Vector2)relativeTransform.position;
offset.x *= relativeTransform.lossyScale.x > 0 ? 1 : -1;
center += offset;
angle += asc.transform.eulerAngles.z;
angle += asc.GetView().transform.eulerAngles.z;
var count = Physics2D.OverlapBoxNonAlloc(center, size, angle, results, layerMask);
return count;
@@ -55,7 +55,7 @@ namespace GAS.Runtime
public static Collider2D[] OverlapCircle2D(this AbilitySystemComponent asc, Vector2 offset, float radius,
int layerMask, Transform relativeTransform = null)
{
relativeTransform ??= asc.transform;
relativeTransform ??= asc.GetView().transform;
var center = (Vector2)relativeTransform.position;
offset.x *= relativeTransform.lossyScale.x > 0 ? 1 : -1;
center += offset;
@@ -66,7 +66,7 @@ namespace GAS.Runtime
public static int OverlapCircle2DNonAlloc(this AbilitySystemComponent asc, Vector2 offset, float radius,
Collider2D[] results, int layerMask, Transform relativeTransform = null)
{
relativeTransform ??= asc.transform;
relativeTransform ??= asc.GetView().transform;
var center = (Vector2)relativeTransform.position;
offset.x *= relativeTransform.lossyScale.x > 0 ? 1 : -1;
center += offset;

6
JEX_GAS/Assets/GAS/Runtime/Ability/AbilityContainer.cs
View File

@@ -16,7 +16,7 @@ namespace GAS.Runtime
public void Tick()
{
var abilitySpecs = ObjectPool.Instance.Fetch<List<AbilitySpec>>();
var abilitySpecs = JexGasObjectPool.Instance.Fetch<List<AbilitySpec>>();
abilitySpecs.AddRange(_abilities.Values);
foreach (var abilitySpec in abilitySpecs)
@@ -25,7 +25,7 @@ namespace GAS.Runtime
}
abilitySpecs.Clear();
ObjectPool.Instance.Recycle(abilitySpecs);
JexGasObjectPool.Instance.Recycle(abilitySpecs);
}
public void GrantAbility(AbstractAbility ability)
@@ -61,7 +61,7 @@ namespace GAS.Runtime
// 这个输出可以删掉, 某些情况下确实会尝试激活不存在的技能(失败了也无所谓), 但是对开发期间的调试有帮助
Debug.LogWarning(
$"you are trying to activate an ability that does not exist: " +
$"abilityName=\"{abilityName}\", GameObject=\"{_owner.name}\", " +
$"abilityName=\"{abilityName}\", GameObject=\"{_owner.EntityId}\", " +
$"Preset={(_owner.Preset != null ? _owner.Preset.name : "null")}");
#endif
return false;

8
JEX_GAS/Assets/GAS/Runtime/Ability/TimelineAbility/TimelineAbilityPlayer.cs
View File

@@ -218,7 +218,7 @@ namespace GAS.Runtime
foreach (var clip in _cacheDurationalCueTrack)
{
if (_currentFrame <= clip.endFrame)
clip.cueSpec.OnRemove();
clip.cueSpec.OnRemove(_currentFrame,clip.startFrame,clip.endFrame);
}
foreach (var clip in _cacheBuffGameplayEffectTrack)
@@ -345,17 +345,17 @@ namespace GAS.Runtime
{
if (frame == cueClip.startFrame)
{
cueClip.cueSpec.OnAdd();
cueClip.cueSpec.OnAdd(frame,cueClip.startFrame,cueClip.endFrame);
}
if (frame >= cueClip.startFrame && frame <= cueClip.endFrame)
{
cueClip.cueSpec.OnTick();
cueClip.cueSpec.OnTick(frame,cueClip.startFrame,cueClip.endFrame);
}
if (frame == cueClip.endFrame)
{
cueClip.cueSpec.OnRemove();
cueClip.cueSpec.OnRemove(frame,cueClip.startFrame,cueClip.endFrame);
}
}
}