diff --git a/cmi2/scenes/CharacterSelection.tscn b/cmi2/scenes/CharacterSelection.tscn index 9270488be2f0b1a23d2ce7df5729e361bd9c28e6..75d0c2500630b7e9f39a0cbb5640905e2e179423 100644 --- a/cmi2/scenes/CharacterSelection.tscn +++ b/cmi2/scenes/CharacterSelection.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=24 format=2] +[gd_scene load_steps=25 format=2] [ext_resource path="res://scenes/characterSelection.gd" type="Script" id=1] [ext_resource path="res://assets/allPage/fondmain.png" type="Texture" id=2] @@ -18,6 +18,7 @@ [ext_resource path="res://assets/selectChar/lullaby.png" type="Texture" id=16] [ext_resource path="res://assets/selectChar/charPic.jpg" type="Texture" id=17] [ext_resource path="res://assets/mainMenu/letsplay.png" type="Texture" id=18] +[ext_resource path="res://scenes/buttonHover.gd" type="Script" id=19] [sub_resource type="AnimatedTexture" id=1] @@ -127,6 +128,7 @@ margin_right = 80.0 margin_bottom = 65.0 grow_horizontal = 0 rect_min_size = Vector2( 80, 65 ) +mouse_default_cursor_shape = 2 size_flags_vertical = 3 size_flags_stretch_ratio = 0.2 texture_normal = ExtResource( 6 ) @@ -161,6 +163,7 @@ margin_left = 904.0 margin_right = 984.0 margin_bottom = 65.0 rect_min_size = Vector2( 80, 65 ) +mouse_default_cursor_shape = 2 size_flags_horizontal = 9 size_flags_vertical = 3 size_flags_stretch_ratio = 0.3 @@ -462,11 +465,16 @@ margin_top = 20.0 margin_right = 382.0 margin_bottom = 140.0 rect_min_size = Vector2( 302, 120 ) +rect_pivot_offset = Vector2( 158.471, 63.3141 ) +mouse_default_cursor_shape = 2 size_flags_horizontal = 3 size_flags_vertical = 3 texture_normal = ExtResource( 18 ) expand = true stretch_mode = 5 +script = ExtResource( 19 ) + +[node name="Tween" type="Tween" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/buttonPlayMargin/playButton"] [node name="ouibon" type="Button" parent="MarginContainer/VBoxContainer/marginSelectContainer/container/selection/charListContainer/buttonPlayMargin"] visible = false diff --git a/cmi2/scenes/Settings.tscn b/cmi2/scenes/Settings.tscn index 80c847cf209f3612cb361996057d52ee1c478563..076b1a8cad0d442052b62b83d30d3b08fbf35132 100644 --- a/cmi2/scenes/Settings.tscn +++ b/cmi2/scenes/Settings.tscn @@ -106,7 +106,6 @@ margin_bottom = 600.0 custom_constants/separation = 120 [node name="header" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer"] -editor/display_folded = true margin_right = 1024.0 size_flags_horizontal = 11 custom_constants/separation = 0 @@ -124,7 +123,6 @@ expand = true stretch_mode = 1 [node name="headerContainer" type="MarginContainer" parent="SettingsFullWindow/VBoxContainer/header/Control"] -editor/display_folded = true anchor_right = 1.0 anchor_bottom = 1.0 size_flags_horizontal = 3 @@ -135,7 +133,6 @@ custom_constants/margin_left = 20 custom_constants/margin_bottom = 20 [node name="HBoxContainer" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/header/Control/headerContainer"] -editor/display_folded = true margin_left = 20.0 margin_top = 20.0 margin_right = 1004.0 @@ -147,6 +144,7 @@ margin_right = 80.0 margin_bottom = 65.0 grow_horizontal = 0 rect_min_size = Vector2( 80, 65 ) +mouse_default_cursor_shape = 2 size_flags_vertical = 3 size_flags_stretch_ratio = 0.2 texture_normal = ExtResource( 3 ) @@ -202,7 +200,6 @@ custom_constants/margin_left = 20 custom_constants/margin_bottom = 20 [node name="old" type="HBoxContainer" parent="SettingsFullWindow/VBoxContainer/main"] -editor/display_folded = true visible = false margin_left = 20.0 margin_top = 20.0 @@ -245,9 +242,11 @@ theme = ExtResource( 8 ) anchor_right = 1.0 anchor_bottom = 1.0 size_flags_vertical = 3 +__meta__ = { +"_edit_use_anchors_": false +} [node name="listButton" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideMenu/VBoxContainer"] -editor/display_folded = true margin_right = 181.0 margin_bottom = 390.0 size_flags_horizontal = 3 @@ -331,13 +330,11 @@ size_flags_horizontal = 3 size_flags_vertical = 3 [node name="listMenu" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer"] -editor/display_folded = true margin_right = 720.0 margin_bottom = 310.0 size_flags_horizontal = 3 [node name="son" type="VBoxContainer" parent="SettingsFullWindow/VBoxContainer/main/settingsContainer/AsideDetails/MarginContainer/content/scrollContainer/HBoxContainer/listMenu"] -editor/display_folded = true margin_right = 720.0 margin_bottom = 310.0 size_flags_vertical = 3