|
@@ -237,17 +237,38 @@ namespace GFGGame
|
|
targetCardId = targetData.cardId;
|
|
targetCardId = targetData.cardId;
|
|
targetSkillLvs = targetData.skillLvs;
|
|
targetSkillLvs = targetData.skillLvs;
|
|
|
|
|
|
- List<PassivitySkillLvlCfg> vaildSkills;
|
|
|
|
|
|
+ List<PassivitySkillLvlCfg> vaildSkills = new List<PassivitySkillLvlCfg>();
|
|
if (roleType == FightRoleType.MINE)
|
|
if (roleType == FightRoleType.MINE)
|
|
{
|
|
{
|
|
if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
|
|
if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
|
|
- {
|
|
|
|
- vaildSkills = ArenaDataManager.Instance.vaildSkills[ArenaDataManager.Instance.CurFightIndex][_partId][_currentTime];
|
|
|
|
|
|
+ {
|
|
|
|
+ Dictionary<int, Dictionary<int ,List<PassivitySkillLvlCfg>>> dic = new Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>();
|
|
|
|
+ Dictionary<int, List<PassivitySkillLvlCfg>> dic1 = new Dictionary<int, List<PassivitySkillLvlCfg>>();
|
|
|
|
+ //vaildSkills = ArenaDataManager.Instance.vaildSkills[ArenaDataManager.Instance.CurFightIndex][_partId][_currentTime];
|
|
|
|
+ ArenaDataManager.Instance.vaildSkills.TryGetValue(ArenaDataManager.Instance.CurFightIndex, out dic);
|
|
|
|
+ if (dic != null)
|
|
|
|
+ {
|
|
|
|
+ dic.TryGetValue(_partId, out dic1);
|
|
|
|
+ if (dic1 != null)
|
|
|
|
+ {
|
|
|
|
+ vaildSkills = dic1[_currentTime];
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ Debug.LogError($"258_partId {_partId}");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ Debug.LogError($"263CurFightIndex {ArenaDataManager.Instance.CurFightIndex}");
|
|
|
|
+ }
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
vaildSkills = ScoreSystemData.Instance.GetValidSkills(_currentTime, _partId, roleData.cardId, roleData.skillLvs, targetCardId, targetSkillLvs, _roundTimes, _targetRoundTimes);
|
|
vaildSkills = ScoreSystemData.Instance.GetValidSkills(_currentTime, _partId, roleData.cardId, roleData.skillLvs, targetCardId, targetSkillLvs, _roundTimes, _targetRoundTimes);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
ScoreSystemData.Instance.GetRoundItemSkillScore(vaildSkills, _mainScore, _targetMainScore, out skillScore, out targetSkillScore, out skillScoreDic);
|
|
ScoreSystemData.Instance.GetRoundItemSkillScore(vaildSkills, _mainScore, _targetMainScore, out skillScore, out targetSkillScore, out skillScoreDic);
|
|
showCard = ScoreSystemData.Instance.IsShowCard(roleData.cardId, vaildSkills);
|
|
showCard = ScoreSystemData.Instance.IsShowCard(roleData.cardId, vaildSkills);
|
|
}
|
|
}
|
|
@@ -255,7 +276,26 @@ namespace GFGGame
|
|
{
|
|
{
|
|
if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
|
|
if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
|
|
{
|
|
{
|
|
- vaildSkills = ArenaDataManager.Instance.targetVaildSkills[ArenaDataManager.Instance.CurFightIndex][_partId][_currentTime];
|
|
|
|
|
|
+ Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>> dic = new Dictionary<int, Dictionary<int, List<PassivitySkillLvlCfg>>>();
|
|
|
|
+ Dictionary<int, List<PassivitySkillLvlCfg>> dic1 = new Dictionary<int, List<PassivitySkillLvlCfg>>();
|
|
|
|
+ ArenaDataManager.Instance.targetVaildSkills.TryGetValue(ArenaDataManager.Instance.CurFightIndex, out dic);
|
|
|
|
+ if (dic != null)
|
|
|
|
+ {
|
|
|
|
+ dic.TryGetValue(_partId,out dic1);
|
|
|
|
+ if(dic1 != null)
|
|
|
|
+ {
|
|
|
|
+ vaildSkills = dic1[_currentTime];
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ Debug.LogError($"291_partId {_partId}");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ Debug.LogError($"296CurFightIndex {ArenaDataManager.Instance.CurFightIndex}");
|
|
|
|
+ }
|
|
|
|
+ //vaildSkills = ArenaDataManager.Instance.targetVaildSkills[ArenaDataManager.Instance.CurFightIndex][_partId][_currentTime];
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|