Nattiden 1 anno fa
parent
commit
30636cdf27

+ 1 - 1
Project/libraries/Homepage/Light/LightFooter.xaml

@@ -1,4 +1,4 @@
-<local:MyCard Margin="0,2,0,14">
+<local:MyCard Margin="0,2,0,10">
 <Grid Margin="10,6">
     <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="-4,0,0,0">
     <local:MyIconTextButton HorizontalAlignment="Left" Text="${@Global|git.commit.id}" ToolTip="当前 Commit 版本" EventType="打开网页"

+ 1 - 1
Project/libraries/Homepage/Light/LightHeader.xaml

@@ -1,7 +1,7 @@
 <local:MyCard Margin="0,0,0,2">
   <Grid Margin="14,10">
     <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left">
-        <TextBlock FontSize="14" Opacity="0.7"><Bold>新闻主页</Bold></TextBlock>
+        <TextBlock FontSize="14" Opacity="0.7"><Bold>${header-title|新闻主页}</Bold></TextBlock>
     </StackPanel>
   </Grid>
 </local:MyCard>

+ 6 - 7
Project/libraries/Homepage/NewFooter.xaml

@@ -1,7 +1,7 @@
-<local:MyCard Margin="0,10,0,14">
-<Border BorderBrush="{DynamicResource ColorBrush2}" Margin="-0.6" CornerRadius="5" BorderThickness="0,0,0,10">
+<local:MyCard Margin="0,5,0,14">
+<Border BorderBrush="{DynamicResource ColorBrush2}" Margin="-0.6" CornerRadius="5" BorderThickness="0,0,0,8">
 <StackPanel>
-  <Grid Margin="26,20,20,2">
+  <Grid Margin="20,18,20,4">
     <StackPanel>
     <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,0,4">
     <TextBlock FontSize="18" Foreground="{DynamicResource ColorBrush2}"><Bold>PCL2 新闻主页</Bold></TextBlock>
@@ -9,12 +9,11 @@
     EventData="https://github.com/Light-Beacon/PCL2-NewsHomepage/tree/${@Global|git.commit.hash}"
     LogoScale="1.1" Logo="M11.93 8.5a4.002 4.002 0 0 1-7.86 0H.75a.75.75 0 0 1 0-1.5h3.32a4.002 4.002 0 0 1 7.86 0h3.32a.75.75 0 0 1 0 1.5Zm-1.43-.75a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z" />
     </StackPanel>
-    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="-4,0,0,10" Height="56">
+    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="-4,0,0,10" Height="46">
     <Image Margin="2" Source="https://image.stapxs.cn/i/2024/05/24/LB.png"/>
-    <Image Margin="2" Source="https://image.stapxs.cn/i/2024/05/24/PHB_2.png
-" />
+    <Image Margin="2" Source="https://image.stapxs.cn/i/2024/05/24/PHB_2.png"/>
     </StackPanel>
-    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="-8,0,0,10">
+    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="-8,0,0,2">
     <local:MyIconTextButton HorizontalAlignment="Left" Text="GitHub" ToolTip="前往新闻主页 GitHub 页面" EventType="打开网页"
     EventData="https://github.com/Light-Beacon/PCL2-NewsHomepage"
     LogoScale="1" Logo="M512 42.666667A464.64 464.64 0 0 0 42.666667 502.186667 460.373333 460.373333 0 0 0 363.52 938.666667c23.466667 4.266667 32-9.813333 32-22.186667v-78.08c-130.56 27.733333-158.293333-61.44-158.293333-61.44a122.026667 122.026667 0 0 0-52.053334-67.413333c-42.666667-28.16 3.413333-27.733333 3.413334-27.733334a98.56 98.56 0 0 1 71.68 47.36 101.12 101.12 0 0 0 136.533333 37.973334 99.413333 99.413333 0 0 1 29.866667-61.44c-104.106667-11.52-213.333333-50.773333-213.333334-226.986667a177.066667 177.066667 0 0 1 47.36-124.16 161.28 161.28 0 0 1 4.693334-121.173333s39.68-12.373333 128 46.933333a455.68 455.68 0 0 1 234.666666 0c89.6-59.306667 128-46.933333 128-46.933333a161.28 161.28 0 0 1 4.693334 121.173333A177.066667 177.066667 0 0 1 810.666667 477.866667c0 176.64-110.08 215.466667-213.333334 226.986666a106.666667 106.666667 0 0 1 32 85.333334v125.866666c0 14.933333 8.533333 26.88 32 22.186667A460.8 460.8 0 0 0 981.333333 502.186667 464.64 464.64 0 0 0 512 42.666667"/>

