Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

아레나 시뮬레이션 개선 #6621

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions nekoyume/Assets/StreamingAssets/avatar-enemy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"Level": 1,
"collectionIds": [
1,
8
],
"RuneItems": [
{
"Id": 30001,
"Level": 2,
"SlotIndex": 0
}
],
"CostumeIds": [
49900024
],
"EquipmentItems": [
{
"Id": 10120000,
"Level": 17,
"StatOptions": [
{
"StatType": "ATK",
"Value": 100
}
],
"SkillOptions": [
{
"Id": 800072,
"Power": 100,
"Chance": 100,
"StatPowerRatio": 1,
"StatType": "HP"
}
]
}
]
}
3 changes: 3 additions & 0 deletions nekoyume/Assets/StreamingAssets/avatar-enemy.json.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 38 additions & 0 deletions nekoyume/Assets/StreamingAssets/avatar.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"Level": 1,
"collectionIds": [
1,
8
],
"RuneItems": [
{
"Id": 30001,
"Level": 2,
"SlotIndex": 0
}
],
"CostumeIds": [
49900024
],
"EquipmentItems": [
{
"Id": 10120000,
"Level": 17,
"StatOptions": [
{
"StatType": "HP",
"Value": 100
}
],
"SkillOptions": [
{
"Id": 800072,
"Power": 100,
"Chance": 100,
"StatPowerRatio": 1,
"StatType": "HP"
}
]
}
]
}
3 changes: 3 additions & 0 deletions nekoyume/Assets/StreamingAssets/avatar.json.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion nekoyume/Assets/StreamingAssets/serialized_allrune1.txt

This file was deleted.

3 changes: 0 additions & 3 deletions nekoyume/Assets/StreamingAssets/serialized_allrune1.txt.meta

This file was deleted.

1 change: 0 additions & 1 deletion nekoyume/Assets/StreamingAssets/serialized_allrune2.txt

This file was deleted.

3 changes: 0 additions & 3 deletions nekoyume/Assets/StreamingAssets/serialized_allrune2.txt.meta

This file was deleted.

1 change: 0 additions & 1 deletion nekoyume/Assets/StreamingAssets/serialized_avatar1.txt

This file was deleted.

3 changes: 0 additions & 3 deletions nekoyume/Assets/StreamingAssets/serialized_avatar1.txt.meta

This file was deleted.

1 change: 0 additions & 1 deletion nekoyume/Assets/StreamingAssets/serialized_avatar2.txt

This file was deleted.

3 changes: 0 additions & 3 deletions nekoyume/Assets/StreamingAssets/serialized_avatar2.txt.meta

This file was deleted.

1 change: 0 additions & 1 deletion nekoyume/Assets/StreamingAssets/serialized_collection1.txt

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion nekoyume/Assets/StreamingAssets/serialized_collection2.txt

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion nekoyume/Assets/StreamingAssets/serialized_inventory1.txt

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion nekoyume/Assets/StreamingAssets/serialized_inventory2.txt

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion nekoyume/Assets/StreamingAssets/serialized_runeslot1.txt

This file was deleted.

3 changes: 0 additions & 3 deletions nekoyume/Assets/StreamingAssets/serialized_runeslot1.txt.meta

This file was deleted.

1 change: 0 additions & 1 deletion nekoyume/Assets/StreamingAssets/serialized_runeslot2.txt

This file was deleted.

3 changes: 0 additions & 3 deletions nekoyume/Assets/StreamingAssets/serialized_runeslot2.txt.meta

This file was deleted.

6 changes: 0 additions & 6 deletions nekoyume/Assets/_Scripts/Editor/TestArena.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,16 @@
using Cysharp.Threading.Tasks;
using Libplanet.Crypto;
using Nekoyume;
using Nekoyume.Blockchain;
using Nekoyume.Editor;
using Nekoyume.Game;
using Nekoyume.Game.Battle;
using Nekoyume.Game.Character;
using Nekoyume.Game.Controller;
using Nekoyume.Game.Util;
using Nekoyume.Game.VFX.Skill;
using Nekoyume.Helper;
using Nekoyume.L10n;
using Nekoyume.Model;
using Nekoyume.Model.BattleStatus.Arena;
using Nekoyume.Model.Item;
using Nekoyume.Model.Skill;
using Nekoyume.UI;
using UniRx;
using UnityEngine;
using ArenaCharacter = Nekoyume.Model.ArenaCharacter;
Expand Down Expand Up @@ -418,4 +413,3 @@ public IEnumerator CoShatterStrike(ArenaCharacter caster, IEnumerable<ArenaSkill
}
}
}

8 changes: 3 additions & 5 deletions nekoyume/Assets/_Scripts/Editor/TestArenaCharacter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,12 @@
using Nekoyume.Game;
using Nekoyume.Game.Character;
using Nekoyume.Game.Controller;
using Nekoyume.Game.VFX;
using Nekoyume.Model.BattleStatus.Arena;
using Nekoyume.UI;
using UnityEngine;
using Nekoyume.Model.Skill;
using Nekoyume.Model.Elemental;
using Nekoyume.Model.Item;
using UnityEngine.Serialization;

namespace Nekoyume.Editor
{
Expand Down Expand Up @@ -103,7 +101,7 @@ public void Init(
_equipments.Clear();
_equipments.AddRange(digest.Equipments);
_target = target;
appearance.Set(digest, avatarAddress, Animator, _hudContainer);
appearance.Set(digest, avatarAddress, Animator, _hudContainer, TestArena.Instance.TableSheets);
}

public void Spawn(Model.ArenaCharacter model)
Expand All @@ -128,7 +126,7 @@ public void Spawn(Model.ArenaCharacter model)
public void UpdateStatusUI()
{
_hudContainer.UpdatePosition(ActionCamera.instance.Cam, gameObject, HUDOffset);
arenaBattle.UpdateStatus(CharacterModel.IsEnemy, _currentHp, CharacterModel.HP, CharacterModel.Buffs);
arenaBattle.UpdateStatus(CharacterModel.IsEnemy, _currentHp, CharacterModel.HP, CharacterModel.Buffs, TestArena.Instance.TableSheets, false);
UpdateBuffVfx();
}

Expand Down Expand Up @@ -256,7 +254,7 @@ private IEnumerator CoExecuteAction()
}
}

yield return new WaitForSeconds(StageConfig.instance.actionDelay);
yield return new WaitForSeconds(0.5f);
if (_runningAction != null)
{
yield return StartCoroutine(TestArena.Instance.CoSkill(_runningAction));
Expand Down
Loading