zenayi/GameJamDungeon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Zenny
2025-09-26 14:13:13 -07:00
parent 9107b8c570
commit 9f26b5fda7
8 changed files with 64 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/04. Tree Antechamber.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=20 format=3 uid="uid://i781lbf2wb22"]
[gd_scene load_steps=20 format=3 uid="uid://tpgwccr6v43e"]
[ext_resource type="Script" uid="uid://dhollu4j3pynq" path="res://src/map/dungeon/code/MonsterRoom.cs" id="1_58osi"]
[ext_resource type="Texture2D" uid="uid://b3sg8oamch2i1" path="res://src/map/dungeon/models/Outdated/Set A/04. Antechamber B/TREE_ROOM_VER2_STONE_PANEL_2png.png" id="2_q760f"]

2
Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/07. CornerBlock Antechamber.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=16 format=3 uid="uid://vdhl32je6hq2"]
[gd_scene load_steps=16 format=3 uid="uid://ce0cjm6v7ct6c"]
[ext_resource type="Script" uid="uid://dhollu4j3pynq" path="res://src/map/dungeon/code/MonsterRoom.cs" id="2_6xco5"]
[ext_resource type="PackedScene" uid="uid://dpdd01hhma37w" path="res://src/map/dungeon/models/Version 4/Area 1/Corner Block/A1-CornerBlockRoom.glb" id="2_tcq83"]

32
Zennysoft.Game.Ma/src/map/dungeon/rooms/Set A/15. Boss Floor A.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=277 format=4 uid="uid://5ja3qxn8h7iw"]
[gd_scene load_steps=276 format=4 uid="uid://5ja3qxn8h7iw"]
[ext_resource type="Script" uid="uid://tqyybt313web" path="res://src/map/dungeon/code/BossRoomA.cs" id="1_0h3lb"]
[ext_resource type="Texture2D" uid="uid://vjbe1lg810gh" path="res://src/map/dungeon/models/Boss Floor A/15_A1_BOSS FLOOR A_VER_swirled_column.png" id="2_06eum"]
@@ -32,7 +32,6 @@
[ext_resource type="Texture2D" uid="uid://ben3q8gpume4y" path="res://src/map/dungeon/models/Boss Floor A/Boss Floor 1 Ver_HAND_CYCLE_MOTIF.png" id="26_r8vfg"]
[ext_resource type="Texture2D" uid="uid://bfcb0mknmw5a7" path="res://src/map/dungeon/models/Boss Floor A/Boss Floor 1 Ver_FLOOR1.jpg" id="27_16vso"]
[ext_resource type="PackedScene" uid="uid://6dnsw37d1uw4" path="res://src/enemy/enemy_types/15. ox_face/OxFace.tscn" id="27_g6y6v"]
[ext_resource type="Shader" uid="uid://bbn3f2r51dy27" path="res://src/map/map shaders/Boss Floor 1 Sky.gdshader" id="28_4xaw3"]
[ext_resource type="Texture2D" uid="uid://dklna8mnv237w" path="res://src/map/dungeon/models/Boss Floor A/Boss Floor 1 Ver_lower_corridor_lower.png" id="28_q4tlp"]
[ext_resource type="Texture2D" uid="uid://dr4o3a7q08q0k" path="res://src/map/dungeon/models/Boss Floor A/Boss Floor 1 Ver_brick3.png" id="29_mx0fb"]
[ext_resource type="Texture2D" uid="uid://8fkhcvod75sl" path="res://src/map/dungeon/models/Boss Floor A/Boss Floor 1 Ver_WALL TILE 1.jpg" id="30_2rm47"]
@@ -4229,35 +4228,6 @@ size = Vector3(6.25977, 15.6429, 37.6357)
size = Vector3(12.4734, 10.2039, 7.09571)
[sub_resource type="ShaderMaterial" id="ShaderMaterial_lmjp4"]
shader = ExtResource("28_4xaw3")
shader_parameter/day_top_color = Color(0.889883, 0.32524, 0.146136, 1)
shader_parameter/day_bottom_color = Color(1, 0.655043, 0.431942, 1)
shader_parameter/sunset_top_color = Color(1, 0.578907, 0.310707, 1)
shader_parameter/sunset_bottom_color = Color(0.98, 0.718667, 0, 1)
shader_parameter/night_top_color = Color(0.765828, 0.522898, 0, 1)
shader_parameter/night_bottom_color = Color(0.810332, 0.190734, 0, 1)
shader_parameter/horizon_color = Color(0.769157, 0.0558909, 0.13594, 1)
shader_parameter/horizon_blur = 0.06
shader_parameter/sun_color = Color(0.851632, 0.352778, 0.119876, 1)
shader_parameter/sun_sunset_color = Color(0.912055, 0.906693, 0.905404, 1)
shader_parameter/sun_size = 0.196
shader_parameter/sun_blur = 0.702
shader_parameter/moon_color = Color(1, 0.95, 0.7, 1)
shader_parameter/moon_size = 0.06
shader_parameter/moon_blur = 0.1
shader_parameter/clouds_edge_color = Color(0.62793, 0.164986, 0.197414, 1)
shader_parameter/clouds_top_color = Color(0.83699, 0.835395, 0.867768, 1)
shader_parameter/clouds_middle_color = Color(0.812584, 0.478296, 0.208116, 1)
shader_parameter/clouds_bottom_color = Color(0.83, 0.83, 0.94, 1)
shader_parameter/clouds_speed = 8.08
shader_parameter/clouds_direction = 0.2
shader_parameter/clouds_scale = 1.63
shader_parameter/clouds_cutoff = 0.32
shader_parameter/clouds_fuzziness = 0.58
shader_parameter/clouds_weight = 0.0
shader_parameter/clouds_blur = 0.13
shader_parameter/stars_speed = 1.0
shader_parameter/overwritten_time = 0.0
[sub_resource type="Sky" id="Sky_lmjp4"]
sky_material = SubResource("ShaderMaterial_lmjp4")