darknight/puzzle-quest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add method for quit war scene and back to main

Browse Source
This commit is contained in:
VAILLANT Jeremy
2021-05-08 20:38:16 +02:00
parent ec277ff2c0
commit 54833d8f78
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/props/rock floor/textures/tx_rock_floor_bc.tga.import
+3 -2
View File
@@ -4,15 +4,16 @@ importer="texture"
type="StreamTexture" type="StreamTexture"
path.s3tc="res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.s3tc.stex" path.s3tc="res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.s3tc.stex"
path.etc2="res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.etc2.stex" path.etc2="res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.etc2.stex"
path.etc="res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.etc.stex"
metadata={ metadata={
"imported_formats": [ "s3tc", "etc2" ], "imported_formats": [ "s3tc", "etc2", "etc" ],
"vram_texture": true "vram_texture": true
} }
[deps] [deps]
source_file="res://assets/props/rock floor/textures/tx_rock_floor_bc.tga" source_file="res://assets/props/rock floor/textures/tx_rock_floor_bc.tga"
dest_files=[ "res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.s3tc.stex", "res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.etc2.stex" ] dest_files=[ "res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.s3tc.stex", "res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.etc2.stex", "res://.import/tx_rock_floor_bc.tga-4b77fe3e94f9498cc82b83553dd20905.etc.stex" ]
[params] [params]
scenes/levels/WarCraft.gd
+9
View File
@@ -0,0 +1,9 @@
extends Spatial
export (PackedScene) var main = load("res://scenes/main.tscn")
func _notification(what):
# Back to main scene
if what == MainLoop.NOTIFICATION_WM_GO_BACK_REQUEST:
var scene = main.instance()
call_deferred("add_child", scene)
scenes/levels/WarCraft.tscn
+3 -1
View File
@@ -1,10 +1,11 @@
[gd_scene load_steps=8 format=2] [gd_scene load_steps=9 format=2]
[ext_resource path="res://assets/props/rock floor/rock floor.gltf" type="PackedScene" id=1] [ext_resource path="res://assets/props/rock floor/rock floor.gltf" type="PackedScene" id=1]
[ext_resource path="res://assets/props/table/table.gltf" type="PackedScene" id=2] [ext_resource path="res://assets/props/table/table.gltf" type="PackedScene" id=2]
[ext_resource path="res://assets/props/stool b/stool b.gltf" type="PackedScene" id=3] [ext_resource path="res://assets/props/stool b/stool b.gltf" type="PackedScene" id=3]
[ext_resource path="res://assets/hdri/tx_night_place.hdr" type="Texture" id=4] [ext_resource path="res://assets/hdri/tx_night_place.hdr" type="Texture" id=4]
[ext_resource path="res://assets/props/book/book.gltf" type="PackedScene" id=5] [ext_resource path="res://assets/props/book/book.gltf" type="PackedScene" id=5]
[ext_resource path="res://scenes/levels/WarCraft.gd" type="Script" id=6]
[sub_resource type="PanoramaSky" id=1] [sub_resource type="PanoramaSky" id=1]
panorama = ExtResource( 4 ) panorama = ExtResource( 4 )
@@ -15,6 +16,7 @@ background_sky = SubResource( 1 )
ambient_light_color = Color( 0.266667, 0.14902, 0.0627451, 1 ) ambient_light_color = Color( 0.266667, 0.14902, 0.0627451, 1 )
[node name="Warcraft" type="Spatial"] [node name="Warcraft" type="Spatial"]
script = ExtResource( 6 )
[node name="rock floor" parent="." instance=ExtResource( 1 )] [node name="rock floor" parent="." instance=ExtResource( 1 )]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 2.253 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 2.253 )