+ 7 - 0
Project/libraries/Homepage/VersionArchiveList/ConfirmButtonCard.xaml

@@ -0,0 +1,7 @@
+<local:MyCard Margin="0,10">
+    <StackPanel Margin="15,10">
+    <local:MyListItem Margin="0,1,0,1" ToolTip="继续浏览"
+	Logo="pack://application:,,,/images/Blocks/GoldBlock.png" Title="确认" Info="继续浏览"
+	EventType="打开帮助" EventData="https://${domain}/${version}_archive.json" Type="Clickable" />
+    </StackPanel>
+</local:MyCard>

+ 6 - 0
Project/libraries/Homepage/VersionArchiveList/OldArchiveNotice.md

@@ -0,0 +1,6 @@
+---
+title: 提示
+isswaped: false
+canswap: false
+---
+新闻主页古老版本(1.17、1.18)的页面由于年久失修不兼容新版构建器已放弃维护。这些版本的更新日志并不是单独存放的,而是作为整整一个页面呈现。打开这些页面有可能会使 PCL 出现卡顿等情况。如要继续访问请点击下方按钮。

+ 24 - 0
Project/libraries/Homepage/VersionArchiveList/VersionArchiveList.xaml

@@ -0,0 +1,24 @@
+<local:MyCard Title="版本列表" Margin="0,0">
+    <StackPanel Margin="20,40,20,15">
+    <local:MyListItem Margin="0,2" ToolTip="点击查看该版本更新日志列表" LogoScale="1.04"
+	Logo="https://img.picgo.net/2025/02/15/Active_Trial_Spawner_JE4_BE3813f27e2213dec08.png" Title="棘巧试炼 | 1.21" Info="加入了试炼密室"
+	EventType="打开帮助" EventData="https://${domain}/1.21_archive.json" Type="Clickable" />
+    <local:MyListItem Margin="0,2" ToolTip="点击查看该版本更新日志列表" LogoScale="1.04"
+	Logo="https://img.picgo.net/2025/02/15/Cherry_Leaves_JE29cc390fd9b51333d.png" Title="足迹与故事 | 1.20 " Info="加入了考古学与樱花树"
+	EventType="打开帮助" EventData="https://${domain}/1.20_archive.json" Type="Clickable" />
+    <local:MyListItem Margin="0,2" ToolTip="点击查看该版本更新日志列表" LogoScale="1.04"
+	Logo="https://img.picgo.net/2025/02/15/Sculk_JE1_BE141e57ad22b2b968e.png" Title="荒野更新 | 1.19" Info="加入了深暗之域与远古城市,以及红树林沼泽"
+	EventType="打开帮助" EventData="https://${domain}/1.19_archive.json" Type="Clickable" />
+    <local:MyListItem Margin="0,2" ToolTip="点击查看该版本更新日志列表" LogoScale="1.04"
+	Logo="https://img.picgo.net/2025/02/15/Deepslate_JE3_BE227b47de799b509d8.png" Title="洞穴与山崖(第二部分) | 1.18" Info="扩展地下,大幅更改洞穴生成,加入新的山地生物群系"
+	EventType="打开帮助" EventData="https://${domain}/1.18_archive_confirm.json" Type="Clickable" />
+    <local:MyListItem Margin="0,2" ToolTip="点击查看该版本更新日志列表" LogoScale="1.04"
+	Logo="https://img.picgo.net/2025/02/15/Block_of_Amethyst_JE3_BE14f18267120f7bf34.png" Title="洞穴与山崖(第一部分) | 1.17" Info="加入了繁茂洞穴、紫晶洞"
+	EventType="打开帮助" EventData="https://${domain}/1.17_archive_confirm.json" Type="Clickable" />
+	<Line X1="0" X2="100" Stroke="{DynamicResource ColorBrush5}"  Opacity="0.7" StrokeThickness="1.2"
+     HorizontalAlignment="Center" Stretch="Fill" Margin="2"/>
+	<local:MyListItem Margin="0,2" ToolTip="点击查看该版本更新日志列表" LogoScale="1.04"
+	Logo="https://img.picgo.net/2025/02/15/Locked_Chest_JE108f3a29ad950e185.png" Title="愚人节快照" Info="23w13a_or_b、24w14potato"
+	EventType="打开帮助" EventData="https://${domain}/VersionLists/april_fools_archive.json" Type="Clickable" />
+    </StackPanel>
+</local:MyCard>

