diff --git a/main_win.gd b/main_win.gd index 07b9064e..17a4970a 100644 --- a/main_win.gd +++ b/main_win.gd @@ -9,14 +9,14 @@ extends Control # Called when the node enters the scene tree for the first time. func _ready() -> void: + Globals.add_children_to_passthrough_exception(floating_menu, [floating_menu.indicators]) + Globals.enable_mouse_passthrough() + floating_menu.start() Globals.twitcher = twitcher var res := twitcher.load_streamer_token() if res == TwitcherExtended.AuthStatus.UNAUTHORIZED: return - - Globals.add_to_passthrough_exception(floating_menu) - Globals.enable_mouse_passthrough() func _handle_twitch_auth() -> void: await twitcher.setup_streamer() diff --git a/main_win.tscn b/main_win.tscn index fb7dc967..2fc7ee48 100644 --- a/main_win.tscn +++ b/main_win.tscn @@ -5,7 +5,6 @@ [ext_resource type="Resource" uid="uid://dsde4iau3rlaw" path="res://tokens/streamer_token.tres" id="3_vhvw8"] [ext_resource type="Resource" uid="uid://jqo15d6dhmkq" path="res://tokens/chatbot_token.tres" id="4_oe8se"] [ext_resource type="Script" uid="uid://i8st3lv0lidh" path="res://addons/twitcher/twitch_service.gd" id="5_ma7y3"] -[ext_resource type="Resource" uid="uid://ry64ckbckh6m" path="res://addons/twitcher/twitch_oauth_setting.tres" id="6_u8aqo"] [ext_resource type="Resource" uid="uid://fcmfkstye4bq" path="res://addons/twitcher/auth/preset_overlay_scopes.tres" id="7_0gi5c"] [ext_resource type="Script" uid="uid://dcq1bvfrqimqq" path="res://addons/twitcher/chat/twitch_chat.gd" id="8_flv1a"] [ext_resource type="Script" uid="uid://bf3mvh373suhc" path="res://addons/twitcher/chat/twitch_bot.gd" id="9_fuqxn"] @@ -27,6 +26,15 @@ [ext_resource type="Script" uid="uid://bmluckfvgm1c2" path="res://addons/twitcher/chat/twitch_command.gd" id="24_l81bt"] [ext_resource type="PackedScene" uid="uid://bndydwe6rrb6p" path="res://UI/floating_menu.tscn" id="26_m7rpr"] +[sub_resource type="Resource" id="Resource_dr7ot"] +script = ExtResource("13_7nx26") +token_url = "https://id.twitch.tv/oauth2/token" +authorization_url = "https://id.twitch.tv/oauth2/authorize" +device_authorization_url = "https://id.twitch.tv/oauth2/device" +cache_file = "user://auth.conf" +client_id = "tlbzmtdy2itfeazyuumchynsez6pqv" +client_secret = "Y2swWvBxdJ8a5TfqUuyV8q+4EYjJv7Qy/8l1dRJcDJk=" + [sub_resource type="Resource" id="Resource_m7rpr"] script = ExtResource("14_dr7ot") @@ -42,7 +50,7 @@ device_authorization_url = "https://id.twitch.tv/oauth2/device" cache_file = "user://auth.conf" client_id = "tlbzmtdy2itfeazyuumchynsez6pqv" authorization_flow = 3 -client_secret = "I+Psn7ZIjTlehNFSoJTbk0sLL9xWqKDelHLDMcvYZwQ=" +client_secret = "Y2swWvBxdJ8a5TfqUuyV8q+4EYjJv7Qy/8l1dRJcDJk=" [node name="MainWin" type="Control" unique_id=395734301] layout_mode = 3 @@ -69,31 +77,31 @@ metadata/_custom_type_script = "uid://d003jb645nrji" [node name="Service" type="Node" parent="TwitcherExtended" unique_id=1349639042] script = ExtResource("5_ma7y3") -oauth_setting = ExtResource("6_u8aqo") +oauth_setting = SubResource("Resource_dr7ot") scopes = ExtResource("7_0gi5c") token = ExtResource("3_vhvw8") [node name="Auth" type="Node" parent="TwitcherExtended/Service" unique_id=1657722616] script = ExtResource("14_l81bt") -oauth_setting = ExtResource("6_u8aqo") +oauth_setting = SubResource("Resource_dr7ot") token = ExtResource("3_vhvw8") scopes = ExtResource("7_0gi5c") [node name="OAuth" type="Node" parent="TwitcherExtended/Service/Auth" unique_id=1285979164 node_paths=PackedStringArray("token_handler")] script = ExtResource("16_m7rpr") -oauth_setting = ExtResource("6_u8aqo") +oauth_setting = SubResource("Resource_dr7ot") scopes = ExtResource("7_0gi5c") token_handler = NodePath("../TokenHandler") [node name="TokenHandler" type="Node" parent="TwitcherExtended/Service/Auth" unique_id=176014831] script = ExtResource("17_lpeoe") -oauth_setting = ExtResource("6_u8aqo") +oauth_setting = SubResource("Resource_dr7ot") token = ExtResource("3_vhvw8") [node name="API" type="Node" parent="TwitcherExtended/Service" unique_id=1862110264] script = ExtResource("12_1ed2e") token = ExtResource("3_vhvw8") -oauth_setting = ExtResource("6_u8aqo") +oauth_setting = SubResource("Resource_dr7ot") [node name="Eventsub" type="Node" parent="TwitcherExtended/Service" unique_id=1013516914 node_paths=PackedStringArray("api")] script = ExtResource("11_1ed2e") @@ -114,7 +122,7 @@ subscribe_on_ready = false [node name="Bot" type="Node" parent="TwitcherExtended" unique_id=1052569275] script = ExtResource("9_fuqxn") -oauth_setting = ExtResource("6_u8aqo") +oauth_setting = SubResource("Resource_dr7ot") bot_token = SubResource("Resource_lpeoe") [node name="BotApi" type="Node" parent="TwitcherExtended/Bot" unique_id=357061728] @@ -142,28 +150,28 @@ token = SubResource("Resource_lpeoe") [node name="ChatbotAuth" type="Node" parent="TwitcherExtended" unique_id=1435619386] script = ExtResource("18_vifpv") token = ExtResource("4_oe8se") -oauth_setting = ExtResource("6_u8aqo") +oauth_setting = SubResource("Resource_dr7ot") [node name="ChatbotAPI" type="Node" parent="TwitcherExtended/ChatbotAuth" unique_id=1515744664] script = ExtResource("12_1ed2e") token = ExtResource("4_oe8se") -oauth_setting = ExtResource("6_u8aqo") +oauth_setting = SubResource("Resource_dr7ot") [node name="ChatbotAuth" type="Node" parent="TwitcherExtended/ChatbotAuth" unique_id=773762330] script = ExtResource("14_l81bt") -oauth_setting = ExtResource("6_u8aqo") +oauth_setting = SubResource("Resource_dr7ot") token = ExtResource("4_oe8se") scopes = ExtResource("15_dr7ot") [node name="OAuth" type="Node" parent="TwitcherExtended/ChatbotAuth/ChatbotAuth" unique_id=1565838954 node_paths=PackedStringArray("token_handler")] script = ExtResource("16_m7rpr") -oauth_setting = ExtResource("6_u8aqo") +oauth_setting = SubResource("Resource_dr7ot") scopes = ExtResource("15_dr7ot") token_handler = NodePath("../TokenHandler") [node name="TokenHandler" type="Node" parent="TwitcherExtended/ChatbotAuth/ChatbotAuth" unique_id=1460100941] script = ExtResource("17_lpeoe") -oauth_setting = ExtResource("6_u8aqo") +oauth_setting = SubResource("Resource_dr7ot") token = ExtResource("4_oe8se") [node name="CatWorld" parent="." unique_id=1301842669 instance=ExtResource("23_7nx26")] @@ -183,8 +191,8 @@ layout_mode = 0 anchors_preset = 0 anchor_left = 0.0 anchor_right = 0.0 -offset_left = 0.0 -offset_top = 0.0 -offset_right = 64.0 -offset_bottom = 64.0 +offset_left = 1357.0 +offset_top = 18.0 +offset_right = 1421.0 +offset_bottom = 82.0 grow_horizontal = 1