diff --git a/Field/field.tscn b/Field/field.tscn index f953173..34026b5 100644 --- a/Field/field.tscn +++ b/Field/field.tscn @@ -1,11 +1,9 @@ -[gd_scene load_steps=4 format=3 uid="uid://qipfodwbk1gf"] +[gd_scene load_steps=3 format=3 uid="uid://qipfodwbk1gf"] [ext_resource type="Script" path="res://Field/field.gd" id="1_6uvjw"] -[ext_resource type="PackedScene" uid="uid://sp3iv6cxuerm" path="res://player.tscn" id="2_oi7aa"] -[ext_resource type="Script" path="res://Player/player.gd" id="3_vsc2e"] +[ext_resource type="PackedScene" uid="uid://dtm0201qhcn4d" path="res://Player/player.tscn" id="2_oi7aa"] [node name="Field" type="Node2D"] script = ExtResource("1_6uvjw") [node name="Player" parent="." instance=ExtResource("2_oi7aa")] -script = ExtResource("3_vsc2e") diff --git a/Player/player.tscn b/Player/player.tscn index 4c2eff7..8d078f2 100644 --- a/Player/player.tscn +++ b/Player/player.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=3 uid="uid://dtm0201qhcn4d"] -[ext_resource type="Script" path="res://player.gd" id="1_6ggpr"] +[ext_resource type="Script" path="res://Player/player.gd" id="1_6ggpr"] [node name="Player" type="Node2D"] z_index = 1 diff --git a/player.tscn b/player.tscn deleted file mode 100644 index aeb0049..0000000 --- a/player.tscn +++ /dev/null @@ -1,38 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://sp3iv6cxuerm"] - -[sub_resource type="GDScript" id="GDScript_hd04s"] -script/source = "extends Node2D - -var yvel = 1 -var yoff = 0 - - -# Called when the node enters the scene tree for the first time. -func _ready(): - $Sprite2D.texture = PakAssetLoader.load_file(\"user://data/units.pak/tomomo_00_00.dat\") - $Sprite2D.position = get_global_transform().origin - $Sprite2D.position.y -= 128 - - -# Called every frame. 'delta' is the elapsed time since the previous frame. -func _process(_delta): - var pos = get_global_transform().origin - pos.y += -128 + yoff - yvel -= 1 - if yvel < -9: - yvel = 9 - pos.y += yvel - yoff += yvel - $Sprite2D.position = pos - -" - -[node name="Player" type="Node2D"] -z_index = 1 -script = SubResource("GDScript_hd04s") -metadata/_edit_group_ = true - -[node name="Sprite2D" type="Sprite2D" parent="."] -top_level = true -z_index = 2 -position = Vector2(2.08165e-12, -128) diff --git a/project.godot b/project.godot index 28137c2..30a67c1 100644 --- a/project.godot +++ b/project.godot @@ -11,10 +11,17 @@ config_version=5 [application] config/name="Open100OJ" +run/main_scene="res://main.tscn" config/features=PackedStringArray("4.2", "GL Compatibility") config/icon="res://icon.svg" +[display] + +window/size/viewport_width=1920 +window/size/viewport_height=1080 + [rendering] renderer/rendering_method="gl_compatibility" renderer/rendering_method.mobile="gl_compatibility" +textures/vram_compression/import_etc2_astc=true