AXCWG 5 сар өмнө
parent
commit
68c0054f8b

BIN
.DS_Store


BIN
Assets/.DS_Store


+ 8 - 6
Assets/stg1bg/stg1bg.png.import

@@ -3,25 +3,27 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://c2jvep4a4kvoy"
-path="res://.godot/imported/stg1bg.png-f8797f4a6bcbbb7fe6df127083c2d3b2.ctex"
+path.s3tc="res://.godot/imported/stg1bg.png-f8797f4a6bcbbb7fe6df127083c2d3b2.s3tc.ctex"
+path.etc2="res://.godot/imported/stg1bg.png-f8797f4a6bcbbb7fe6df127083c2d3b2.etc2.ctex"
 metadata={
-"vram_texture": false
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://Assets/stg1bg/stg1bg.png"
-dest_files=["res://.godot/imported/stg1bg.png-f8797f4a6bcbbb7fe6df127083c2d3b2.ctex"]
+dest_files=["res://.godot/imported/stg1bg.png-f8797f4a6bcbbb7fe6df127083c2d3b2.s3tc.ctex", "res://.godot/imported/stg1bg.png-f8797f4a6bcbbb7fe6df127083c2d3b2.etc2.ctex"]
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=false
+mipmaps/generate=true
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
@@ -31,4 +33,4 @@ process/normal_map_invert_y=false
 process/hdr_as_srgb=false
 process/hdr_clamp_exposure=false
 process/size_limit=0
-detect_3d/compress_to=1
+detect_3d/compress_to=0

+ 1 - 1
characterselect.gd

@@ -33,5 +33,5 @@ func _process(delta: float) -> void:
 		self.queue_free()
 	if(Input.is_action_just_pressed("ui_accept")):
 		
-		get_tree().change_scene_to_file("res://testscene.tscn")
+		get_tree().change_scene_to_file("res://s01/s01.tscn")
 	pass

+ 65 - 3
s01/s01.tscn

@@ -1,8 +1,12 @@
-[gd_scene load_steps=7 format=4 uid="uid://gktuuqyybs6l"]
+[gd_scene load_steps=9 format=4 uid="uid://gktuuqyybs6l"]
 
 [ext_resource type="Texture2D" uid="uid://dr8qsbg7ofnwt" path="res://compare.png" id="1_lpyr1"]
 [ext_resource type="Texture2D" uid="uid://dhphkft2j1bmg" path="res://Assets/front/front.png" id="2_n7jwh"]
 [ext_resource type="FontFile" uid="uid://ct8il6mcn3g8o" path="res://Assets/ascii/ascii.png" id="3_beqf1"]
+[ext_resource type="Texture2D" uid="uid://c2jvep4a4kvoy" path="res://Assets/stg1bg/stg1bg.png" id="4_tq5mr"]
+
+[sub_resource type="ViewportTexture" id="ViewportTexture_yll1q"]
+viewport_path = NodePath("SubViewport")
 
 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_ucjpd"]
 texture = ExtResource("2_n7jwh")
@@ -171,6 +175,14 @@ font = ExtResource("3_beqf1")
 
 [node name="S01" type="Node2D"]
 
+[node name="Node2D" type="Node2D" parent="."]
+
+[node name="Sprite2D" type="Sprite2D" parent="Node2D"]
+position = Vector2(280, 302.5)
+scale = Vector2(0.941406, 1.10352)
+texture = SubResource("ViewportTexture_yll1q")
+region_rect = Rect2(0, 0, 512, 512)
+
 [node name="Compare" type="Sprite2D" parent="."]
 modulate = Color(1, 1, 1, 0.258824)
 texture = ExtResource("1_lpyr1")
@@ -191,10 +203,60 @@ scale = Vector2(1.25, 1.25)
 tile_map_data = PackedByteArray("AAAcABkAAQAAAAAAAAAcABoAAQAAAAEAAAAdABkAAQABAAAAAAAdABoAAQABAAEAAAAeABkAAQACAAAAAAAeABoAAQACAAEAAAAfABkAAQADAAAAAAAfABoAAQADAAEAAAAgABkAAQAEAAAAAAAgABoAAQAEAAEAAAAhABkAAQAFAAAAAAAhABoAAQAFAAEAAAAiABkAAQAGAAAAAAAiABoAAQAGAAEAAAAjABkAAQAHAAAAAAAjABoAAQAHAAEAAAA=")
 tile_set = SubResource("TileSet_lroft")
 
-[node name="Label" type="Label" parent="."]
+[node name="TileMapLayer4" type="TileMapLayer" parent="."]
+position = Vector2(0, -13.5)
+scale = Vector2(1.25, 1.25)
+tile_map_data = PackedByteArray("AAAbAAQAAQAAAAYAAAAcAAQAAQABAAYAAAAdAAQAAQACAAYAAAAbAAMAAQAAAAUAAAAcAAMAAQABAAUAAAAdAAMAAQACAAUAAAAbAAYAAQAAAAcAAAAcAAYAAQABAAcAAAAdAAYAAQACAAcAAAAbAAcAAQAAAAgAAAAcAAcAAQABAAgAAAAbAAkAAQAAAAkAAAAcAAkAAQABAAkAAAAdAAkAAQACAAkAAAAbAAoAAQAAAAoAAAAcAAoAAQABAAoAAAAdAAoAAQACAAoAAAAbAAsAAQAAAAsAAAAcAAsAAQABAAsAAAAdAAsAAQACAAsAAAAbAAwAAQAAAAwAAAAcAAwAAQABAAwAAAAdAAwAAQACAAwAAAA=")
+tile_set = SubResource("TileSet_lroft")
+
+[node name="HiScore" type="Label" parent="."]
+offset_left = 612.0
+offset_top = 50.0
+offset_right = 772.0
+offset_bottom = 73.0
+text = "0000000000
+"
+label_settings = SubResource("LabelSettings_qdj84")
+
+[node name="Score" type="Label" parent="."]
 offset_left = 612.0
 offset_top = 71.0
 offset_right = 772.0
 offset_bottom = 94.0
-text = "0000406950"
+text = "0000000000"
 label_settings = SubResource("LabelSettings_qdj84")
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+
+[node name="SubViewport" type="SubViewport" parent="."]
+transparent_bg = true
+
+[node name="Node3D" type="Node3D" parent="SubViewport"]
+
+[node name="floor" type="Sprite3D" parent="SubViewport/Node3D"]
+transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0)
+texture = ExtResource("4_tq5mr")
+region_enabled = true
+region_rect = Rect2(0, 0, 256, 256)
+
+[node name="floor2" type="Sprite3D" parent="SubViewport/Node3D"]
+transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 2.55727, 0, 0)
+texture = ExtResource("4_tq5mr")
+region_enabled = true
+region_rect = Rect2(0, 0, 256, 256)
+
+[node name="Sprite3D2" type="Sprite3D" parent="SubViewport/Node3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.661581, 0)
+texture = ExtResource("4_tq5mr")
+region_enabled = true
+region_rect = Rect2(260, 0, 120, 128)
+
+[node name="Sprite3D3" type="Sprite3D" parent="SubViewport/Node3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.661581, 0)
+texture = ExtResource("4_tq5mr")
+region_enabled = true
+region_rect = Rect2(260, 0, 120, 128)
+
+[node name="Camera3D" type="Camera3D" parent="SubViewport/Node3D"]
+transform = Transform3D(1, 0, 0, 0, 0.938288, 0.345855, 0, -0.345855, 0.938288, 1.32428, 1.35392, 1.72257)
+fov = 101.3