Merge remote-tracking branch 'origin/main'

project.godot

@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="最强导师"
-run/main_scene="uid://db2qcx61nc0q4"
+run/main_scene="uid://b0cu4fa7vohmw"
 config/features=PackedStringArray("4.5", "C#", "GL Compatibility")
 config/icon="res://icon.svg"
 
@@ -66,6 +66,12 @@ project/assembly_name="最强导师"
 version_control/plugin_name="GitPlugin"
 version_control/autoload_on_startup=true
 
+[gui]
+
+theme/default_font_antialiasing=0
+theme/default_font_subpixel_positioning=0
+theme/custom_font="uid://c7ahefyipl24t"
+
 [input]
 
 dialogic_default_action={

res_src/message_file-0.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cefbdtvinowsp"
+path="res://.godot/imported/message_file-0.png-0f5e941a643607a17e3980a728e6cc6c.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://res_src/message_file-0.png"
+dest_files=["res://.godot/imported/message_file-0.png-0f5e941a643607a17e3980a728e6cc6c.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

resources/Font/AlibabaPuHuiTi-3-65-Medium.ttf.import

@@ -2,13 +2,13 @@
 
 importer="font_data_dynamic"
 type="FontFile"
-uid="uid://dx3xrb5ewup4g"
+uid="uid://c7ahefyipl24t"
-path="res://.godot/imported/GenSenRounded2-M.ttc-a195b9e0e703b8cbfb4ade385bfdec82.fontdata"
+path="res://.godot/imported/AlibabaPuHuiTi-3-65-Medium.ttf-577467f1177fa2e4cc3ae1a95e268ad3.fontdata"
 
 [deps]
 
-source_file="res://resources/Font/GenSenRounded2-M.ttc"
+source_file="res://resources/Font/AlibabaPuHuiTi-3-65-Medium.ttf"
-dest_files=["res://.godot/imported/GenSenRounded2-M.ttc-a195b9e0e703b8cbfb4ade385bfdec82.fontdata"]
+dest_files=["res://.godot/imported/AlibabaPuHuiTi-3-65-Medium.ttf-577467f1177fa2e4cc3ae1a95e268ad3.fontdata"]
 
 [params]
 
@@ -23,9 +23,9 @@ allow_system_fallback=true
 force_autohinter=false
 modulate_color_glyphs=false
 hinting=1
-subpixel_positioning=0
+subpixel_positioning=4
 keep_rounding_remainders=true
-oversampling=1.0
+oversampling=0.0
 Fallbacks=null
 fallbacks=[]
 Compress=null

resources/Font/AlibabaPuHuiTi-3-85-Bold.ttf.import

@@ -2,13 +2,13 @@
 
 importer="font_data_dynamic"
 type="FontFile"
-uid="uid://b36k051ivdyik"
+uid="uid://b0uin14avejne"
-path="res://.godot/imported/GenSenRounded2-B.ttc-c5c1e3a0eef31233a762ef5b27f42717.fontdata"
+path="res://.godot/imported/AlibabaPuHuiTi-3-85-Bold.ttf-64186c150a80caeec153449d0a5b7f1a.fontdata"
 
 [deps]
 
-source_file="res://resources/Font/GenSenRounded2-B.ttc"
+source_file="res://resources/Font/AlibabaPuHuiTi-3-85-Bold.ttf"
-dest_files=["res://.godot/imported/GenSenRounded2-B.ttc-c5c1e3a0eef31233a762ef5b27f42717.fontdata"]
+dest_files=["res://.godot/imported/AlibabaPuHuiTi-3-85-Bold.ttf-64186c150a80caeec153449d0a5b7f1a.fontdata"]
 
 [params]
 

resources/Font/unifont-16.0.01.otf.import

@@ -1,41 +0,0 @@
-[remap]
-
-importer="font_data_dynamic"
-type="FontFile"
-uid="uid://dvhe0bgt41uk5"
-path="res://.godot/imported/unifont-16.0.01.otf-24565f95e8120912d339509ec4c9251c.fontdata"
-
-[deps]
-
-source_file="res://resources/Font/unifont-16.0.01.otf"
-dest_files=["res://.godot/imported/unifont-16.0.01.otf-24565f95e8120912d339509ec4c9251c.fontdata"]
-
-[params]
-
-Rendering=null
-antialiasing=0
-generate_mipmaps=false
-disable_embedded_bitmaps=true
-multichannel_signed_distance_field=false
-msdf_pixel_range=8
-msdf_size=48
-allow_system_fallback=true
-force_autohinter=false
-modulate_color_glyphs=false
-hinting=1
-subpixel_positioning=0
-keep_rounding_remainders=true
-oversampling=1.0
-Fallbacks=null
-fallbacks=[]
-Compress=null
-compress=true
-preload=[{
-"chars": [],
-"glyphs": [],
-"name": "新建配置",
-"size": Vector2i(16, 0)
-}]
-language_support={}
-script_support={}
-opentype_features={}

resources/Font/unifont-17.0.03.otf.import

@@ -1,36 +0,0 @@
-[remap]
-
-importer="font_data_dynamic"
-type="FontFile"
-uid="uid://1xg1ofw27hbp"
-path="res://.godot/imported/unifont-17.0.03.otf-2df8b1d999820e22329e26c7081f4dab.fontdata"
-
-[deps]
-
-source_file="res://resources/Font/unifont-17.0.03.otf"
-dest_files=["res://.godot/imported/unifont-17.0.03.otf-2df8b1d999820e22329e26c7081f4dab.fontdata"]
-
-[params]
-
-Rendering=null
-antialiasing=0
-generate_mipmaps=false
-disable_embedded_bitmaps=true
-multichannel_signed_distance_field=false
-msdf_pixel_range=8
-msdf_size=48
-allow_system_fallback=true
-force_autohinter=false
-modulate_color_glyphs=false
-hinting=1
-subpixel_positioning=0
-keep_rounding_remainders=true
-oversampling=1.0
-Fallbacks=null
-fallbacks=[]
-Compress=null
-compress=true
-preload=[]
-language_support={}
-script_support={}
-opentype_features={}

resources/Font/文泉驿点阵正黑.TTF.import

@@ -1,36 +0,0 @@
-[remap]
-
-importer="font_data_dynamic"
-type="FontFile"
-uid="uid://cexdvv8qg3x01"
-path="res://.godot/imported/文泉驿点阵正黑.TTF-5d75f2a3bb936df79dd8b419d3073790.fontdata"
-
-[deps]
-
-source_file="res://resources/Font/文泉驿点阵正黑.TTF"
-dest_files=["res://.godot/imported/文泉驿点阵正黑.TTF-5d75f2a3bb936df79dd8b419d3073790.fontdata"]
-
-[params]
-
-Rendering=null
-antialiasing=0
-generate_mipmaps=false
-disable_embedded_bitmaps=true
-multichannel_signed_distance_field=false
-msdf_pixel_range=8
-msdf_size=48
-allow_system_fallback=true
-force_autohinter=false
-modulate_color_glyphs=false
-hinting=1
-subpixel_positioning=0
-keep_rounding_remainders=true
-oversampling=1.0
-Fallbacks=null
-fallbacks=[]
-Compress=null
-compress=true
-preload=[]
-language_support={}
-script_support={}
-opentype_features={}

scenes/campus.tscn

@@ -0,0 +1,22 @@
+[gd_scene load_steps=4 format=3 uid="uid://b0cu4fa7vohmw"]
+
+[ext_resource type="PackedScene" uid="uid://cf6b1t8pujosf" path="res://scenes/ui-elements/log_panel.tscn" id="1_hi2p7"]
+[ext_resource type="PackedScene" uid="uid://db2qcx61nc0q4" path="res://scenes/ui-elements/top-bar.tscn" id="2_p4tmp"]
+[ext_resource type="PackedScene" uid="uid://drmjsqoy8htc8" path="res://scenes/ui-elements/task_list.tscn" id="3_4gjr3"]
+
+[node name="Node2D" type="Node2D"]
+
+[node name="PanelContainer2" parent="." instance=ExtResource("1_hi2p7")]
+offset_left = 655.0
+offset_top = 375.0
+offset_right = 955.0
+offset_bottom = 535.0
+
+[node name="TopBar" parent="." instance=ExtResource("2_p4tmp")]
+offset_bottom = 55.0
+
+[node name="PanelContainer" parent="." instance=ExtResource("3_4gjr3")]
+offset_left = 5.0
+offset_top = 120.0
+offset_right = 356.0
+offset_bottom = 460.0

scenes/log_panel.tscn

@@ -1,128 +0,0 @@
-[gd_scene load_steps=12 format=3 uid="uid://cf6b1t8pujosf"]
-
-[ext_resource type="Texture2D" uid="uid://dskyby1ou2spq" path="res://res_src/transparent-8px.png" id="1_4tp53"]
-[ext_resource type="Texture2D" uid="uid://bilmun5leavcp" path="res://res_src/scroll-bar-bg.png" id="2_t4qyh"]
-[ext_resource type="FontFile" uid="uid://1xg1ofw27hbp" path="res://resources/Font/unifont-17.0.03.otf" id="3_lalyk"]
-[ext_resource type="FontFile" uid="uid://cexdvv8qg3x01" path="res://resources/Font/文泉驿点阵正黑.TTF" id="4_sj1p0"]
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_iyx0m"]
-bg_color = Color(0.296, 0.54800004, 0.8, 1)
-border_width_left = 1
-border_width_right = 1
-border_color = Color(0.8, 0.8, 0.8, 0)
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_bl13t"]
-bg_color = Color(0.48000002, 0.64000005, 0.8, 1)
-border_width_left = 1
-border_width_right = 1
-border_color = Color(0.8, 0.8, 0.8, 0)
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_74lek"]
-bg_color = Color(0.9, 0.9, 0.9, 1)
-border_width_left = 1
-border_width_right = 1
-border_color = Color(0.8, 0.8, 0.8, 0)
-
-[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_bl13t"]
-texture = ExtResource("2_t4qyh")
-texture_margin_left = 2.0
-texture_margin_top = 2.0
-texture_margin_right = 2.0
-texture_margin_bottom = 2.0
-axis_stretch_horizontal = 1
-axis_stretch_vertical = 1
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_j5jx5"]
-content_margin_left = 4.0
-content_margin_top = 4.0
-content_margin_right = 4.0
-content_margin_bottom = 4.0
-bg_color = Color(1, 1, 1, 0.75)
-draw_center = false
-border_width_left = 2
-border_width_top = 2
-border_width_right = 2
-border_width_bottom = 2
-corner_radius_top_left = 3
-corner_radius_top_right = 3
-corner_radius_bottom_right = 3
-corner_radius_bottom_left = 3
-corner_detail = 5
-expand_margin_left = 2.0
-expand_margin_top = 2.0
-expand_margin_right = 2.0
-expand_margin_bottom = 2.0
-
-[sub_resource type="Theme" id="Theme_ij1v8"]
-default_font = ExtResource("3_lalyk")
-default_font_size = 12
-VScrollBar/icons/decrement = ExtResource("1_4tp53")
-VScrollBar/icons/increment = ExtResource("1_4tp53")
-VScrollBar/styles/grabber = SubResource("StyleBoxFlat_iyx0m")
-VScrollBar/styles/grabber_highlight = SubResource("StyleBoxFlat_bl13t")
-VScrollBar/styles/grabber_pressed = SubResource("StyleBoxFlat_74lek")
-VScrollBar/styles/scroll = SubResource("StyleBoxTexture_bl13t")
-VScrollBar/styles/scroll_focus = SubResource("StyleBoxFlat_j5jx5")
-
-[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_lpvoh"]
-content_margin_left = 3.0
-content_margin_top = 3.0
-content_margin_right = 3.0
-content_margin_bottom = 3.0
-bg_color = Color(0.2, 0.36862746, 0.53333336, 1)
-border_width_left = 1
-border_width_top = 1
-border_width_right = 1
-border_width_bottom = 1
-border_color = Color(0, 0, 0, 1)
-corner_radius_top_left = 4
-corner_radius_top_right = 4
-corner_radius_bottom_right = 4
-corner_radius_bottom_left = 4
-anti_aliasing = false
-
-[node name="Node2D" type="Control"]
-layout_mode = 3
-anchors_preset = 0
-
-[node name="ScrollContainer" type="ScrollContainer" parent="."]
-layout_mode = 0
-offset_right = 170.0
-offset_bottom = 108.0
-theme = SubResource("Theme_ij1v8")
-theme_override_styles/panel = SubResource("StyleBoxFlat_lpvoh")
-draw_focus_border = true
-horizontal_scroll_mode = 0
-
-[node name="VBoxContainer" type="VBoxContainer" parent="ScrollContainer"]
-layout_mode = 2
-
-[node name="Button" type="Button" parent="ScrollContainer/VBoxContainer"]
-layout_mode = 2
-text = "ASCV发送给对"
-
-[node name="Button2" type="Button" parent="ScrollContainer/VBoxContainer"]
-layout_mode = 2
-theme_override_fonts/font = ExtResource("4_sj1p0")
-theme_override_font_sizes/font_size = 12
-text = "ASCV发送给对"
-
-[node name="Button3" type="Button" parent="ScrollContainer/VBoxContainer"]
-layout_mode = 2
-text = "ASCV发送给对"
-
-[node name="Button4" type="Button" parent="ScrollContainer/VBoxContainer"]
-layout_mode = 2
-text = "ASCV发送给对"
-
-[node name="Button5" type="Button" parent="ScrollContainer/VBoxContainer"]
-layout_mode = 2
-text = "ASCV发送给对"
-
-[node name="Button6" type="Button" parent="ScrollContainer/VBoxContainer"]
-layout_mode = 2
-text = "ASCV发送给对"
-
-[node name="Button7" type="Button" parent="ScrollContainer/VBoxContainer"]
-layout_mode = 2
-text = "ASCV发送给对"

scenes/ui-elements/TaskInfoItem.cs

@@ -0,0 +1,34 @@
+using Godot;
+using System;
+
+public partial class TaskInfoItem : PanelContainer
+{
+	[Export]
+	public Texture2D Icon {get; set;}
+	
+	[Export]
+	public string LabelText {get; set;}
+	
+	[Export]
+	public float Progress {get; set;}
+	
+	public Guid Id {get; set;}
+	
+	private TextureRect _tr;
+	private Label _lbl;
+	private ProgressBar _pb;
+	private Button _btn;
+	
+	// Called when the node enters the scene tree for the first time.
+	public override void _Ready() {
+		_tr = GetNode<TextureRect>("H1/TextureRect");
+		_lbl = GetNode<Label>("H1/V1/H2/Label");
+		_pb = GetNode<ProgressBar>("H1/V1/ProgressBar");
+		_btn = GetNode<Button>("H1/CC/Button");
+	}
+
+	// Called every frame. 'delta' is the elapsed time since the previous frame.
+	public override void _Process(double delta)
+	{
+	}
+}

scenes/ui-elements/TaskInfoItem.cs.uid

@@ -0,0 +1 @@
+uid://c0il3my2egqm8

scenes/ui-elements/TopBar.cs

@@ -2,17 +2,17 @@ using Godot;
 
 public partial class TopBar : PanelContainer
 {
-    private ProgressBar _progressBar;
+	private ProgressBar _progressBar;
 
-    // Called when the node enters the scene tree for the first time.
+	// Called when the node enters the scene tree for the first time.
-    public override void _Ready()
+	public override void _Ready()
-    {
+	{
-        _progressBar = GetNode<ProgressBar>("HBox/YearProgress/ProgressBar");
+		_progressBar = GetNode<ProgressBar>("HBox/YearProgress/ProgressBar");
-    }
+	}
 
-    // Called every frame. 'delta' is the elapsed time since the previous frame.
+	// Called every frame. 'delta' is the elapsed time since the previous frame.
-    public override void _Process(double delta)
+	public override void _Process(double delta)
-    {
+	{
-        _progressBar.Value = (_progressBar.Value + 1) % _progressBar.MaxValue;
+		_progressBar.Value = (_progressBar.Value + 1) % _progressBar.MaxValue;
-    }
+	}
-}
+}

scenes/ui-elements/info-block.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=5 format=3 uid="uid://bewpqkap6epnb"]
+[gd_scene load_steps=6 format=3 uid="uid://bewpqkap6epnb"]
 
-[ext_resource type="FontFile" uid="uid://b36k051ivdyik" path="res://resources/Font/GenSenRounded2-B.ttc" id="1_imdlh"]
+[ext_resource type="FontFile" uid="uid://c7ahefyipl24t" path="res://resources/Font/AlibabaPuHuiTi-3-65-Medium.ttf" id="1_imdlh"]
 [ext_resource type="Script" uid="uid://5r7vda2lcjsk" path="res://scenes/ui-elements/InfoBlock.cs" id="1_joheo"]
 [ext_resource type="Texture2D" uid="uid://dge24fqftcpc0" path="res://resources/UI/cash_dollars.png" id="2_1m205"]
+[ext_resource type="FontFile" uid="uid://b0uin14avejne" path="res://resources/Font/AlibabaPuHuiTi-3-85-Bold.ttf" id="2_hmyfu"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_imdlh"]
 content_margin_left = 5.0
@@ -25,12 +26,12 @@ script = ExtResource("1_joheo")
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
 layout_mode = 2
-theme_override_constants/separation = 5
+theme_override_constants/separation = 0
 
 [node name="DisplayLabel" type="Label" parent="VBoxContainer"]
 layout_mode = 2
-theme_override_fonts/font = ExtResource("1_imdlh")
+theme_override_fonts/font = ExtResource("2_hmyfu")
-theme_override_font_sizes/font_size = 12
+theme_override_font_sizes/font_size = 14
 text = "资金："
 
 [node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]

scenes/ui-elements/log_panel.tscn

@@ -0,0 +1,74 @@
+[gd_scene load_steps=4 format=3 uid="uid://cf6b1t8pujosf"]
+
+[ext_resource type="FontFile" uid="uid://b0uin14avejne" path="res://resources/Font/AlibabaPuHuiTi-3-85-Bold.ttf" id="1_2il5h"]
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6243c"]
+content_margin_left = 3.0
+content_margin_top = 3.0
+content_margin_right = 3.0
+content_margin_bottom = 3.0
+bg_color = Color(0.2, 0.36862746, 0.53333336, 1)
+border_width_left = 1
+border_width_top = 1
+border_width_right = 1
+border_width_bottom = 1
+border_color = Color(0, 0, 0, 1)
+corner_radius_top_left = 4
+corner_radius_top_right = 4
+corner_radius_bottom_right = 4
+corner_radius_bottom_left = 4
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_02kya"]
+content_margin_top = 2.0
+content_margin_bottom = 4.0
+bg_color = Color(0.13725491, 0.20784314, 0.27058825, 1)
+corner_radius_top_left = 4
+corner_radius_top_right = 4
+corner_radius_bottom_right = 4
+corner_radius_bottom_left = 4
+
+[node name="PanelContainer" type="PanelContainer"]
+custom_minimum_size = Vector2(300, 0)
+anchors_preset = 3
+anchor_left = 1.0
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = -300.0
+offset_top = -160.0
+grow_horizontal = 0
+grow_vertical = 0
+theme_override_styles/panel = SubResource("StyleBoxFlat_6243c")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="VBoxContainer"]
+layout_mode = 2
+theme_override_fonts/font = ExtResource("1_2il5h")
+theme_override_styles/normal = SubResource("StyleBoxFlat_02kya")
+text = "日志"
+horizontal_alignment = 1
+vertical_alignment = 2
+
+[node name="RichTextLabel" type="RichTextLabel" parent="VBoxContainer"]
+custom_minimum_size = Vector2(0, 120)
+layout_mode = 2
+theme_override_fonts/bold_font = ExtResource("1_2il5h")
+theme_override_font_sizes/normal_font_size = 14
+theme_override_font_sizes/bold_font_size = 14
+bbcode_enabled = true
+text = "fgafgadf阿斯 [b]顿发[/b] 射[color=yellow] 点发 [/color]射点dasdasdasdasd
+asdasdasdasd faj kldaj;sdl阿里雕刻技法螺丝钉咖啡碱埃里克的激发u
+
+却颇为i入侵外婆欸日u破
+vi不七二TV重新补哦譬如疯狂减肥给v抛弃人怕丢吧v胁迫和v瓦片人体u拼凑看v就视频丢人提前批微软计划怕多次uv阿婆欸无人机颇为u视频多次v就安排送地方剧情片微软就怕是从i
+据艾普斯如强迫沃尔克就拍照发到i就阿婆i额u人怕的空间帕萨迪覅u安排
+送地方就安排我欸人奇葩的
+可加分安排史蒂夫安排为偶
+然卡的泡咖啡静安王鹏飞"
+scroll_following = true
+autowrap_mode = 1
+shortcut_keys_enabled = false
+threaded = true
+progress_bar_delay = 500

scenes/ui-elements/task_info_item.tscn

@@ -0,0 +1,127 @@
+[gd_scene load_steps=9 format=3 uid="uid://be878nlt2ev0j"]
+
+[ext_resource type="Script" uid="uid://c0il3my2egqm8" path="res://scenes/ui-elements/TaskInfoItem.cs" id="1_8s2w1"]
+[ext_resource type="Texture2D" uid="uid://cefbdtvinowsp" path="res://res_src/message_file-0.png" id="1_w5erq"]
+[ext_resource type="FontFile" uid="uid://c7ahefyipl24t" path="res://resources/Font/AlibabaPuHuiTi-3-65-Medium.ttf" id="2_8s2w1"]
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7cj6f"]
+content_margin_left = 5.0
+content_margin_right = 8.0
+bg_color = Color(0.93333334, 0.93333334, 0.93333334, 1)
+border_width_left = 1
+border_width_top = 1
+border_width_right = 1
+border_width_bottom = 1
+border_color = Color(0, 0, 0, 1)
+corner_radius_top_left = 3
+corner_radius_top_right = 3
+corner_radius_bottom_right = 3
+corner_radius_bottom_left = 3
+shadow_size = 2
+shadow_offset = Vector2(1, 1)
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_aaq5d"]
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_w5erq"]
+content_margin_left = 1.0
+content_margin_top = 1.0
+content_margin_right = 1.0
+content_margin_bottom = 1.0
+bg_color = Color(0.16470589, 0.23137255, 0.3019608, 1)
+border_width_left = 1
+border_width_top = 1
+border_width_right = 1
+border_width_bottom = 1
+border_color = Color(0, 0, 0, 1)
+corner_radius_top_left = 2
+corner_radius_top_right = 2
+corner_radius_bottom_right = 2
+corner_radius_bottom_left = 2
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_8s2w1"]
+bg_color = Color(0.8039216, 0.827451, 0.8392157, 1)
+border_width_left = 1
+border_width_top = 1
+border_width_right = 1
+border_width_bottom = 1
+border_color = Color(0.8, 0.8, 0.8, 0)
+corner_radius_top_left = 2
+corner_radius_top_right = 2
+corner_radius_bottom_right = 2
+corner_radius_bottom_left = 2
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_h34y6"]
+content_margin_left = 5.0
+content_margin_top = 5.0
+content_margin_right = 5.0
+content_margin_bottom = 5.0
+bg_color = Color(0.6, 0.6, 0.6, 0)
+border_width_left = 1
+border_width_top = 1
+border_width_right = 1
+border_width_bottom = 1
+border_color = Color(0, 0, 0, 1)
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
+[node name="TaskInfoItem" type="PanelContainer"]
+custom_minimum_size = Vector2(320, 50)
+offset_right = 307.0
+offset_bottom = 50.0
+size_flags_horizontal = 0
+theme_override_styles/panel = SubResource("StyleBoxFlat_7cj6f")
+script = ExtResource("1_8s2w1")
+
+[node name="H1" type="HBoxContainer" parent="."]
+layout_mode = 2
+
+[node name="TextureRect" type="TextureRect" parent="H1"]
+layout_mode = 2
+texture = ExtResource("1_w5erq")
+stretch_mode = 3
+
+[node name="Panel2" type="Panel" parent="H1"]
+custom_minimum_size = Vector2(5, 0)
+layout_mode = 2
+theme_override_styles/panel = SubResource("StyleBoxEmpty_aaq5d")
+
+[node name="V1" type="VBoxContainer" parent="H1"]
+layout_mode = 2
+alignment = 1
+
+[node name="H2" type="HBoxContainer" parent="H1/V1"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="H1/V1/H2"]
+layout_mode = 2
+theme_override_colors/font_color = Color(0, 0, 0, 1)
+theme_override_fonts/font = ExtResource("2_8s2w1")
+theme_override_font_sizes/font_size = 14
+text = "A  类期刊 - 001 (50%)"
+
+[node name="ProgressBar" type="ProgressBar" parent="H1/V1"]
+custom_minimum_size = Vector2(200, 12)
+layout_mode = 2
+theme_override_styles/background = SubResource("StyleBoxFlat_w5erq")
+theme_override_styles/fill = SubResource("StyleBoxFlat_8s2w1")
+value = 50.0
+show_percentage = false
+
+[node name="Panel" type="Panel" parent="H1"]
+custom_minimum_size = Vector2(10, 0)
+layout_mode = 2
+size_flags_horizontal = 3
+theme_override_styles/panel = SubResource("StyleBoxEmpty_aaq5d")
+
+[node name="CC" type="CenterContainer" parent="H1"]
+layout_mode = 2
+
+[node name="Button" type="Button" parent="H1/CC"]
+layout_mode = 2
+theme_override_colors/font_color = Color(0.06666667, 0.06666667, 0.06666667, 1)
+theme_override_fonts/font = ExtResource("2_8s2w1")
+theme_override_font_sizes/font_size = 16
+theme_override_styles/normal = SubResource("StyleBoxFlat_h34y6")
+text = "详情"

scenes/ui-elements/task_list.tscn

@@ -0,0 +1,81 @@
+[gd_scene load_steps=5 format=3 uid="uid://drmjsqoy8htc8"]
+
+[ext_resource type="FontFile" uid="uid://b0uin14avejne" path="res://resources/Font/AlibabaPuHuiTi-3-85-Bold.ttf" id="1_t2anq"]
+[ext_resource type="PackedScene" uid="uid://be878nlt2ev0j" path="res://scenes/ui-elements/task_info_item.tscn" id="2_t2anq"]
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_6243c"]
+content_margin_left = 3.0
+content_margin_top = 3.0
+content_margin_right = 3.0
+content_margin_bottom = 3.0
+bg_color = Color(0.2, 0.36862746, 0.53333336, 1)
+border_width_left = 1
+border_width_top = 1
+border_width_right = 1
+border_width_bottom = 1
+border_color = Color(0, 0, 0, 1)
+corner_radius_top_left = 4
+corner_radius_top_right = 4
+corner_radius_bottom_right = 4
+corner_radius_bottom_left = 4
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_02kya"]
+content_margin_top = 2.0
+content_margin_bottom = 4.0
+bg_color = Color(0.13725491, 0.20784314, 0.27058825, 1)
+corner_radius_top_left = 4
+corner_radius_top_right = 4
+corner_radius_bottom_right = 4
+corner_radius_bottom_left = 4
+
+[node name="PanelContainer" type="PanelContainer"]
+custom_minimum_size = Vector2(300, 0)
+offset_right = 128.0
+offset_bottom = 161.0
+theme_override_styles/panel = SubResource("StyleBoxFlat_6243c")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="."]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="VBoxContainer"]
+layout_mode = 2
+theme_override_fonts/font = ExtResource("1_t2anq")
+theme_override_styles/normal = SubResource("StyleBoxFlat_02kya")
+text = "任务"
+horizontal_alignment = 1
+vertical_alignment = 2
+
+[node name="ScrollContainer" type="ScrollContainer" parent="VBoxContainer"]
+custom_minimum_size = Vector2(345, 300)
+layout_mode = 2
+size_flags_vertical = 3
+draw_focus_border = true
+horizontal_scroll_mode = 0
+
+[node name="VBoxContainer" type="VBoxContainer" parent="VBoxContainer/ScrollContainer"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="TaskInfoItem6" parent="VBoxContainer/ScrollContainer/VBoxContainer" instance=ExtResource("2_t2anq")]
+layout_mode = 2
+
+[node name="TaskInfoItem3" parent="VBoxContainer/ScrollContainer/VBoxContainer" instance=ExtResource("2_t2anq")]
+layout_mode = 2
+
+[node name="TaskInfoItem2" parent="VBoxContainer/ScrollContainer/VBoxContainer" instance=ExtResource("2_t2anq")]
+layout_mode = 2
+
+[node name="TaskInfoItem4" parent="VBoxContainer/ScrollContainer/VBoxContainer" instance=ExtResource("2_t2anq")]
+layout_mode = 2
+
+[node name="TaskInfoItem" parent="VBoxContainer/ScrollContainer/VBoxContainer" instance=ExtResource("2_t2anq")]
+layout_mode = 2
+
+[node name="TaskInfoItem5" parent="VBoxContainer/ScrollContainer/VBoxContainer" instance=ExtResource("2_t2anq")]
+layout_mode = 2
+
+[node name="TaskInfoItem7" parent="VBoxContainer/ScrollContainer/VBoxContainer" instance=ExtResource("2_t2anq")]
+layout_mode = 2
+
+[node name="TaskInfoItem8" parent="VBoxContainer/ScrollContainer/VBoxContainer" instance=ExtResource("2_t2anq")]
+layout_mode = 2

