diff --git a/DodocoTales-HSR/App.config b/DodocoTales.StarRail/App.config similarity index 100% rename from DodocoTales-HSR/App.config rename to DodocoTales.StarRail/App.config diff --git a/DodocoTales-HSR/App.xaml b/DodocoTales.StarRail/App.xaml similarity index 100% rename from DodocoTales-HSR/App.xaml rename to DodocoTales.StarRail/App.xaml diff --git a/DodocoTales-HSR/App.xaml.cs b/DodocoTales.StarRail/App.xaml.cs similarity index 100% rename from DodocoTales-HSR/App.xaml.cs rename to DodocoTales.StarRail/App.xaml.cs diff --git a/DodocoTales-HSR/Common/Enums/DDCCPoolType.cs b/DodocoTales.StarRail/Common/Enums/DDCCPoolType.cs similarity index 100% rename from DodocoTales-HSR/Common/Enums/DDCCPoolType.cs rename to DodocoTales.StarRail/Common/Enums/DDCCPoolType.cs diff --git a/DodocoTales-HSR/Common/Enums/DDCCUnitType.cs b/DodocoTales.StarRail/Common/Enums/DDCCUnitType.cs similarity index 100% rename from DodocoTales-HSR/Common/Enums/DDCCUnitType.cs rename to DodocoTales.StarRail/Common/Enums/DDCCUnitType.cs diff --git a/DodocoTales-HSR/Common/Signals/DDCS_Core.cs b/DodocoTales.StarRail/Common/Signals/DDCS_Core.cs similarity index 100% rename from DodocoTales-HSR/Common/Signals/DDCS_Core.cs rename to DodocoTales.StarRail/Common/Signals/DDCS_Core.cs diff --git a/DodocoTales-HSR/Common/Signals/DDCS_Lib.cs b/DodocoTales.StarRail/Common/Signals/DDCS_Lib.cs similarity index 100% rename from DodocoTales-HSR/Common/Signals/DDCS_Lib.cs rename to DodocoTales.StarRail/Common/Signals/DDCS_Lib.cs diff --git a/DodocoTales-HSR/Common/Signals/DDCS_Loader.cs b/DodocoTales.StarRail/Common/Signals/DDCS_Loader.cs similarity index 100% rename from DodocoTales-HSR/Common/Signals/DDCS_Loader.cs rename to DodocoTales.StarRail/Common/Signals/DDCS_Loader.cs diff --git a/DodocoTales-HSR/DodocoTales.StarRail.csproj b/DodocoTales.StarRail/DodocoTales.StarRail.csproj similarity index 99% rename from DodocoTales-HSR/DodocoTales.StarRail.csproj rename to DodocoTales.StarRail/DodocoTales.StarRail.csproj index 373d1e2..75d3163 100644 --- a/DodocoTales-HSR/DodocoTales.StarRail.csproj +++ b/DodocoTales.StarRail/DodocoTales.StarRail.csproj @@ -7,7 +7,7 @@ {4C70370C-2661-4088-9821-5FA391564627} WinExe DodocoTales.SR - SRWrapObserve + SRWarpObserve v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/DodocoTales-HSR/Gui/Converters/DDCVPercentageConverter.cs b/DodocoTales.StarRail/Gui/Converters/DDCVPercentageConverter.cs similarity index 100% rename from DodocoTales-HSR/Gui/Converters/DDCVPercentageConverter.cs rename to DodocoTales.StarRail/Gui/Converters/DDCVPercentageConverter.cs diff --git a/DodocoTales-HSR/Gui/Converters/DDCVPoolTypeConverter.cs b/DodocoTales.StarRail/Gui/Converters/DDCVPoolTypeConverter.cs similarity index 100% rename from DodocoTales-HSR/Gui/Converters/DDCVPoolTypeConverter.cs rename to DodocoTales.StarRail/Gui/Converters/DDCVPoolTypeConverter.cs diff --git a/DodocoTales-HSR/Gui/Converters/DDCVUidAnonymousConverter.cs b/DodocoTales.StarRail/Gui/Converters/DDCVUidAnonymousConverter.cs similarity index 100% rename from DodocoTales-HSR/Gui/Converters/DDCVUidAnonymousConverter.cs rename to DodocoTales.StarRail/Gui/Converters/DDCVUidAnonymousConverter.cs diff --git a/DodocoTales-HSR/Gui/Converters/DDCVUidNormalConverter.cs b/DodocoTales.StarRail/Gui/Converters/DDCVUidNormalConverter.cs similarity index 100% rename from DodocoTales-HSR/Gui/Converters/DDCVUidNormalConverter.cs rename to DodocoTales.StarRail/Gui/Converters/DDCVUidNormalConverter.cs diff --git a/DodocoTales-HSR/Gui/Converters/DDCVVisibleByAvailableUIDConverter.cs b/DodocoTales.StarRail/Gui/Converters/DDCVVisibleByAvailableUIDConverter.cs similarity index 100% rename from DodocoTales-HSR/Gui/Converters/DDCVVisibleByAvailableUIDConverter.cs rename to DodocoTales.StarRail/Gui/Converters/DDCVVisibleByAvailableUIDConverter.cs diff --git a/DodocoTales-HSR/Gui/Converters/DDCVVisibleByBooleanConverter.cs b/DodocoTales.StarRail/Gui/Converters/DDCVVisibleByBooleanConverter.cs similarity index 100% rename from DodocoTales-HSR/Gui/Converters/DDCVVisibleByBooleanConverter.cs rename to DodocoTales.StarRail/Gui/Converters/DDCVVisibleByBooleanConverter.cs diff --git a/DodocoTales-HSR/Gui/DDCV.cs b/DodocoTales.StarRail/Gui/DDCV.cs similarity index 100% rename from DodocoTales-HSR/Gui/DDCV.cs rename to DodocoTales.StarRail/Gui/DDCV.cs diff --git a/DodocoTales-HSR/Gui/Enums/DDCVGreaterRoundType.cs b/DodocoTales.StarRail/Gui/Enums/DDCVGreaterRoundType.cs similarity index 100% rename from DodocoTales-HSR/Gui/Enums/DDCVGreaterRoundType.cs rename to DodocoTales.StarRail/Gui/Enums/DDCVGreaterRoundType.cs diff --git a/DodocoTales-HSR/Gui/Enums/DDCVUnitIndicatorType.cs b/DodocoTales.StarRail/Gui/Enums/DDCVUnitIndicatorType.cs similarity index 100% rename from DodocoTales-HSR/Gui/Enums/DDCVUnitIndicatorType.cs rename to DodocoTales.StarRail/Gui/Enums/DDCVUnitIndicatorType.cs diff --git a/DodocoTales-HSR/Gui/Models/DDCVBannerItemModel.cs b/DodocoTales.StarRail/Gui/Models/DDCVBannerItemModel.cs similarity index 100% rename from DodocoTales-HSR/Gui/Models/DDCVBannerItemModel.cs rename to DodocoTales.StarRail/Gui/Models/DDCVBannerItemModel.cs diff --git a/DodocoTales-HSR/Gui/Models/DDCVMainPanelItemModel.cs b/DodocoTales.StarRail/Gui/Models/DDCVMainPanelItemModel.cs similarity index 100% rename from DodocoTales-HSR/Gui/Models/DDCVMainPanelItemModel.cs rename to DodocoTales.StarRail/Gui/Models/DDCVMainPanelItemModel.cs diff --git a/DodocoTales-HSR/Gui/Models/DDCVRoundItemModel.cs b/DodocoTales.StarRail/Gui/Models/DDCVRoundItemModel.cs similarity index 100% rename from DodocoTales-HSR/Gui/Models/DDCVRoundItemModel.cs rename to DodocoTales.StarRail/Gui/Models/DDCVRoundItemModel.cs diff --git a/DodocoTales-HSR/Gui/Models/DDCVUnitIndicatorModel.cs b/DodocoTales.StarRail/Gui/Models/DDCVUnitIndicatorModel.cs similarity index 100% rename from DodocoTales-HSR/Gui/Models/DDCVUnitIndicatorModel.cs rename to DodocoTales.StarRail/Gui/Models/DDCVUnitIndicatorModel.cs diff --git a/DodocoTales-HSR/Gui/Models/DDCVVersionItemModel.cs b/DodocoTales.StarRail/Gui/Models/DDCVVersionItemModel.cs similarity index 100% rename from DodocoTales-HSR/Gui/Models/DDCVVersionItemModel.cs rename to DodocoTales.StarRail/Gui/Models/DDCVVersionItemModel.cs diff --git a/DodocoTales-HSR/Gui/Resources/DDCVConverters.xaml b/DodocoTales.StarRail/Gui/Resources/DDCVConverters.xaml similarity index 100% rename from DodocoTales-HSR/Gui/Resources/DDCVConverters.xaml rename to DodocoTales.StarRail/Gui/Resources/DDCVConverters.xaml diff --git a/DodocoTales-HSR/Gui/Resources/Styles/DDCVListViewItemStyle.xaml b/DodocoTales.StarRail/Gui/Resources/Styles/DDCVListViewItemStyle.xaml similarity index 100% rename from DodocoTales-HSR/Gui/Resources/Styles/DDCVListViewItemStyle.xaml rename to DodocoTales.StarRail/Gui/Resources/Styles/DDCVListViewItemStyle.xaml diff --git a/DodocoTales-HSR/Gui/ViewModels/Cards/DDCVHomeSceneCardVMBase.cs b/DodocoTales.StarRail/Gui/ViewModels/Cards/DDCVHomeSceneCardVMBase.cs similarity index 100% rename from DodocoTales-HSR/Gui/ViewModels/Cards/DDCVHomeSceneCardVMBase.cs rename to DodocoTales.StarRail/Gui/ViewModels/Cards/DDCVHomeSceneCardVMBase.cs diff --git a/DodocoTales-HSR/Gui/ViewModels/Cards/DDCVHomeSceneCharEventCardVM.cs b/DodocoTales.StarRail/Gui/ViewModels/Cards/DDCVHomeSceneCharEventCardVM.cs similarity index 100% rename from DodocoTales-HSR/Gui/ViewModels/Cards/DDCVHomeSceneCharEventCardVM.cs rename to DodocoTales.StarRail/Gui/ViewModels/Cards/DDCVHomeSceneCharEventCardVM.cs diff --git a/DodocoTales-HSR/Gui/ViewModels/Cards/DDCVHomeSceneLCEventCardVM.cs b/DodocoTales.StarRail/Gui/ViewModels/Cards/DDCVHomeSceneLCEventCardVM.cs similarity index 100% rename from DodocoTales-HSR/Gui/ViewModels/Cards/DDCVHomeSceneLCEventCardVM.cs rename to DodocoTales.StarRail/Gui/ViewModels/Cards/DDCVHomeSceneLCEventCardVM.cs diff --git a/DodocoTales-HSR/Gui/ViewModels/Cards/DDCVHomeScenePermanentCardVM.cs b/DodocoTales.StarRail/Gui/ViewModels/Cards/DDCVHomeScenePermanentCardVM.cs similarity index 100% rename from DodocoTales-HSR/Gui/ViewModels/Cards/DDCVHomeScenePermanentCardVM.cs rename to DodocoTales.StarRail/Gui/ViewModels/Cards/DDCVHomeScenePermanentCardVM.cs diff --git a/DodocoTales-HSR/Gui/ViewModels/DDCVMainWindowVM.cs b/DodocoTales.StarRail/Gui/ViewModels/DDCVMainWindowVM.cs similarity index 100% rename from DodocoTales-HSR/Gui/ViewModels/DDCVMainWindowVM.cs rename to DodocoTales.StarRail/Gui/ViewModels/DDCVMainWindowVM.cs diff --git a/DodocoTales-HSR/Gui/ViewModels/Dialogs/DDCVGameClientManagerWindowEditDialogVM.cs b/DodocoTales.StarRail/Gui/ViewModels/Dialogs/DDCVGameClientManagerWindowEditDialogVM.cs similarity index 100% rename from DodocoTales-HSR/Gui/ViewModels/Dialogs/DDCVGameClientManagerWindowEditDialogVM.cs rename to DodocoTales.StarRail/Gui/ViewModels/Dialogs/DDCVGameClientManagerWindowEditDialogVM.cs diff --git a/DodocoTales-HSR/Gui/ViewModels/Screens/DDCVBannerViewScreenVM.cs b/DodocoTales.StarRail/Gui/ViewModels/Screens/DDCVBannerViewScreenVM.cs similarity index 100% rename from DodocoTales-HSR/Gui/ViewModels/Screens/DDCVBannerViewScreenVM.cs rename to DodocoTales.StarRail/Gui/ViewModels/Screens/DDCVBannerViewScreenVM.cs diff --git a/DodocoTales-HSR/Gui/ViewModels/Screens/DDCVVersionViewScreenVM.cs b/DodocoTales.StarRail/Gui/ViewModels/Screens/DDCVVersionViewScreenVM.cs similarity index 100% rename from DodocoTales-HSR/Gui/ViewModels/Screens/DDCVVersionViewScreenVM.cs rename to DodocoTales.StarRail/Gui/ViewModels/Screens/DDCVVersionViewScreenVM.cs diff --git a/DodocoTales-HSR/Gui/ViewModels/Windows/DDCVGameClientManagerWindowVM.cs b/DodocoTales.StarRail/Gui/ViewModels/Windows/DDCVGameClientManagerWindowVM.cs similarity index 100% rename from DodocoTales-HSR/Gui/ViewModels/Windows/DDCVGameClientManagerWindowVM.cs rename to DodocoTales.StarRail/Gui/ViewModels/Windows/DDCVGameClientManagerWindowVM.cs diff --git a/DodocoTales-HSR/Gui/Views/Cards/DDCVHomeSceneCharEventCard.xaml b/DodocoTales.StarRail/Gui/Views/Cards/DDCVHomeSceneCharEventCard.xaml similarity index 100% rename from DodocoTales-HSR/Gui/Views/Cards/DDCVHomeSceneCharEventCard.xaml rename to DodocoTales.StarRail/Gui/Views/Cards/DDCVHomeSceneCharEventCard.xaml diff --git a/DodocoTales-HSR/Gui/Views/Cards/DDCVHomeSceneCharEventCard.xaml.cs b/DodocoTales.StarRail/Gui/Views/Cards/DDCVHomeSceneCharEventCard.xaml.cs similarity index 100% rename from DodocoTales-HSR/Gui/Views/Cards/DDCVHomeSceneCharEventCard.xaml.cs rename to DodocoTales.StarRail/Gui/Views/Cards/DDCVHomeSceneCharEventCard.xaml.cs diff --git a/DodocoTales-HSR/Gui/Views/Cards/DDCVHomeSceneLCEventCard.xaml b/DodocoTales.StarRail/Gui/Views/Cards/DDCVHomeSceneLCEventCard.xaml similarity index 100% rename from DodocoTales-HSR/Gui/Views/Cards/DDCVHomeSceneLCEventCard.xaml rename to DodocoTales.StarRail/Gui/Views/Cards/DDCVHomeSceneLCEventCard.xaml diff --git a/DodocoTales-HSR/Gui/Views/Cards/DDCVHomeSceneLCEventCard.xaml.cs b/DodocoTales.StarRail/Gui/Views/Cards/DDCVHomeSceneLCEventCard.xaml.cs similarity index 100% rename from DodocoTales-HSR/Gui/Views/Cards/DDCVHomeSceneLCEventCard.xaml.cs rename to DodocoTales.StarRail/Gui/Views/Cards/DDCVHomeSceneLCEventCard.xaml.cs diff --git a/DodocoTales-HSR/Gui/Views/Cards/DDCVHomeScenePermanentCard.xaml b/DodocoTales.StarRail/Gui/Views/Cards/DDCVHomeScenePermanentCard.xaml similarity index 100% rename from DodocoTales-HSR/Gui/Views/Cards/DDCVHomeScenePermanentCard.xaml rename to DodocoTales.StarRail/Gui/Views/Cards/DDCVHomeScenePermanentCard.xaml diff --git a/DodocoTales-HSR/Gui/Views/Cards/DDCVHomeScenePermanentCard.xaml.cs b/DodocoTales.StarRail/Gui/Views/Cards/DDCVHomeScenePermanentCard.xaml.cs similarity index 100% rename from DodocoTales-HSR/Gui/Views/Cards/DDCVHomeScenePermanentCard.xaml.cs rename to DodocoTales.StarRail/Gui/Views/Cards/DDCVHomeScenePermanentCard.xaml.cs diff --git a/DodocoTales-HSR/Gui/Views/Dialogs/DDCVGameClientManagerWindowEditDialog.xaml b/DodocoTales.StarRail/Gui/Views/Dialogs/DDCVGameClientManagerWindowEditDialog.xaml similarity index 100% rename from DodocoTales-HSR/Gui/Views/Dialogs/DDCVGameClientManagerWindowEditDialog.xaml rename to DodocoTales.StarRail/Gui/Views/Dialogs/DDCVGameClientManagerWindowEditDialog.xaml diff --git a/DodocoTales-HSR/Gui/Views/Dialogs/DDCVGameClientManagerWindowEditDialog.xaml.cs b/DodocoTales.StarRail/Gui/Views/Dialogs/DDCVGameClientManagerWindowEditDialog.xaml.cs similarity index 100% rename from DodocoTales-HSR/Gui/Views/Dialogs/DDCVGameClientManagerWindowEditDialog.xaml.cs rename to DodocoTales.StarRail/Gui/Views/Dialogs/DDCVGameClientManagerWindowEditDialog.xaml.cs diff --git a/DodocoTales-HSR/Gui/Views/Screens/DDCVBannerViewScreen.xaml b/DodocoTales.StarRail/Gui/Views/Screens/DDCVBannerViewScreen.xaml similarity index 100% rename from DodocoTales-HSR/Gui/Views/Screens/DDCVBannerViewScreen.xaml rename to DodocoTales.StarRail/Gui/Views/Screens/DDCVBannerViewScreen.xaml diff --git a/DodocoTales-HSR/Gui/Views/Screens/DDCVBannerViewScreen.xaml.cs b/DodocoTales.StarRail/Gui/Views/Screens/DDCVBannerViewScreen.xaml.cs similarity index 100% rename from DodocoTales-HSR/Gui/Views/Screens/DDCVBannerViewScreen.xaml.cs rename to DodocoTales.StarRail/Gui/Views/Screens/DDCVBannerViewScreen.xaml.cs diff --git a/DodocoTales-HSR/Gui/Views/Screens/DDCVHomeScreen.xaml b/DodocoTales.StarRail/Gui/Views/Screens/DDCVHomeScreen.xaml similarity index 100% rename from DodocoTales-HSR/Gui/Views/Screens/DDCVHomeScreen.xaml rename to DodocoTales.StarRail/Gui/Views/Screens/DDCVHomeScreen.xaml diff --git a/DodocoTales-HSR/Gui/Views/Screens/DDCVHomeScreen.xaml.cs b/DodocoTales.StarRail/Gui/Views/Screens/DDCVHomeScreen.xaml.cs similarity index 100% rename from DodocoTales-HSR/Gui/Views/Screens/DDCVHomeScreen.xaml.cs rename to DodocoTales.StarRail/Gui/Views/Screens/DDCVHomeScreen.xaml.cs diff --git a/DodocoTales-HSR/Gui/Views/Screens/DDCVSwapableScreen.cs b/DodocoTales.StarRail/Gui/Views/Screens/DDCVSwapableScreen.cs similarity index 100% rename from DodocoTales-HSR/Gui/Views/Screens/DDCVSwapableScreen.cs rename to DodocoTales.StarRail/Gui/Views/Screens/DDCVSwapableScreen.cs diff --git a/DodocoTales-HSR/Gui/Views/Screens/DDCVVersionViewScreen.xaml b/DodocoTales.StarRail/Gui/Views/Screens/DDCVVersionViewScreen.xaml similarity index 100% rename from DodocoTales-HSR/Gui/Views/Screens/DDCVVersionViewScreen.xaml rename to DodocoTales.StarRail/Gui/Views/Screens/DDCVVersionViewScreen.xaml diff --git a/DodocoTales-HSR/Gui/Views/Screens/DDCVVersionViewScreen.xaml.cs b/DodocoTales.StarRail/Gui/Views/Screens/DDCVVersionViewScreen.xaml.cs similarity index 100% rename from DodocoTales-HSR/Gui/Views/Screens/DDCVVersionViewScreen.xaml.cs rename to DodocoTales.StarRail/Gui/Views/Screens/DDCVVersionViewScreen.xaml.cs diff --git a/DodocoTales-HSR/Gui/Views/Windows/DDCVGameClientManagerWindow.xaml b/DodocoTales.StarRail/Gui/Views/Windows/DDCVGameClientManagerWindow.xaml similarity index 100% rename from DodocoTales-HSR/Gui/Views/Windows/DDCVGameClientManagerWindow.xaml rename to DodocoTales.StarRail/Gui/Views/Windows/DDCVGameClientManagerWindow.xaml diff --git a/DodocoTales-HSR/Gui/Views/Windows/DDCVGameClientManagerWindow.xaml.cs b/DodocoTales.StarRail/Gui/Views/Windows/DDCVGameClientManagerWindow.xaml.cs similarity index 100% rename from DodocoTales-HSR/Gui/Views/Windows/DDCVGameClientManagerWindow.xaml.cs rename to DodocoTales.StarRail/Gui/Views/Windows/DDCVGameClientManagerWindow.xaml.cs diff --git a/DodocoTales-HSR/Library/BannerLibrary/DDCLBannerLibrary.cs b/DodocoTales.StarRail/Library/BannerLibrary/DDCLBannerLibrary.cs similarity index 100% rename from DodocoTales-HSR/Library/BannerLibrary/DDCLBannerLibrary.cs rename to DodocoTales.StarRail/Library/BannerLibrary/DDCLBannerLibrary.cs diff --git a/DodocoTales-HSR/Library/BannerLibrary/Models/DDCLBannerInfo.cs b/DodocoTales.StarRail/Library/BannerLibrary/Models/DDCLBannerInfo.cs similarity index 100% rename from DodocoTales-HSR/Library/BannerLibrary/Models/DDCLBannerInfo.cs rename to DodocoTales.StarRail/Library/BannerLibrary/Models/DDCLBannerInfo.cs diff --git a/DodocoTales-HSR/Library/BannerLibrary/Models/DDCLBannerLibModel.cs b/DodocoTales.StarRail/Library/BannerLibrary/Models/DDCLBannerLibModel.cs similarity index 100% rename from DodocoTales-HSR/Library/BannerLibrary/Models/DDCLBannerLibModel.cs rename to DodocoTales.StarRail/Library/BannerLibrary/Models/DDCLBannerLibModel.cs diff --git a/DodocoTales-HSR/Library/BannerLibrary/Models/DDCLVersionInfo.cs b/DodocoTales.StarRail/Library/BannerLibrary/Models/DDCLVersionInfo.cs similarity index 100% rename from DodocoTales-HSR/Library/BannerLibrary/Models/DDCLVersionInfo.cs rename to DodocoTales.StarRail/Library/BannerLibrary/Models/DDCLVersionInfo.cs diff --git a/DodocoTales-HSR/Library/CurrentUser/DDCLCurrentUserLibrary.cs b/DodocoTales.StarRail/Library/CurrentUser/DDCLCurrentUserLibrary.cs similarity index 100% rename from DodocoTales-HSR/Library/CurrentUser/DDCLCurrentUserLibrary.cs rename to DodocoTales.StarRail/Library/CurrentUser/DDCLCurrentUserLibrary.cs diff --git a/DodocoTales-HSR/Library/CurrentUser/Models/DDCLBannerLogItem.cs b/DodocoTales.StarRail/Library/CurrentUser/Models/DDCLBannerLogItem.cs similarity index 100% rename from DodocoTales-HSR/Library/CurrentUser/Models/DDCLBannerLogItem.cs rename to DodocoTales.StarRail/Library/CurrentUser/Models/DDCLBannerLogItem.cs diff --git a/DodocoTales-HSR/Library/CurrentUser/Models/DDCLRoundLogItem.cs b/DodocoTales.StarRail/Library/CurrentUser/Models/DDCLRoundLogItem.cs similarity index 100% rename from DodocoTales-HSR/Library/CurrentUser/Models/DDCLRoundLogItem.cs rename to DodocoTales.StarRail/Library/CurrentUser/Models/DDCLRoundLogItem.cs diff --git a/DodocoTales-HSR/Library/DDCL.cs b/DodocoTales.StarRail/Library/DDCL.cs similarity index 100% rename from DodocoTales-HSR/Library/DDCL.cs rename to DodocoTales.StarRail/Library/DDCL.cs diff --git a/DodocoTales-HSR/Library/Enums/DDCLActivateStatus.cs b/DodocoTales.StarRail/Library/Enums/DDCLActivateStatus.cs similarity index 100% rename from DodocoTales-HSR/Library/Enums/DDCLActivateStatus.cs rename to DodocoTales.StarRail/Library/Enums/DDCLActivateStatus.cs diff --git a/DodocoTales-HSR/Library/Enums/DDCLGameClientType.cs b/DodocoTales.StarRail/Library/Enums/DDCLGameClientType.cs similarity index 100% rename from DodocoTales-HSR/Library/Enums/DDCLGameClientType.cs rename to DodocoTales.StarRail/Library/Enums/DDCLGameClientType.cs diff --git a/DodocoTales-HSR/Library/GameClient/DDCLGameClientLibrary.cs b/DodocoTales.StarRail/Library/GameClient/DDCLGameClientLibrary.cs similarity index 100% rename from DodocoTales-HSR/Library/GameClient/DDCLGameClientLibrary.cs rename to DodocoTales.StarRail/Library/GameClient/DDCLGameClientLibrary.cs diff --git a/DodocoTales-HSR/Library/GameClient/Models/DDCLGameClientItem.cs b/DodocoTales.StarRail/Library/GameClient/Models/DDCLGameClientItem.cs similarity index 100% rename from DodocoTales-HSR/Library/GameClient/Models/DDCLGameClientItem.cs rename to DodocoTales.StarRail/Library/GameClient/Models/DDCLGameClientItem.cs diff --git a/DodocoTales-HSR/Library/MetadataLibrary/DDCLMetadataVersionLibrary.cs b/DodocoTales.StarRail/Library/MetadataLibrary/DDCLMetadataVersionLibrary.cs similarity index 94% rename from DodocoTales-HSR/Library/MetadataLibrary/DDCLMetadataVersionLibrary.cs rename to DodocoTales.StarRail/Library/MetadataLibrary/DDCLMetadataVersionLibrary.cs index d4272a5..7d460e9 100644 --- a/DodocoTales-HSR/Library/MetadataLibrary/DDCLMetadataVersionLibrary.cs +++ b/DodocoTales.StarRail/Library/MetadataLibrary/DDCLMetadataVersionLibrary.cs @@ -17,8 +17,8 @@ public class DDCLMetadataVersionLibrary public readonly string libPath = @"Library/Version.json"; public readonly string libUpdateInfoPath = @"Library/Version.Update.json"; DDCLMetadataVersion model; - public string ClientVersion { get { return model?.ClientVersion; } set { model.ClientVersion = value; SaveLibrary(); } } - public string BannerLibraryVersion { get { return model?.BannerLibraryVersion; } set { model.BannerLibraryVersion = value; SaveLibrary(); } } + public string ClientVersion { get { return model?.ClientVersion; } set { if (model == null) model = new DDCLMetadataVersion(); model.ClientVersion = value; SaveLibrary(); } } + public string BannerLibraryVersion { get { return model?.BannerLibraryVersion; } set { if (model == null) model = new DDCLMetadataVersion(); model.BannerLibraryVersion = value; SaveLibrary(); } } public bool FirstRunAfterUpdate { get; set; } diff --git a/DodocoTales-HSR/Library/MetadataLibrary/Models/DDCLMetadataVersion.cs b/DodocoTales.StarRail/Library/MetadataLibrary/Models/DDCLMetadataVersion.cs similarity index 100% rename from DodocoTales-HSR/Library/MetadataLibrary/Models/DDCLMetadataVersion.cs rename to DodocoTales.StarRail/Library/MetadataLibrary/Models/DDCLMetadataVersion.cs diff --git a/DodocoTales-HSR/Library/Settings/DDCLSettingsLibrary.cs b/DodocoTales.StarRail/Library/Settings/DDCLSettingsLibrary.cs similarity index 100% rename from DodocoTales-HSR/Library/Settings/DDCLSettingsLibrary.cs rename to DodocoTales.StarRail/Library/Settings/DDCLSettingsLibrary.cs diff --git a/DodocoTales-HSR/Library/Settings/Models/DDCLSettingsInfo.cs b/DodocoTales.StarRail/Library/Settings/Models/DDCLSettingsInfo.cs similarity index 100% rename from DodocoTales-HSR/Library/Settings/Models/DDCLSettingsInfo.cs rename to DodocoTales.StarRail/Library/Settings/Models/DDCLSettingsInfo.cs diff --git a/DodocoTales-HSR/Library/UserDataLibrary/DDCLUserDataLibrary.cs b/DodocoTales.StarRail/Library/UserDataLibrary/DDCLUserDataLibrary.cs similarity index 100% rename from DodocoTales-HSR/Library/UserDataLibrary/DDCLUserDataLibrary.cs rename to DodocoTales.StarRail/Library/UserDataLibrary/DDCLUserDataLibrary.cs diff --git a/DodocoTales-HSR/Library/UserDataLibrary/Models/DDCLGachaLogItem.cs b/DodocoTales.StarRail/Library/UserDataLibrary/Models/DDCLGachaLogItem.cs similarity index 100% rename from DodocoTales-HSR/Library/UserDataLibrary/Models/DDCLGachaLogItem.cs rename to DodocoTales.StarRail/Library/UserDataLibrary/Models/DDCLGachaLogItem.cs diff --git a/DodocoTales-HSR/Library/UserDataLibrary/Models/DDCLUserGachaLog.cs b/DodocoTales.StarRail/Library/UserDataLibrary/Models/DDCLUserGachaLog.cs similarity index 100% rename from DodocoTales-HSR/Library/UserDataLibrary/Models/DDCLUserGachaLog.cs rename to DodocoTales.StarRail/Library/UserDataLibrary/Models/DDCLUserGachaLog.cs diff --git a/DodocoTales-HSR/Loader/DDCG.cs b/DodocoTales.StarRail/Loader/DDCG.cs similarity index 100% rename from DodocoTales-HSR/Loader/DDCG.cs rename to DodocoTales.StarRail/Loader/DDCG.cs diff --git a/DodocoTales-HSR/Loader/DDCGGachaLogMerger.cs b/DodocoTales.StarRail/Loader/DDCGGachaLogMerger.cs similarity index 100% rename from DodocoTales-HSR/Loader/DDCGGachaLogMerger.cs rename to DodocoTales.StarRail/Loader/DDCGGachaLogMerger.cs diff --git a/DodocoTales-HSR/Loader/DDCGGameClientLoader.cs b/DodocoTales.StarRail/Loader/DDCGGameClientLoader.cs similarity index 100% rename from DodocoTales-HSR/Loader/DDCGGameClientLoader.cs rename to DodocoTales.StarRail/Loader/DDCGGameClientLoader.cs diff --git a/DodocoTales-HSR/Loader/DDCGProxyLoader.cs b/DodocoTales.StarRail/Loader/DDCGProxyLoader.cs similarity index 100% rename from DodocoTales-HSR/Loader/DDCGProxyLoader.cs rename to DodocoTales.StarRail/Loader/DDCGProxyLoader.cs diff --git a/DodocoTales-HSR/Loader/DDCGUpdateLoader.cs b/DodocoTales.StarRail/Loader/DDCGUpdateLoader.cs similarity index 100% rename from DodocoTales-HSR/Loader/DDCGUpdateLoader.cs rename to DodocoTales.StarRail/Loader/DDCGUpdateLoader.cs diff --git a/DodocoTales-HSR/Loader/DDCGWebGachaLogLoader.cs b/DodocoTales.StarRail/Loader/DDCGWebGachaLogLoader.cs similarity index 100% rename from DodocoTales-HSR/Loader/DDCGWebGachaLogLoader.cs rename to DodocoTales.StarRail/Loader/DDCGWebGachaLogLoader.cs diff --git a/DodocoTales-HSR/Loader/Models/DDCGGachaLogResponse.cs b/DodocoTales.StarRail/Loader/Models/DDCGGachaLogResponse.cs similarity index 100% rename from DodocoTales-HSR/Loader/Models/DDCGGachaLogResponse.cs rename to DodocoTales.StarRail/Loader/Models/DDCGGachaLogResponse.cs diff --git a/DodocoTales-HSR/Loader/Models/DDCGGachaLogResponseItem.cs b/DodocoTales.StarRail/Loader/Models/DDCGGachaLogResponseItem.cs similarity index 100% rename from DodocoTales-HSR/Loader/Models/DDCGGachaLogResponseItem.cs rename to DodocoTales.StarRail/Loader/Models/DDCGGachaLogResponseItem.cs diff --git a/DodocoTales-HSR/MainWindow.xaml b/DodocoTales.StarRail/MainWindow.xaml similarity index 100% rename from DodocoTales-HSR/MainWindow.xaml rename to DodocoTales.StarRail/MainWindow.xaml diff --git a/DodocoTales-HSR/MainWindow.xaml.cs b/DodocoTales.StarRail/MainWindow.xaml.cs similarity index 100% rename from DodocoTales-HSR/MainWindow.xaml.cs rename to DodocoTales.StarRail/MainWindow.xaml.cs diff --git a/DodocoTales-HSR/Properties/AssemblyInfo.cs b/DodocoTales.StarRail/Properties/AssemblyInfo.cs similarity index 100% rename from DodocoTales-HSR/Properties/AssemblyInfo.cs rename to DodocoTales.StarRail/Properties/AssemblyInfo.cs diff --git a/DodocoTales-HSR/Properties/Resources.Designer.cs b/DodocoTales.StarRail/Properties/Resources.Designer.cs similarity index 100% rename from DodocoTales-HSR/Properties/Resources.Designer.cs rename to DodocoTales.StarRail/Properties/Resources.Designer.cs diff --git a/DodocoTales-HSR/Properties/Resources.resx b/DodocoTales.StarRail/Properties/Resources.resx similarity index 100% rename from DodocoTales-HSR/Properties/Resources.resx rename to DodocoTales.StarRail/Properties/Resources.resx diff --git a/DodocoTales-HSR/Properties/Settings.Designer.cs b/DodocoTales.StarRail/Properties/Settings.Designer.cs similarity index 100% rename from DodocoTales-HSR/Properties/Settings.Designer.cs rename to DodocoTales.StarRail/Properties/Settings.Designer.cs diff --git a/DodocoTales-HSR/Properties/Settings.settings b/DodocoTales.StarRail/Properties/Settings.settings similarity index 100% rename from DodocoTales-HSR/Properties/Settings.settings rename to DodocoTales.StarRail/Properties/Settings.settings diff --git a/DodocoTales-HSR/packages.config b/DodocoTales.StarRail/packages.config similarity index 100% rename from DodocoTales-HSR/packages.config rename to DodocoTales.StarRail/packages.config diff --git a/StarRailWrapObserve.sln b/StarRailWarpObserve.sln similarity index 93% rename from StarRailWrapObserve.sln rename to StarRailWarpObserve.sln index 0cea341..17cfce5 100644 --- a/StarRailWrapObserve.sln +++ b/StarRailWarpObserve.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.2.32616.157 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DodocoTales.StarRail", "DodocoTales-HSR\DodocoTales.StarRail.csproj", "{4C70370C-2661-4088-9821-5FA391564627}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DodocoTales.StarRail", "DodocoTales.StarRail\DodocoTales.StarRail.csproj", "{4C70370C-2661-4088-9821-5FA391564627}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Updater", "Updater\Updater.csproj", "{2B10FF4B-41B8-41C4-A5D1-FDEA5F52A16D}" EndProject diff --git a/Updater/Program.cs b/Updater/Program.cs index 4097e78..6e36cfc 100644 --- a/Updater/Program.cs +++ b/Updater/Program.cs @@ -22,7 +22,7 @@ static void Main(string[] args) return; } Thread.Sleep(5000); - var prols = Process.GetProcessesByName("SRWrapObserve"); + var prols = Process.GetProcessesByName("SRWarpObserve"); if (prols.Any()) { foreach (var pro in prols)