bmq/xiandie
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

Merge remote-tracking branch 'origin/demo'

Browse Source
This commit is contained in:
cakipaul 2025-07-30 19:15:41 +08:00
commit 0e1007fd49
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/ux/prop_inspector.gd
View File

@ -10,7 +10,6 @@ enum {
signal quit_and_hidden signal quit_and_hidden
@onready var mouse_mask = %MouseMask as Control @onready var mouse_mask = %MouseMask as Control
@onready var notes_bg = %NotesBG as TextureRect @onready var notes_bg = %NotesBG as TextureRect
@onready var prop_bg = %PropBG as TextureRect @onready var prop_bg = %PropBG as TextureRect
@ -59,6 +58,7 @@ func _hide():
quit_and_hidden.emit() quit_and_hidden.emit()
hiding_tween = create_tween() hiding_tween = create_tween()
hiding_tween.parallel().tween_property(full_texture, "modulate:a", 0.0, 0.3) hiding_tween.parallel().tween_property(full_texture, "modulate:a", 0.0, 0.3)
hiding_tween.parallel().tween_property(prop_bg, "modulate:a", 0.0, 0.3)
hiding_tween.parallel().tween_property(content_label, "modulate:a", 0.0, 0.15) hiding_tween.parallel().tween_property(content_label, "modulate:a", 0.0, 0.15)
if blinking_tween and blinking_tween.is_running(): if blinking_tween and blinking_tween.is_running():
blinking_tween.kill() blinking_tween.kill()
@ -71,7 +71,6 @@ func _post_hide():
quit_and_hidden.emit() quit_and_hidden.emit()
scroll_container.mouse_filter = Control.MOUSE_FILTER_IGNORE scroll_container.mouse_filter = Control.MOUSE_FILTER_IGNORE
locking = false locking = false
prop_bg.visible = false
full_texture.texture = null full_texture.texture = null
texture_cover = null texture_cover = null
texture_notes = null texture_notes = null
@ -155,9 +154,9 @@ func pop_prop_inspection(
status = STATUS_INSPECTING_PROP status = STATUS_INSPECTING_PROP
visible = true visible = true
var tween = create_tween() var tween = create_tween()
prop_bg.visible = true
full_texture.texture = cover_texture full_texture.texture = cover_texture
tween.tween_property(full_texture, "modulate:a", 1.0, 0.15) tween.tween_property(full_texture, "modulate:a", 1.0, 0.15)
tween.parallel().tween_property(prop_bg, "modulate:a", 1.0, 0.15)
content_label.text = "" content_label.text = ""
tip_label.text = "" tip_label.text = ""

1
scene/ux/prop_inspector.tscn
View File

@ -24,7 +24,6 @@ mouse_filter = 2
[node name="PropBG" type="TextureRect" parent="."] [node name="PropBG" type="TextureRect" parent="."]
unique_name_in_owner = true unique_name_in_owner = true
visible = false
anchors_preset = 14 anchors_preset = 14
anchor_top = 0.5 anchor_top = 0.5
anchor_right = 1.0 anchor_right = 1.0