scenes/ui-elements/top-bar.tscn

@@ -5,7 +5,7 @@
 [ext_resource type="Texture2D" uid="uid://dge24fqftcpc0" path="res://resources/UI/cash_dollars.png" id="2_krusb"]
 [ext_resource type="Texture2D" uid="uid://brmchgisek2vy" path="res://res_src/fame_icon.png" id="3_udeu6"]
 [ext_resource type="Texture2D" uid="uid://qaitnvq4d877" path="res://resources/UI/chip_ramdrive-1.png" id="4_udeu6"]
-[ext_resource type="FontFile" uid="uid://dx3xrb5ewup4g" path="res://resources/Font/GenSenRounded2-M.ttc" id="5_m47h2"]
+[ext_resource type="FontFile" uid="uid://c7ahefyipl24t" path="res://resources/Font/AlibabaPuHuiTi-3-65-Medium.ttf" id="5_m47h2"]
 [ext_resource type="Texture2D" uid="uid://bfy4l227neg3u" path="res://res_src/button-normal.png" id="6_g1dje"]
 [ext_resource type="Texture2D" uid="uid://bcl5e8ai5ugj7" path="res://res_src/button-press.png" id="7_whltx"]
 [ext_resource type="Texture2D" uid="uid://b73wqk6nf3gtd" path="res://res_src/button-hover.png" id="8_whltx"]
