|
@@ -276,11 +276,13 @@ namespace GFGGame
|
|
{
|
|
{
|
|
if (response.Error == ErrorCode.ERR_Success)
|
|
if (response.Error == ErrorCode.ERR_Success)
|
|
{
|
|
{
|
|
|
|
+ // if (list.Count < response.data.Count) return false;
|
|
for (int i = 0; i < response.data.Count; i++)
|
|
for (int i = 0; i < response.data.Count; i++)
|
|
{
|
|
{
|
|
list[i].cardScore = response.data[i].CardScore;
|
|
list[i].cardScore = response.data[i].CardScore;
|
|
list[i].itemScoreList = response.data[i].SuitScore;
|
|
list[i].itemScoreList = response.data[i].SuitScore;
|
|
- // list[i].itemList = response.data[i].EquipIds;
|
|
|
|
|
|
+ list[i].itemList = response.DressupList[i].EquipIds;
|
|
|
|
+ list[i].cardId = response.DressupList[i].CardId;
|
|
List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(response.data[i].CardId);
|
|
List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(response.data[i].CardId);
|
|
|
|
|
|
if (response.data[i].SkillId.Count == skillCfgs.Count)
|
|
if (response.data[i].SkillId.Count == skillCfgs.Count)
|
|
@@ -341,16 +343,16 @@ namespace GFGGame
|
|
}
|
|
}
|
|
|
|
|
|
arenaTarget.FightDatas.Clear();
|
|
arenaTarget.FightDatas.Clear();
|
|
- for (int j = 0; j < ArenaDataManager.Instance.ThemeList.Count; j++)
|
|
|
|
|
|
+ for (int i = 0; i < ArenaDataManager.Instance.ThemeList.Count; i++)
|
|
{
|
|
{
|
|
if (arenaTarget.Type == FightTargetType.PLAYER)
|
|
if (arenaTarget.Type == FightTargetType.PLAYER)
|
|
{
|
|
{
|
|
- FightData roleData = GetFightRoleData(arenaTargetProto.PlayerDressupList[j], arenaTarget.RoleInfo, j);
|
|
|
|
|
|
+ FightData roleData = GetFightRoleData(arenaTargetProto.PlayerDressupList[i], arenaTarget.RoleInfo, i);
|
|
arenaTarget.FightDatas.Add(roleData);
|
|
arenaTarget.FightDatas.Add(roleData);
|
|
}
|
|
}
|
|
else if (arenaTarget.Type == FightTargetType.ROBOT)
|
|
else if (arenaTarget.Type == FightTargetType.ROBOT)
|
|
{
|
|
{
|
|
- FightData robotData = GetFightRobotData(arenaTargetProto.RobotDressupInfo, j);
|
|
|
|
|
|
+ FightData robotData = GetFightRobotData(arenaTargetProto.RobotDressupInfo, i);
|
|
arenaTarget.FightDatas.Add(robotData);
|
|
arenaTarget.FightDatas.Add(robotData);
|
|
}
|
|
}
|
|
}
|
|
}
|