GameJammer/GameJam2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI Changes

Browse Source
This commit is contained in:
Zenny
2023-09-04 23:56:16 -07:00
parent 83b4d90ccb
commit 69fed8d403
31 changed files with 579 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Scenes/Characters/Capricorn/CapricornP1.tscn
View File

@@ -212,7 +212,7 @@ animations = [{
[sub_resource type="BoxShape3D" id="BoxShape3D_r4spg"]
size = Vector3(1, 5, 1)
[node name="Capricorn" type="CharacterBody3D" groups=["Player"]]
[node name="CapricornP1" type="CharacterBody3D" groups=["Player"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0)
script = ExtResource("1_rngpf")

2
Scenes/Characters/Capricorn/CapricornP2.tscn
View File

@@ -215,7 +215,7 @@ size = Vector3(1, 1.04415, 1)
[sub_resource type="BoxShape3D" id="BoxShape3D_yilru"]
size = Vector3(1, 5, 1)
[node name="Capricorn" type="CharacterBody3D" groups=["Player"]]
[node name="CapricornP2" type="CharacterBody3D" groups=["Player"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.5, 0)
script = ExtResource("1_iu20s")

2
Scenes/Characters/P1Megami.tscn
View File

@@ -599,7 +599,7 @@ _surfaces = [{
blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_htkik")
[node name="Megami" type="CharacterBody3D" groups=["Player"]]
[node name="MegamiP1" type="CharacterBody3D" groups=["Player"]]
script = ExtResource("1_ah2xl")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]

2
Scenes/Characters/P1PiscesWitch.tscn
View File

@@ -12,7 +12,7 @@ size = Vector3(3.04879, 3.92906, 2.56521)
radius = 0.704872
height = 1.67894
[node name="Pisces" type="CharacterBody3D" groups=["Player"]]
[node name="PiscesP1" type="CharacterBody3D" groups=["Player"]]
transform = Transform3D(0.33, 0, 0, 0, 0.33, 0, 0, 0, 0.33, 0, 0, 0)
script = ExtResource("1_ug7pg")
_fireProjectile = ExtResource("2_y0wmm")

2
Scenes/Characters/P1PlayerScorpio.tscn
View File

@@ -11,7 +11,7 @@ size = Vector3(0.822782, 0.527059, 0.80108)
[sub_resource type="BoxShape3D" id="BoxShape3D_f8aaj"]
size = Vector3(0.822782, 0.527059, 0.80108)
[node name="PlayerScorpio" type="CharacterBody3D" groups=["Player"]]
[node name="ScorpioP1" type="CharacterBody3D" groups=["Player"]]
script = ExtResource("1_mn5ui")
_fireProjectile = ExtResource("2_uayjr")
_altFireProjectile = ExtResource("3_tw078")

17
Scenes/Characters/P2Megami.tscn
View File

@@ -1,12 +1,23 @@
[gd_scene load_steps=27 format=3 uid="uid://dk65etf7r8bm6"]
[gd_scene load_steps=29 format=3 uid="uid://dk65etf7r8bm6"]
[ext_resource type="Script" path="res://Scripts/Character2.cs" id="1_eg082"]
[ext_resource type="Shader" path="res://Scenes/Characters/P2Megami2.gdshader" id="2_4sjch"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_lwhu3"]
render_priority = 0
shader = ExtResource("2_4sjch")
shader_parameter/albedo = null
shader_parameter/specular = null
shader_parameter/metallic = null
shader_parameter/roughness = null
shader_parameter/uv1_scale = null
shader_parameter/uv1_offset = null
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4qqwi"]
resource_name = "Material.006"
next_pass = SubResource("ShaderMaterial_lwhu3")
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_color = Color(0.899732, 0.906332, 0.700897, 1)
roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a11nm"]
@@ -602,7 +613,7 @@ size = Vector3(0.822782, 0.527059, 0.80108)
[sub_resource type="BoxShape3D" id="BoxShape3D_lo3oj"]
size = Vector3(1.19222, 2.13872, 1.37879)
[node name="Megami" type="CharacterBody3D"]
[node name="MegamiP2" type="CharacterBody3D"]
script = ExtResource("1_eg082")
[node name="Pivot" type="Node3D" parent="."]

43
Scenes/Characters/P2Megami2.gdshader Normal file
View File

@@ -0,0 +1,43 @@
shader_type spatial;
// Simplified Godot spatial shader uniforms and settings:
render_mode blend_mix,depth_draw_opaque,cull_back,diffuse_burley,specular_schlick_ggx;
uniform vec4 albedo : source_color;
uniform float specular;
uniform float metallic;
uniform float roughness : hint_range(0,1);
uniform vec3 uv1_scale;
uniform vec3 uv1_offset;
// The texture to use as a color mask.
// For these examples, it will be the ColorMask viewport texture.
uniform sampler2D mask_texture : hint_default_black;
// Godot generated code:
// It scales and offsets the UV vector by the inputted uniforms.
void vertex() {
UV=UV*uv1_scale.xy+uv1_offset.xy;
}
void fragment() {
// Simplified Godot spatial shader code:
vec2 base_uv = UV;
METALLIC = metallic;
ROUGHNESS = roughness;
SPECULAR = specular;
// Everything below this line is the color masking code!
//
// First, get the pixel from the mask texture at the screen UV position. This will give the pixel at this fragment position
// relative to the screen, and since the ColorMask viewport is synced with the main screen/viewport, we can use this to get
// the pixel at the correct position in the ColorMask viewport.
vec4 mask_pixel = texture(mask_texture, SCREEN_UV);
// Because we know the ColorMask is going to be black/white, we can simply check if the pixel returned is over 0.9.
// If it is, then change the output ALBEDO color to red.
if (mask_pixel.r >= 0.9)
{
ALBEDO = vec3(1,0,0);
}
}

2
Scenes/Characters/P2PiscesWitch.tscn
View File

@@ -12,7 +12,7 @@ size = Vector3(3.04879, 3.92906, 2.56521)
radius = 0.704872
height = 1.67894
[node name="Pisces" type="CharacterBody3D" groups=["Player"]]
[node name="PiscesP2" type="CharacterBody3D" groups=["Player"]]
transform = Transform3D(0.33, 0, 0, 0, 0.33, 0, 0, 0, 0.33, 0, 0, 0)
script = ExtResource("1_n3jg5")
_fireProjectile = ExtResource("2_gw1od")

2
Scenes/Characters/P2PlayerScorpio.tscn
View File

@@ -11,7 +11,7 @@ size = Vector3(0.822782, 0.527059, 0.80108)
[sub_resource type="BoxShape3D" id="BoxShape3D_f8aaj"]
size = Vector3(0.822782, 0.527059, 0.80108)
[node name="PlayerScorpio" type="CharacterBody3D" groups=["Player"]]
[node name="ScorpioP2" type="CharacterBody3D" groups=["Player"]]
script = ExtResource("1_5q5l0")
_fireProjectile = ExtResource("2_iw8b0")
_altFireProjectile = ExtResource("3_61xde")

12
Scenes/GameManager.tscn
View File

@@ -2,7 +2,7 @@
[ext_resource type="Script" path="res://Scripts/GameManager.cs" id="1_ya2kt"]
[ext_resource type="PackedScene" uid="uid://xcmspevaqcrc" path="res://Scenes/Player1.tscn" id="4_3fl70"]
[ext_resource type="PackedScene" uid="uid://dq1gtd55p04do" path="res://Scenes/StageGUI.tscn" id="5_gsh7q"]
[ext_resource type="PackedScene" uid="uid://dq1gtd55p04do" path="res://Scenes/StageGUI.tscn" id="4_xi0i5"]
[ext_resource type="PackedScene" uid="uid://jircpua5fl80" path="res://Scenes/Player2.tscn" id="8_sixv3"]
[node name="GameManager" type="Node3D"]
@@ -15,16 +15,10 @@ projection = 1
current = true
size = 10.8546
[node name="StageGUI" parent="." instance=ExtResource("5_gsh7q")]
offset_left = 0.0
offset_top = 0.0
offset_right = 0.0
offset_bottom = 0.0
size_flags_horizontal = 4
size_flags_vertical = 4
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, -0.504317, 0.863519, 0, -0.863519, -0.504317, 0, 19.9508, 0)
[node name="StageGUI" parent="." instance=ExtResource("4_xi0i5")]
[connection signal="ReselectCharacter" from="." to="StageGUI" method="OnCharacterSelect"]
[connection signal="OnCharacterSelectionMade" from="StageGUI" to="." method="OnCharacterSelected"]

184
Scenes/StageGUI.tscn
View File

@@ -1,16 +1,12 @@
[gd_scene load_steps=6 format=3 uid="uid://dq1gtd55p04do"]
[gd_scene load_steps=8 format=3 uid="uid://dq1gtd55p04do"]
[ext_resource type="Script" path="res://Scripts/StageGUI.cs" id="1_wr2m0"]
[ext_resource type="Texture2D" uid="uid://2vog2nty4qrj" path="res://Textures/wheel.png" id="4_3jyfi"]
[ext_resource type="Script" path="res://Scripts/CharacterSelectUpdateService.cs" id="3_5iw21"]
[ext_resource type="Texture2D" uid="uid://5fnvx1dxl85g" path="res://Textures/Portraits/cap-bg.png" id="3_o2fah"]
[ext_resource type="Texture2D" uid="uid://d237k682uasn0" path="res://Textures/Portraits/pisces-bg.png" id="4_df6a8"]
[ext_resource type="Texture2D" uid="uid://fqmkmpmackem" path="res://Textures/Portraits/character-BACKGROUND-ONLY.png" id="4_xa2n6"]
[sub_resource type="Animation" id="Animation_ptfpl"]
resource_name = "Rollover"
[sub_resource type="AnimationLibrary" id="AnimationLibrary_05shj"]
_data = {
"Rollover": SubResource("Animation_ptfpl")
}
[ext_resource type="Texture2D" uid="uid://dqukqw3vwfrog" path="res://Textures/Portraits/sag-bg.png" id="5_k6b7h"]
[ext_resource type="Texture2D" uid="uid://d0yx2qyi7dfkp" path="res://Textures/Portraits/scorpio-bg.png" id="6_vgqeh"]
[node name="StageGUI" type="Control"]
process_mode = 3
@@ -18,10 +14,6 @@ layout_mode = 3
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = -59.0
offset_top = -36.0
offset_right = -59.0
offset_bottom = -36.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_wr2m0")
@@ -37,9 +29,8 @@ offset_right = 420.0
offset_bottom = 540.0
grow_vertical = 2
texture = ExtResource("4_xa2n6")
stretch_mode = 2
[node name="SidebarLeft2" type="TextureRect" parent="."]
[node name="SidebarRight" type="TextureRect" parent="."]
layout_mode = 1
anchors_preset = 6
anchor_left = 1.0
@@ -54,34 +45,155 @@ grow_vertical = 2
texture = ExtResource("4_xa2n6")
[node name="CharacterSelect" type="Control" parent="."]
process_mode = 3
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("3_5iw21")
[node name="AnimationPlayer" type="AnimationPlayer" parent="CharacterSelect"]
libraries = {
"": SubResource("AnimationLibrary_05shj")
}
[node name="P1" type="Control" parent="CharacterSelect"]
layout_mode = 1
anchors_preset = 4
anchor_top = 0.5
anchor_bottom = 0.5
offset_top = -20.0
offset_right = 40.0
offset_bottom = 20.0
grow_vertical = 2
[node name="Wheel" type="TextureRect" parent="CharacterSelect"]
[node name="CapBG" type="TextureRect" parent="CharacterSelect/P1"]
visible = false
layout_mode = 0
offset_left = 48.0
offset_top = 71.0
offset_right = 349.0
offset_bottom = 386.0
texture = ExtResource("4_3jyfi")
expand_mode = 1
layout_mode = 1
anchors_preset = 4
anchor_top = 0.5
anchor_bottom = 0.5
offset_top = -540.0
offset_right = 420.0
offset_bottom = 540.0
grow_vertical = 2
texture = ExtResource("3_o2fah")
stretch_mode = 2
[node name="Wheel2" type="TextureRect" parent="CharacterSelect"]
[node name="PiscesBG" type="TextureRect" parent="CharacterSelect/P1"]
visible = false
layout_mode = 0
offset_left = 1570.0
offset_top = 84.0
offset_right = 1871.0
offset_bottom = 399.0
texture = ExtResource("4_3jyfi")
expand_mode = 1
layout_mode = 1
anchors_preset = 4
anchor_top = 0.5
anchor_bottom = 0.5
offset_top = -540.0
offset_right = 420.0
offset_bottom = 540.0
grow_vertical = 2
texture = ExtResource("4_df6a8")
stretch_mode = 2
[node name="SagBG" type="TextureRect" parent="CharacterSelect/P1"]
visible = false
layout_mode = 1
anchors_preset = 4
anchor_top = 0.5
anchor_bottom = 0.5
offset_top = -540.0
offset_right = 420.0
offset_bottom = 540.0
grow_vertical = 2
texture = ExtResource("5_k6b7h")
stretch_mode = 2
[node name="ScorpioBG" type="TextureRect" parent="CharacterSelect/P1"]
visible = false
layout_mode = 1
anchors_preset = 4
anchor_top = 0.5
anchor_bottom = 0.5
offset_top = -540.0
offset_right = 420.0
offset_bottom = 540.0
grow_vertical = 2
texture = ExtResource("6_vgqeh")
stretch_mode = 2
[node name="P2" type="Control" parent="CharacterSelect"]
layout_mode = 1
anchors_preset = 6
anchor_left = 1.0
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
offset_left = -40.0
offset_top = -20.0
offset_bottom = 20.0
grow_horizontal = 0
grow_vertical = 2
[node name="CapBG" type="TextureRect" parent="CharacterSelect/P2"]
visible = false
layout_mode = 1
anchors_preset = 6
anchor_left = 1.0
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
offset_left = -420.0
offset_top = -540.0
offset_bottom = 540.0
grow_horizontal = 0
grow_vertical = 2
texture = ExtResource("3_o2fah")
[node name="PiscesBG" type="TextureRect" parent="CharacterSelect/P2"]
visible = false
layout_mode = 1
anchors_preset = 6
anchor_left = 1.0
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
offset_left = -420.0
offset_top = -540.0
offset_bottom = 540.0
grow_horizontal = 0
grow_vertical = 2
texture = ExtResource("4_df6a8")
[node name="SagBG" type="TextureRect" parent="CharacterSelect/P2"]
visible = false
layout_mode = 1
anchors_preset = 6
anchor_left = 1.0
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
offset_left = -420.0
offset_top = -540.0
offset_bottom = 540.0
grow_horizontal = 0
grow_vertical = 2
texture = ExtResource("5_k6b7h")
[node name="ScorpioBG" type="TextureRect" parent="CharacterSelect/P2"]
visible = false
layout_mode = 1
anchors_preset = 6
anchor_left = 1.0
anchor_top = 0.5
anchor_right = 1.0
anchor_bottom = 0.5
offset_left = -420.0
offset_top = -540.0
offset_bottom = 540.0
grow_horizontal = 0
grow_vertical = 2
texture = ExtResource("6_vgqeh")
[connection signal="CapricornP1Selected" from="." to="CharacterSelect" method="OnCapricornP1Selected"]
[connection signal="CapricornP2Selected" from="." to="CharacterSelect" method="OnCapricornP2Selected"]
[connection signal="PiscesP1Selected" from="." to="CharacterSelect" method="OnPiscesP1Selected"]
[connection signal="PiscesP2Selected" from="." to="CharacterSelect" method="OnPiscesP2Selected"]
[connection signal="SagP1Selected" from="." to="CharacterSelect" method="OnSagP1Selected"]
[connection signal="SagP2Selected" from="." to="CharacterSelect" method="OnSagP2Selected"]
[connection signal="ScorpioP1Selected" from="." to="CharacterSelect" method="OnScorpioP1Selected"]
[connection signal="ScorpioP2Selected" from="." to="CharacterSelect" method="OnScorpioP2Selected"]

BIN
Scenes/character-BACKGROUND-ONLY.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB

34
Scenes/character-BACKGROUND-ONLY.png.import
View File

@@ -1,34 +0,0 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dhn08vs88telq"
path="res://.godot/imported/character-BACKGROUND-ONLY.png-ae42ea0737fd64304b94cb0c74945024.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Scenes/character-BACKGROUND-ONLY.png"
dest_files=["res://.godot/imported/character-BACKGROUND-ONLY.png-ae42ea0737fd64304b94cb0c74945024.ctex"]
[params]
compress/mode=0
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/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
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