mirror of
https://gitlab.com/MaddoScientisto/cirnogodot.git
synced 2026-06-01 10:25:35 +00:00
Post-launch fixes
This commit is contained in:
Marco
parent
a015254f9a
commit
62751a66e6
7 changed files with 21 additions and 16 deletions
|
|
@ -11,6 +11,8 @@ if (Test-Path $buildDir) {
|
|||
Remove-Item "$buildDir\*" -Recurse -Force
|
||||
} else {
|
||||
New-Item -ItemType Directory -Path $buildDir | Out-Null
|
||||
New-Item -ItemType Directory -Path $buildDir\win | Out-Null
|
||||
New-Item -ItemType Directory -Path $buildDir\linux | Out-Null
|
||||
}
|
||||
|
||||
# Step 2: Get version data from GitVersion
|
||||
|
|
@ -38,6 +40,7 @@ if (Test-Path $configFile) {
|
|||
}
|
||||
|
||||
# Step 4: Export the build
|
||||
& $godotPath --headless --export-release "Windows Desktop" "$buildDir\win\$fileName.exe"
|
||||
#& $godotPath --headless --export-release "Windows Desktop" "$buildDir\$fileName.exe"
|
||||
& $godotPath --headless --export-release "Windows Desktop" "$buildDir\win\$fileName.x86_64"
|
||||
|
||||
& $godotPath --headless --export-release "Linux" "$buildDir\linux\$fileName.exe"
|
||||
& $godotPath --headless --export-release "Linux" "$buildDir\linux\$fileName"
|
||||
|
|
@ -19,14 +19,15 @@ if (!(Test-Path $zipOutputDir)) {
|
|||
New-Item -ItemType Directory -Path $zipOutputDir | Out-Null
|
||||
}
|
||||
|
||||
Compress-Archive -Path "$buildDir\win\*" -DestinationPath $zipFilePath -Force
|
||||
#Compress-Archive -Path "$buildDir\win\*" -DestinationPath $zipFilePath -Force
|
||||
Compress-Archive -Path "$buildDir\*" -DestinationPath $zipFilePath -Force
|
||||
|
||||
Write-Host "Windows Build completed and packaged as $zipFilePath"
|
||||
|
||||
Compress-Archive -Path "$buildDir\linux\*" -DestinationPath $zipFilePathLinux -Force
|
||||
#Compress-Archive -Path "$buildDir\linux\*" -DestinationPath $zipFilePathLinux -Force
|
||||
|
||||
Write-Host "Linux Build completed and packaged as $zipFilePathLinux"
|
||||
|
||||
& $butlerPath push $zipFilePath maddoscientisto/cirno-no-reason:windows$PreReleaseLabel --userversion $fullSemVer
|
||||
|
||||
& $butlerPath push $zipFilePathLinux maddoscientisto/cirno-no-reason:linux$PreReleaseLabel --userversion $fullSemVer
|
||||
#& $butlerPath push $zipFilePathLinux maddoscientisto/cirno-no-reason:linux$PreReleaseLabel --userversion $fullSemVer
|
||||
|
|
@ -411,6 +411,7 @@ expand_mode = 1
|
|||
stretch_mode = 3
|
||||
|
||||
[node name="FPS" type="Label" parent="."]
|
||||
visible = false
|
||||
z_index = 20
|
||||
z_as_relative = false
|
||||
anchors_preset = 3
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
[gd_scene load_steps=30 format=4 uid="uid://24wh7h2dbljf"]
|
||||
[gd_scene load_steps=29 format=4 uid="uid://24wh7h2dbljf"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://b2j00riayxkit" path="res://Scripts/Controllers/RogueliteRoom.cs" id="1_vhsym"]
|
||||
[ext_resource type="Resource" uid="uid://dn3ai56rrxfnk" path="res://Resources/RogueliteMaps/Beginner1.tres" id="2_vhsym"]
|
||||
|
|
@ -7,7 +7,6 @@
|
|||
[ext_resource type="PackedScene" uid="uid://cl7s06sk106uo" path="res://Scenes/Props/VendingMachine.tscn" id="6_70a8f"]
|
||||
[ext_resource type="PackedScene" uid="uid://4q82gggqax87" path="res://Scenes/Items/Cheat_Gun_Pickup.tscn" id="6_pys6w"]
|
||||
[ext_resource type="PackedScene" uid="uid://djf0y08ix66fn" path="res://Scenes/Interactable/Chest.tscn" id="7_kublc"]
|
||||
[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="8_dbn5e"]
|
||||
[ext_resource type="Resource" uid="uid://cltxhkrqp055v" path="res://Resources/Items/Money_Pickup.tres" id="9_5yebg"]
|
||||
[ext_resource type="Resource" uid="uid://cajqlnyvlmybe" path="res://Resources/Items/IcicleRepeater_Improved.tres" id="10_6gtn1"]
|
||||
[ext_resource type="Resource" uid="uid://dwwbyyy3fo4bt" path="res://Resources/Items/IcicleRepeater_Advanced.tres" id="11_0a3am"]
|
||||
|
|
@ -68,14 +67,14 @@ metadata/_edit_lock_ = true
|
|||
metadata/_edit_lock_ = true
|
||||
|
||||
[node name="CheaetGun" parent="Actors" instance=ExtResource("6_pys6w")]
|
||||
position = Vector2(119, 127)
|
||||
position = Vector2(139, -103)
|
||||
|
||||
[node name="VendingMachine" parent="Actors" instance=ExtResource("6_70a8f")]
|
||||
position = Vector2(248, 56)
|
||||
position = Vector2(275, -100)
|
||||
|
||||
[node name="Chest" parent="Actors" instance=ExtResource("7_kublc")]
|
||||
position = Vector2(216, 55)
|
||||
LootTable = Array[ExtResource("8_dbn5e")]([ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("10_6gtn1"), ExtResource("11_0a3am"), ExtResource("12_t3lr8"), ExtResource("13_ii24s"), ExtResource("14_15ruc"), ExtResource("15_5uxd1"), ExtResource("16_iyfx3"), ExtResource("17_45mmk"), ExtResource("18_ipsj4"), ExtResource("19_ii24s"), ExtResource("19_ii24s"), ExtResource("19_ii24s"), ExtResource("20_15ruc"), ExtResource("20_15ruc"), ExtResource("20_15ruc"), ExtResource("21_5uxd1"), ExtResource("21_5uxd1"), ExtResource("21_5uxd1"), ExtResource("26_iyfx3")])
|
||||
position = Vector2(220, -109)
|
||||
LootTable = [ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("9_5yebg"), ExtResource("10_6gtn1"), ExtResource("11_0a3am"), ExtResource("12_t3lr8"), ExtResource("13_ii24s"), ExtResource("14_15ruc"), ExtResource("15_5uxd1"), ExtResource("16_iyfx3"), ExtResource("17_45mmk"), ExtResource("18_ipsj4"), ExtResource("19_ii24s"), ExtResource("19_ii24s"), ExtResource("19_ii24s"), ExtResource("20_15ruc"), ExtResource("20_15ruc"), ExtResource("20_15ruc"), ExtResource("21_5uxd1"), ExtResource("21_5uxd1"), ExtResource("21_5uxd1"), ExtResource("26_iyfx3")]
|
||||
|
||||
[node name="Label" type="Label" parent="Actors"]
|
||||
offset_left = 153.0
|
||||
|
|
@ -100,7 +99,7 @@ shape = SubResource("RectangleShape2D_u3c1h")
|
|||
[node name="Features" type="Node2D" parent="."]
|
||||
|
||||
[node name="Teleporter" type="Marker2D" parent="Features"]
|
||||
position = Vector2(40, 56)
|
||||
position = Vector2(44.8731, -125.141)
|
||||
script = ExtResource("12_f3e1d")
|
||||
Type = 4
|
||||
MarkerTexture = SubResource("AtlasTexture_5rt6n")
|
||||
|
|
@ -120,7 +119,7 @@ Type = 2
|
|||
MarkerTexture = SubResource("AtlasTexture_5rt6n")
|
||||
|
||||
[node name="Exit" type="Marker2D" parent="Features"]
|
||||
position = Vector2(40, 136)
|
||||
position = Vector2(-19, -109)
|
||||
script = ExtResource("12_f3e1d")
|
||||
Type = 5
|
||||
MarkerTexture = SubResource("AtlasTexture_5yebg")
|
||||
|
|
@ -135,7 +134,7 @@ text = "Exit test"
|
|||
label_settings = ExtResource("14_c0yr1")
|
||||
|
||||
[node name="AmmoMarker4" type="Marker2D" parent="Features"]
|
||||
position = Vector2(91, 134)
|
||||
position = Vector2(92, 103)
|
||||
script = ExtResource("25_5uxd1")
|
||||
Item = ExtResource("26_iyfx3")
|
||||
AutoSpawn = true
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ public partial class PlayerWeaponProvider : Node2D
|
|||
{
|
||||
if (startingItem is null)
|
||||
{
|
||||
GD.Print($"Could not spawn weapon {startingItem.ItemKey} was not in the inventory.");
|
||||
GD.Print($"Could not spawn weapon was not in the inventory.");
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -34,5 +34,6 @@ public class SessionSettings
|
|||
public void NewSession()
|
||||
{
|
||||
Items = new();
|
||||
EquippedWeaponId = string.Empty;
|
||||
}
|
||||
}
|
||||
|
|
@ -93,7 +93,7 @@ script_export_mode=2
|
|||
custom_template/debug=""
|
||||
custom_template/release=""
|
||||
debug/export_console_wrapper=1
|
||||
binary_format/embed_pck=false
|
||||
binary_format/embed_pck=true
|
||||
texture_format/s3tc_bptc=true
|
||||
texture_format/etc2_astc=false
|
||||
binary_format/architecture="x86_64"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue