Skip to content

Commit

Permalink
cat fix
Browse files Browse the repository at this point in the history
  • Loading branch information
TinyTakinTeller committed Feb 7, 2025
1 parent 41dd398 commit 0886b5b
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 42 deletions.
Binary file removed assets/image/npc/cat/cat_90_100.png
Binary file not shown.
34 changes: 0 additions & 34 deletions assets/image/npc/cat/cat_90_100.png.import

This file was deleted.

4 changes: 2 additions & 2 deletions scenes/autostart/main/main.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
[ext_resource type="PackedScene" uid="uid://d1y5xyx63u3w0" path="res://scenes/ui/developer_console/developer_console.tscn" id="20_yijsf"]
[ext_resource type="PackedScene" uid="uid://dn6hcp4hfxyic" path="res://scenes/ui/version_container/version_container.tscn" id="20_ynkq3"]
[ext_resource type="PackedScene" uid="uid://ch7uxqklej1h6" path="res://scenes/ui/screen/darkness_screen/darkness_screen.tscn" id="21_324w1"]
[ext_resource type="Texture2D" uid="uid://b4wqq3rdroryo" path="res://assets/image/art/cat.png" id="24_msvnv"]
[ext_resource type="PackedScene" uid="uid://dfrws6lo2o7d0" path="res://scenes/autostart/soul_screen/soul_sprite/soul_sprite.tscn" id="25_jo8o4"]
[ext_resource type="PackedScene" uid="uid://cnh5vhg0xefn6" path="res://scenes/ui/screen/soul_screen/soul_screen.tscn" id="26_pehc6"]
[ext_resource type="PackedScene" uid="uid://br1a46uikyubt" path="res://scenes/ui/screen/starway_screen/starway_screen.tscn" id="27_d2ak1"]
Expand All @@ -45,7 +46,6 @@
[ext_resource type="PackedScene" uid="uid://b0iomctf5ruia" path="res://scenes/autostart/main/prestige_ui/prestige_ui.tscn" id="39_5hxeo"]
[ext_resource type="PackedScene" uid="uid://b75kh4e41777c" path="res://scenes/autostart/main/reborn_ui/reborn_ui.tscn" id="40_cpuij"]
[ext_resource type="Shader" path="res://resources/shader/cracked_glass/cracked_glass.gdshader" id="41_fakmo"]
[ext_resource type="Texture2D" uid="uid://cpwmy667e4xpa" path="res://assets/image/npc/cat/cat_90_100.png" id="42_xhf8o"]

[sub_resource type="ShaderMaterial" id="ShaderMaterial_pgw6q"]
shader = ExtResource("37_xggnc")
Expand Down Expand Up @@ -146,7 +146,7 @@ grow_vertical = 2
unique_name_in_owner = true
z_index = 4096
position = Vector2(475, 617)
texture = ExtResource("42_xhf8o")
texture = ExtResource("24_msvnv")

[node name="SoulSprite" parent="CanvasLayer/MainControl/SoulUI" instance=ExtResource("25_jo8o4")]
unique_name_in_owner = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[ext_resource type="Shader" path="res://resources/shader/radial_distortion/radial_distortion.gdshader" id="1_oex4w"]
[ext_resource type="Script" path="res://scenes/autostart/main/prestige_ui/texture_heart/texture_heart.gd" id="1_r458w"]
[ext_resource type="Texture2D" uid="uid://x0uaxjbfb55b" path="res://assets/image/art/heart.png" id="2_tt4yi"]
[ext_resource type="Texture2D" uid="uid://x0uaxjbfb55b" path="res://assets/image/art - Copy/heart.png" id="2_tt4yi"]

[sub_resource type="ShaderMaterial" id="ShaderMaterial_wv8it"]
shader = ExtResource("1_oex4w")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[gd_scene load_steps=6 format=3 uid="uid://yopnoeejc2om"]

[ext_resource type="Script" path="res://scenes/ui/screen/substance_screen/substance_category/substance_item/substance_item.gd" id="1_etpxj"]
[ext_resource type="Texture2D" uid="uid://ba3fuq18t7tiq" path="res://assets/image/art/rabbit.png" id="2_74x44"]
[ext_resource type="Texture2D" uid="uid://ba3fuq18t7tiq" path="res://assets/image/art - Copy/rabbit.png" id="2_74x44"]
[ext_resource type="PackedScene" uid="uid://bpq246h5ihhck" path="res://scenes/component/shake_shader_component/shake_shader_component.tscn" id="3_q3wpk"]
[ext_resource type="PackedScene" uid="uid://bjmn4owp4lhaj" path="res://scenes/component/tween/new_unlock_tween/new_unlock_tween.tscn" id="4_ivx1y"]
[ext_resource type="PackedScene" uid="uid://b3awft3ugc6q3" path="res://scenes/component/tween/simple_tween/simple_tween.tscn" id="5_kj2mx"]
Expand Down
6 changes: 2 additions & 4 deletions scenes/ui/screen/world_screen/npc_dialog/npc_dialog.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,13 @@
[ext_resource type="Script" path="res://scenes/ui/screen/world_screen/npc_dialog/npc_dialog.gd" id="1_urym8"]
[ext_resource type="PackedScene" uid="uid://ccm0lefdpacby" path="res://scenes/component/control/label/label_typing/label_typing.tscn" id="2_55et7"]
[ext_resource type="PackedScene" uid="uid://bpq246h5ihhck" path="res://scenes/component/shake_shader_component/shake_shader_component.tscn" id="3_uxbm3"]
[ext_resource type="Texture2D" uid="uid://b4wqq3rdroryo" path="res://assets/image/art/cat.png" id="4_0gon8"]
[ext_resource type="PackedScene" uid="uid://b3awft3ugc6q3" path="res://scenes/component/tween/simple_tween/simple_tween.tscn" id="4_v2a86"]

[sub_resource type="ShaderMaterial" id="ShaderMaterial_32d3w"]

[sub_resource type="ShaderMaterial" id="ShaderMaterial_q8se0"]

[sub_resource type="CompressedTexture2D" id="CompressedTexture2D_oxte1"]
load_path = "res://.godot/imported/cat_90_100.png-a52ea2f9acd9f54c96efd4c7aaf50c03.ctex"

[node name="NpcDialog" type="MarginContainer"]
size_flags_horizontal = 8
size_flags_vertical = 8
Expand Down Expand Up @@ -117,7 +115,7 @@ custom_minimum_size = Vector2(90, 100)
layout_mode = 2
size_flags_horizontal = 4
size_flags_vertical = 4
texture = SubResource("CompressedTexture2D_oxte1")
texture = ExtResource("4_0gon8")
expand_mode = 3
stretch_mode = 4

Expand Down

0 comments on commit 0886b5b

Please sign in to comment.