@@ -125,7 +125,7 @@ value = 50.0
 show_percentage = false
 
 [node name="Padding4" type="Panel" parent="HBox"]
-custom_minimum_size = Vector2(250, 0)
+custom_minimum_size = Vector2(225, 0)
 layout_mode = 2
 size_flags_horizontal = 3
 theme_override_styles/panel = SubResource("StyleBoxEmpty_0ntnr")
@@ -153,10 +153,32 @@ layout_mode = 2
 size_flags_horizontal = 3
 theme_override_styles/panel = SubResource("StyleBoxEmpty_0ntnr")
 
-[node name="CenterContainer" type="CenterContainer" parent="HBox"]
+[node name="CC1" type="CenterContainer" parent="HBox"]
 layout_mode = 2
 
-[node name="Button" type="Button" parent="HBox/CenterContainer"]
+[node name="TaskToggle" type="Button" parent="HBox/CC1"]
+layout_mode = 2
+theme_override_fonts/font = ExtResource("5_m47h2")
+theme_override_styles/normal = SubResource("StyleBoxTexture_jyumt")
+theme_override_styles/pressed = SubResource("StyleBoxTexture_rqfvc")
+theme_override_styles/hover = SubResource("StyleBoxTexture_0ntnr")
+text = "任务"
+
+[node name="CC2" type="CenterContainer" parent="HBox"]
+layout_mode = 2
+
+[node name="LogToggle" type="Button" parent="HBox/CC2"]
+layout_mode = 2
+theme_override_fonts/font = ExtResource("5_m47h2")
+theme_override_styles/normal = SubResource("StyleBoxTexture_jyumt")
+theme_override_styles/pressed = SubResource("StyleBoxTexture_rqfvc")
+theme_override_styles/hover = SubResource("StyleBoxTexture_0ntnr")
+text = "日志"
+
+[node name="CC3" type="CenterContainer" parent="HBox"]
+layout_mode = 2
+
+[node name="SettingBtn" type="Button" parent="HBox/CC3"]
 layout_mode = 2
 theme_override_fonts/font = ExtResource("5_m47h2")
 theme_override_styles/normal = SubResource("StyleBoxTexture_jyumt")
@@ -165,6 +187,6 @@ theme_override_styles/hover = SubResource("StyleBoxTexture_0ntnr")
 text = "设置"
 
 [node name="Padding3" type="Panel" parent="HBox"]
-custom_minimum_size = Vector2(30, 0)
+custom_minimum_size = Vector2(10, 0)
 layout_mode = 2
 theme_override_styles/panel = SubResource("StyleBoxEmpty_0ntnr")