+ 7 - 0
Project/libraries/Homepage/VersionArchiveList/ViewLogsOnWiki.xaml

@@ -0,0 +1,7 @@
+<local:MyCard Margin="0,10">
+    <StackPanel Margin="15,10">
+    <local:MyListItem Margin="0,1,0,1" ToolTip="点击跳转至 Java版版本记录 页面" LogoScale="1.3"
+	Logo="https://img.picgo.net/2025/02/15/mcw_logo_textless73a208d55c979a7e.png" Title="在 Minecraft Wiki 上查看更多日志" Info="浏览 Java 版版本记录"
+	EventType="打开网页" EventData="https://zh.minecraft.wiki/w/Java版版本记录" Type="Clickable" />
+    </StackPanel>
+</local:MyCard>

+ 1 - 0
Project/libraries/Homepage/VersionArchiveList/__LIBRARY__.yml

@@ -0,0 +1 @@
+name: archive_lists

+ 6 - 1
Project/libraries/Homepage/VersionLatestListCard.xaml

@@ -1,5 +1,10 @@
 <local:MyCard Title="${title|最新版本}" CanSwap="${card-can-swap|False}" IsSwaped="${card-is-swaped|False}" ${@IF|${enable-card-style}|Style="{StaticResource Card}"}>
-<StackPanel Margin="${content-margin|8,35,8,15}">
+<StackPanel Margin="${content-margin|8,38,8,15}">
 ${@VersionLatestList}
+<Line X1="0" X2="100" Stroke="{DynamicResource ColorBrush5}"  Opacity="0.7" StrokeThickness="1.2"
+     HorizontalAlignment="Center" Stretch="Fill" Margin="4,4"/>
+<local:MyListItem Margin="10,1" ToolTip="点击跳转到列表界面" LogoScale="1.04"
+Logo="https://img.picgo.net/2025/02/15/Bookshelf_JE4_BE2de3fa45de5d6d91f.png" Title="历史版本更新日志" Info="点击查看更多更新日志"
+EventType="打开帮助" EventData="https://${domain}/VersionArchiveList.json" Type="Clickable" />
 </StackPanel>
 </local:MyCard>

+ 1 - 1
Project/libraries/Homepage/animated_noticebar.xaml

@@ -2,7 +2,7 @@
 <Border Margin="0,0,0,0" Padding="2,8" BorderThickness="1" Background="{DynamicResource ColorBrush5}" CornerRadius="5" VerticalAlignment="Top" BorderBrush="{DynamicResource ColorBrush3}" Opacity="0.7">
     <Grid Margin="10,0,0,0">
         <TextBlock x:Name="NewsHint" FontWeight="Bold" FontSize="12" VerticalAlignment="Center" Foreground="#FF000000">
