From 8895b84dc7fa45f11b4075d33dfb2d7bdb024405 Mon Sep 17 00:00:00 2001
From: Client_PangDeRong <593317293@qq.com>
Date: 星期二, 13 十一月 2018 17:44:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/ResModule/InstanceResourcesLoader.cs | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/Core/ResModule/InstanceResourcesLoader.cs b/Core/ResModule/InstanceResourcesLoader.cs
index 69c67c9..df3f2ce 100644
--- a/Core/ResModule/InstanceResourcesLoader.cs
+++ b/Core/ResModule/InstanceResourcesLoader.cs
@@ -498,39 +498,42 @@
}
var _soSkill = _skillInfo.soFile;
- for (int i = 0; i < _soSkill.animationEventList.Count; ++i)
+ if (_soSkill != null)
{
- if (_soSkill.animationEventList[i].frameEventType == E_FrameEventType.OnPlayEffect)
+ for (int i = 0; i < _soSkill.animationEventList.Count; ++i)
{
- if (_soSkill.animationEventList[i].intParam > 0)
+ if (_soSkill.animationEventList[i].frameEventType == E_FrameEventType.OnPlayEffect)
{
- InstanceResourcesLoader.LoadEffectAsync(_soSkill.animationEventList[i].intParam);
- }
- }
- else if (_soSkill.animationEventList[i].frameEventType == E_FrameEventType.OnSkillEvent)
- {
- var _param = _soSkill.animationEventList[i].intParam;
- var _type = SoSkill.GetAttactType(_param);
- var _id = SoSkill.GetFrameEventId(_param);
- if (_type == SoSkill.E_AttackType.Sweep)
- {
- var _config = ScriptableObjectLoader.LoadSoSweepHit(_id);
- if (_config.hitEffectId > 0)
+ if (_soSkill.animationEventList[i].intParam > 0)
{
- InstanceResourcesLoader.LoadEffectAsync(_config.hitEffectId);
+ InstanceResourcesLoader.LoadEffectAsync(_soSkill.animationEventList[i].intParam);
}
}
- else if (_type == SoSkill.E_AttackType.FlyObject)
+ else if (_soSkill.animationEventList[i].frameEventType == E_FrameEventType.OnSkillEvent)
{
- var _config = ScriptableObjectLoader.LoadSoFlyObject(_id);
- if (_config.hitEffectId > 0)
+ var _param = _soSkill.animationEventList[i].intParam;
+ var _type = SoSkill.GetAttactType(_param);
+ var _id = SoSkill.GetFrameEventId(_param);
+ if (_type == SoSkill.E_AttackType.Sweep)
{
- InstanceResourcesLoader.LoadEffectAsync(_config.hitEffectId);
+ var _config = ScriptableObjectLoader.LoadSoSweepHit(_id);
+ if (_config.hitEffectId > 0)
+ {
+ InstanceResourcesLoader.LoadEffectAsync(_config.hitEffectId);
+ }
}
+ else if (_type == SoSkill.E_AttackType.FlyObject)
+ {
+ var _config = ScriptableObjectLoader.LoadSoFlyObject(_id);
+ if (_config.hitEffectId > 0)
+ {
+ InstanceResourcesLoader.LoadEffectAsync(_config.hitEffectId);
+ }
- if (_config.ammoEffectId > 0)
- {
- InstanceResourcesLoader.LoadEffectAsync(_config.hitEffectId);
+ if (_config.ammoEffectId > 0)
+ {
+ InstanceResourcesLoader.LoadEffectAsync(_config.hitEffectId);
+ }
}
}
}
--
Gitblit v1.8.0