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

[SVR-190] 캐릭터 배치 JSON 형식으로 입/출력 및 직접 입력/편집 기능 #14

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
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
42 changes: 42 additions & 0 deletions MockBattle/datas/attack_command.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
[
{
"id": 6,
"skill_id": 1
},
{
"id": 6,
"skill_id": 2
},
{
"id": 7,
"skill_id": 1
},
{
"id": 7,
"skill_id": 2
},
{
"id": 8,
"skill_id": 1
},
{
"id": 8,
"skill_id": 2
},
{
"id": 9,
"skill_id": 1
},
{
"id": 9,
"skill_id": 2
},
{
"id": 10,
"skill_id": 1
},
{
"id": 10,
"skill_id": 2
}
]
1 change: 1 addition & 0 deletions MockBattle/datas/attack_position.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
null
57 changes: 57 additions & 0 deletions MockBattle/datas/defense_command.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
[
{
"id": 20231207,
"skill_id": 1
},
{
"id": 1,
"skill_id": 2
},
{
"id": 1,
"skill_id": 0,
"meta": 1,
},
{
"id": 2,
"skill_id": 1
},
{
"id": 2,
"skill_id": 2
},
{
"id": 1,
"skill_id": 0,
"meta": 0,
},
{
"id": 3,
"skill_id": 1
},
{
"id": 3,
"skill_id": 2
},
{
"id": 1,
"skill_id": 0,
"meta": 1,
},
{
"id": 4,
"skill_id": 1
},
{
"id": 4,
"skill_id": 2
},
{
"id": 5,
"skill_id": 1
},
{
"id": 5,
"skill_id": 2
},
]
1 change: 1 addition & 0 deletions MockBattle/datas/defense_position.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
null
28 changes: 28 additions & 0 deletions MockBattle/datas/defense_position_original.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
[
[
{
"type": character_type.JJAJANG,
"id": 1
}
],
[
{
"type": character_type.JJAMBBONG,
"id": 2
},
{
"type": character_type.JJAMBBONG,
"id": 3
},
],
[
{
"type": character_type.CAKE,
"id": 4
},
{
"type": character_type.JJAMBBONG,
"id": 5
},
]
]
159 changes: 159 additions & 0 deletions MockBattle/datas/original.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,159 @@
var defense_position = [
[
{
"type": character_type.JJAJANG,
"id": 1
}
],
[
{
"type": character_type.JJAMBBONG,
"id": 2
},
{
"type": character_type.JJAMBBONG,
"id": 3
},
],
[
{
"type": character_type.CAKE,
"id": 4
},
{
"type": character_type.JJAMBBONG,
"id": 5
},
]
]

var defense_command = [
{
"id": 1,
"skill_id": 1
},
{
"id": 1,
"skill_id": 2
},
{
"id": 1,
"skill_id": 0,
"meta": 1,
},
{
"id": 2,
"skill_id": 1
},
{
"id": 2,
"skill_id": 2
},
{
"id": 1,
"skill_id": 0,
"meta": 0,
},
{
"id": 3,
"skill_id": 1
},
{
"id": 3,
"skill_id": 2
},
{
"id": 1,
"skill_id": 0,
"meta": 1,
},
{
"id": 4,
"skill_id": 1
},
{
"id": 4,
"skill_id": 2
},
{
"id": 5,
"skill_id": 1
},
{
"id": 5,
"skill_id": 2
},
]

var attack_position = [
[
{
"type": character_type.CAKE,
"id": 6
},
{
"type": character_type.MILK_SHAKE,
"id": 7
},
{
"type": character_type.JJAJANG,
"id": 8
}
],
[
{
"type": character_type.JJAJANG,
"id": 9
}
],
[
{
"type": character_type.JJAMBBONG,
"id": 10
},
]
]

var attack_command = [
{
"id": 6,
"skill_id": 1
},
{
"id": 6,
"skill_id": 2
},
{
"id": 7,
"skill_id": 1
},
{
"id": 7,
"skill_id": 2
},
{
"id": 8,
"skill_id": 1
},
{
"id": 8,
"skill_id": 2
},
{
"id": 9,
"skill_id": 1
},
{
"id": 9,
"skill_id": 2
},
{
"id": 10,
"skill_id": 1
},
{
"id": 10,
"skill_id": 2
}
]

5 changes: 5 additions & 0 deletions MockBattle/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,18 @@ config/icon="res://icon.png"

Settings="*res://singletons/settings.gd"
FrameCounter="*res://singletons/frame_counter.gd"
GameData="*res://singletons/game_data.gd"

[display]

window/size/viewport_width=1920
window/size/viewport_height=1080
window/stretch/mode="viewport"

[dotnet]

project/assembly_name="Mock Battle"

[gui]

common/drop_mouse_on_gui_input_disabled=true
Expand Down
Loading