Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
d932678
feat: 截图查看管理界面
tangge233 Sep 21, 2024
2aba4a9
fix: 截图不存在提示 & 查看版本错误
tangge233 Sep 21, 2024
832d0ec
fix: 复制文件而不是文件内容
tangge233 Sep 21, 2024
4b62cb1
feat: 存档查看
tangge233 Sep 21, 2024
6d915e2
feat: 复制图标
tangge233 Sep 21, 2024
26939cc
feat: 存档详细信息查看 & 操作按钮
tangge233 Sep 21, 2024
a7469e2
feat: 光影 & 资源包 界面
tangge233 Sep 21, 2024
ce1f45c
feat: 打开文件按钮
tangge233 Sep 21, 2024
e800b5a
feat: 截图图标
tangge233 Sep 21, 2024
fc81f94
feat: 截图图标
tangge233 Sep 21, 2024
5eb2bf4
feat: 调整顺序
tangge233 Sep 21, 2024
6c7fbcd
feat: 按钮居中
tangge233 Sep 21, 2024
62805dc
feat: 修改建议
tangge233 Sep 21, 2024
8000b3e
fix: 缓存目录创建与删除问题
tangge233 Sep 21, 2024
ad46cc1
Update Plain Craft Launcher 2/Pages/PageVersion/PageVersionScreenshot…
tangge233 Sep 21, 2024
668c83f
fix: 可能出现的复制错误
tangge233 Sep 21, 2024
a55e8cf
fix: 不合理的剪切板操作
tangge233 Sep 21, 2024
0665e81
feat: 粘贴按钮
tangge233 Sep 22, 2024
f8bebb5
fix: 文本描述
tangge233 Sep 22, 2024
688c884
Apply suggestions from code review
tangge233 Sep 22, 2024
2c3f87c
fix: UI 错误
tangge233 Sep 22, 2024
dfa2663
feat: 截图界面改进
tangge233 Sep 22, 2024
903fec8
Merge branch 'main' into InstanceResource
tangge233 Sep 22, 2024
8902ffd
chore: 调整界面
tangge233 Sep 22, 2024
eb52f3e
fix: 空值检查对象错误
tangge233 Sep 22, 2024
ca6c786
fix: 界面元素有时看不到
tangge233 Sep 22, 2024
62be47d
feat: 资源包展示支持文件夹类型
tangge233 Sep 23, 2024
7123f89
Apply suggestions from code review
tangge233 Sep 23, 2024
b5d721e
fix: 目录不存在时报错
tangge233 Sep 28, 2024
3accfe0
chore: 资源包使用内部自带描述
tangge233 Sep 28, 2024
3f0ed3a
chore: 加入 Try Catch
tangge233 Sep 28, 2024
e49f038
fix: 不合理的路径获取方式
tangge233 Sep 28, 2024
c15590c
Merge branch 'main' into InstanceResource
tangge233 Sep 28, 2024
cf56f94
chore: that's better
tangge233 Sep 29, 2024
7f5edb1
Merge branch 'main' into InstanceResource
tangge233 Oct 3, 2024
4f47ae3
chore: 序号后退,给导出整合包让位
tangge233 Oct 7, 2024
9e864b8
Merge branch 'Hex-Dragon:main' into InstanceResource
tangge233 Oct 13, 2024
a64d6f5
Merge branch 'main' into InstanceResource
tangge233 Oct 29, 2024
34c88a9
feat: 处理文件拖拽
tangge233 Nov 2, 2024
f71d493
Merge branch 'main' into InstanceResource
tangge233 Nov 2, 2024
b276ff8
Merge branch 'main' into InstanceResource
tangge233 Dec 23, 2024
b394f99
fix: 新版本调用问题
tangge233 Dec 23, 2024
079b6d9
chore: 资源包调试输出
tangge233 Dec 28, 2024
f564d2d
sync: apply fix from ce
tangge233 Jan 22, 2025
14cc464
Merge branch 'Hex-Dragon:main' into InstanceResource
tangge233 Jan 22, 2025
e91d1a2
chore: add more try catch
tangge233 Jan 22, 2025
0c9e028
chore: 拖拽(补档)
tangge233 Jan 24, 2025
70a0a75
feat: 支持截图分页
tangge233 Jan 25, 2025
d9f6292
chore: ui
tangge233 Jan 25, 2025
bfb8922
feat: 支持 webp & Task 异步加载
tangge233 Jan 25, 2025
53e6497
fix: max page compute error
tangge233 Jan 25, 2025
a5d6b8f
sync fix from #CE142
tangge233 Jan 27, 2025
d26d435
sync: ce
tangge233 Feb 13, 2025
7168cbb
fix: image fly away
tangge233 Feb 13, 2025
05a9d08
refactor(LocalComp): 重构模组、材质包、光影包查看界面
tangge233 Feb 20, 2025
07ad700
feat(ScreeanShot): 按照创建时间排序
tangge233 Mar 7, 2025
e811cb8
fix(CompUpdate): 缓存的键不对
tangge233 Mar 9, 2025
8b6ffc1
fix(CompUpdate): 修复更新失败
tangge233 Mar 15, 2025
4969e00
Merge branch 'main' into InstanceResource
tangge233 Apr 29, 2025
8c9c13c
Revert: 合并冲突爆炸,重写
tangge233 Apr 29, 2025
3df78ca
refactor: 完成截图界面的引入
tangge233 May 3, 2025
186324f
chore: 修改缓存文件名
tangge233 May 4, 2025
1d6e5db
refactor: 简单完成了龙猫的分离要求
tangge233 May 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions Plain Craft Launcher 2/FormMain.xaml.vb
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ Public Class FormMain
Try
If PageCurrent = PageType.VersionSetup AndAlso PageCurrentSub = PageSubType.VersionMod Then
'Mod 管理自动刷新
FrmVersionMod.ReloadModList()
FrmVersionMod.Content.ReloadList()
ElseIf PageCurrent = PageType.VersionSelect Then
'版本选择自动刷新
LoaderFolderRun(McVersionListLoader, PathMcFolder, LoaderFolderRunType.RunOnUpdated, MaxDepth:=1, ExtraPath:="versions\")
Expand Down Expand Up @@ -774,7 +774,7 @@ Public Class FormMain
Exit Sub
End If
'安装 Mod
If PageVersionMod.InstallMods(FilePathList) Then Exit Sub
If PageVersionComp.InstallMods(FilePathList) Then Exit Sub
'安装整合包
If {"zip", "rar", "mrpack"}.Any(Function(t) t = Extension) Then '部分压缩包是 zip 格式但后缀为 rar,总之试一试
Log("[System] 文件为压缩包,尝试作为整合包安装")
Expand Down Expand Up @@ -956,9 +956,12 @@ Public Class FormMain
OtherTest = 2
VersionOverall = 0
VersionSetup = 1
VersionMod = 2
VersionModDisabled = 3
VersionExport = 4
VersionExport = 2
VersionScreenshot = 3
VersionMod = 4
VersionModDisabled = 5
VersionResourcepack = 6
VersionShader = 7
End Enum
''' <summary>
''' 获取次级页面的名称。若并非次级页面则返回空字符串,故可以以此判断是否为次级页面。
Expand Down Expand Up @@ -1094,7 +1097,15 @@ Public Class FormMain
Select Case Stack.Page
Case PageType.VersionSetup
If FrmVersionLeft Is Nothing Then FrmVersionLeft = New PageVersionLeft
CType(FrmVersionLeft.PanItem.Children(SubType), MyListItem).SetChecked(True, True, Stack = PageCurrent)
For Each item In FrmVersionLeft.PanItem.Children
If item.GetType() = GetType(MyListItem) Then
Dim target As MyListItem = item
If CType(target.Tag, PageSubType) = SubType Then
target.SetChecked(True, True, Stack = PageCurrent)
Exit For
End If
End If
Next
End Select
PageChangeActual(Stack, SubType)
End If
Expand Down
4 changes: 4 additions & 0 deletions Plain Craft Launcher 2/Modules/Base/ModBase.vb
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ Public Module ModBase
''' 图标,播放,0.8x
''' </summary>
Public Const IconPlay As String = "M803.904 463.936a55.168 55.168 0 0 1 0 96.128l-463.616 264.448C302.848 845.888 256 819.136 256 776.448V247.616c0-42.752 46.848-69.44 84.288-48.064l463.616 264.384z"
''' <summary>
''' 图标按钮,复制
''' </summary>
Public Const IconButtonCopy As String = "M394.666667 106.666667h448a74.666667 74.666667 0 0 1 74.666666 74.666666v448a74.666667 74.666667 0 0 1-74.666666 74.666667H394.666667a74.666667 74.666667 0 0 1-74.666667-74.666667V181.333333a74.666667 74.666667 0 0 1 74.666667-74.666666z m0 64a10.666667 10.666667 0 0 0-10.666667 10.666666v448a10.666667 10.666667 0 0 0 10.666667 10.666667h448a10.666667 10.666667 0 0 0 10.666666-10.666667V181.333333a10.666667 10.666667 0 0 0-10.666666-10.666666H394.666667z m245.333333 597.333333a32 32 0 0 1 64 0v74.666667a74.666667 74.666667 0 0 1-74.666667 74.666666H181.333333a74.666667 74.666667 0 0 1-74.666666-74.666666V394.666667a74.666667 74.666667 0 0 1 74.666666-74.666667h74.666667a32 32 0 0 1 0 64h-74.666667a10.666667 10.666667 0 0 0-10.666666 10.666667v448a10.666667 10.666667 0 0 0 10.666666 10.666666h448a10.666667 10.666667 0 0 0 10.666667-10.666666v-74.666667z"
End Class

#End Region
Expand Down
6 changes: 3 additions & 3 deletions Plain Craft Launcher 2/Modules/Base/ModLoader.vb
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ Restart:
''' 返回是否执行了加载器。
''' </summary>
''' <param name="ExtraPath">用于检查文件夹修改的额外路径。该路径不会传入加载器。</param>
Public Function LoaderFolderRun(Loader As LoaderBase, FolderPath As String, Type As LoaderFolderRunType, Optional MaxDepth As Integer = 0, Optional ExtraPath As String = "", Optional WaitForExit As Boolean = False) As Boolean
Public Function LoaderFolderRun(Loader As LoaderBase, FolderPath As String, Type As LoaderFolderRunType, Optional MaxDepth As Integer = 0, Optional ExtraPath As String = "", Optional WaitForExit As Boolean = False, Optional DataInput As Object = Nothing) As Boolean
Dim FolderInfo As DirectoryInfo
Dim Value As New LoaderFolderDictionaryEntry With {.FolderPath = FolderPath & ExtraPath, .LastCheckTime = Nothing}
Try
Expand All @@ -679,9 +679,9 @@ Restart:
'开始检查
If Type = LoaderFolderRunType.UpdateOnly Then Return False
If WaitForExit Then
Loader.WaitForExit(FolderPath, IsForceRestart:=True)
Loader.WaitForExit(If(DataInput, FolderPath), IsForceRestart:=True)
Else
Loader.Start(FolderPath, IsForceRestart:=True)
Loader.Start(If(DataInput, FolderPath), IsForceRestart:=True)
End If
Return True
End Function
Expand Down
Loading