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")