-                📰 欢迎使用新闻主页
+                📰 新闻主页正在测试新的排版,有任何建议可以点击下方按钮反馈。
     </TextBlock>
         <TextBlock x:Name="Hint2" FontWeight="Bold" FontSize="12" VerticalAlignment="Center" Foreground="#00000000">
                 📰 欢迎使用新闻主页

+ 2 - 6
Project/pages/News.yml

@@ -5,10 +5,6 @@ alias:
  - 主界面
 cards:
  - animated_noticebar | s = false
- - ${@MainPageVersions|new}
- - T:Separator | content = 历史版本
- - ${@MainPageVersions|history}
- - jumpCard
- - T:Separator | content = 周边新闻
- - feedback_hint
+ - VersionLatestListCard | title=更新日志 | enable-card-style=True
+# - feedback_hint
  - NewFooter

+ 5 - 0
Project/pages/VersionArchiveList.yml

@@ -0,0 +1,5 @@
+name: 版本列表
+cards:
+   - VersionArchiveList
+   - ViewLogsOnWiki
+   - LightFooter

+ 0 - 0
Project/pages/1.17存档.xaml → Project/pages/VersionLists/1.17_archive.xaml


+ 0 - 0
Project/pages/1.18存档.xaml → Project/pages/VersionLists/1.18_archive.xaml


+ 2 - 1
Project/pages/1.19.yml → Project/pages/VersionLists/1.19.yml

@@ -1,7 +1,8 @@
 name: 1.19_archive
 alias:
+ - 1.19_archive
  - 1.19存档
-display_name: 1.19存档
+display_name: 版本历史记录 | 荒野更新 | 1.19
 cards:
  - archive_noticebar
  - T:VersionArchiveList | cat = 1.19

+ 2 - 1
Project/pages/1.20.yml → Project/pages/VersionLists/1.20.yml

@@ -1,7 +1,8 @@
 name: 1.20_archive
 alias:
+ - 1.20_archive
  - 1.20存档
-display_name: 1.20存档
+display_name: 版本历史记录 | 足迹与故事 | 1.20
 cards:
  - archive_noticebar
  - T:VersionArchiveList | cat = 1.20

+ 2 - 1
Project/pages/1.21.yml → Project/pages/VersionLists/1.21.yml

@@ -1,7 +1,8 @@
 name: 1.21_archive
 alias:
+ - 1.21_archive
  - 1.21存档
-display_name: 1.21存档
+display_name: 版本历史记录 | 棘巧试炼 | 1.21
 cards:
  - archive_noticebar
  - T:VersionArchiveList | cat = 1.21

+ 6 - 0
Project/pages/VersionLists/OldArchiveNotices/1.17.yml

@@ -0,0 +1,6 @@
+name: 1.17_archive_confirm
+alias: ["1.17_archive_confirm"]
+display_name: 注意
+cards:
+ - OldArchiveNotice
+ - ConfirmButtonCard | version=1.17

+ 6 - 0
Project/pages/VersionLists/OldArchiveNotices/1.18.yml

@@ -0,0 +1,6 @@
+name: 1.18_archive_confirm
+alias: ["1.18_archive_confirm"]
+display_name: 注意
+cards:
+ - OldArchiveNotice
+ - ConfirmButtonCard | version=1.18

+ 2 - 1
Project/pages/april_fools.yml → Project/pages/VersionLists/april_fools.yml

@@ -1,7 +1,8 @@
 name: april_fools_archive
 alias:
+ - april_fools_archive
  - 愚人节版本存档
-display_name: 愚人节版本存档
+display_name: 版本历史记录 | 愚人节快照
 cards:
  - archive_noticebar
  - T:VersionArchiveList | cat = april_fools