Merge branch 'dev'

ShutovKS · Feb 25, 2024 · d0d2417 · d0d2417
2 parents 66d5c8f + 42dced7
commit d0d2417
Show file tree

Hide file tree

Showing 82 changed files with 64,088 additions and 148 deletions.
diff --git a/src/Visual novel/Assembly-CSharp.csproj.DotSettings b/src/Visual novel/Assembly-CSharp.csproj.DotSettings
@@ -1,5 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cproject_0020files/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cproject_0020files_005Cscripts/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cproject_0020files_005Cscripts_005Cunit/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005C_005Fproject/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005C_005Fproject_005Cscripts/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/src/Visual novel/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/src/Visual novel/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
@@ -57,6 +57,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 46fd095b9a5968a4fb70e3f242e7f9c8
+    m_Address: Screens/ImageCaptureForSave
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   m_ReadOnly: 0
   m_Settings: {fileID: 11400000, guid: 3c6c5518033928745b3226d9f12dab01, type: 2}
   m_SchemaSet:

diff --git a/src/Visual novel/Assets/AddressableAssetsData/link.xml b/src/Visual novel/Assets/AddressableAssetsData/link.xml
@@ -0,0 +1,91 @@
+<linker>
+  <assembly fullname="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UI.Background.BackgroundUI" preserve="all" />
+    <type fullname="UI.ChooseLanguage.ChooseLanguageUI" preserve="all" />
+    <type fullname="UI.ChooseLanguage.LanguageUI" preserve="all" />
+    <type fullname="UI.Confirmation.ConfirmationButtonsUI" preserve="all" />
+    <type fullname="UI.Confirmation.ConfirmationTextUI" preserve="all" />
+    <type fullname="UI.Confirmation.ConfirmationUI" preserve="all" />
+    <type fullname="UI.Dialogue.AnswerOptionsUI" preserve="all" />
+    <type fullname="UI.Dialogue.AnswerOptionUI" preserve="all" />
+    <type fullname="UI.Dialogue.ButtonsUI" preserve="all" />
+    <type fullname="UI.Dialogue.DialogueTextUI" preserve="all" />
+    <type fullname="UI.Dialogue.DialogueUI" preserve="all" />
+    <type fullname="UI.Dialogue.HistoryPhraseUI" preserve="all" />
+    <type fullname="UI.Dialogue.HistoryUI" preserve="all" />
+    <type fullname="UI.Dialogue.PersonAvatarUI" preserve="all" />
+    <type fullname="UI.ImageCaptureForSave.ImageCaptureForSaveUI" preserve="all" />
+    <type fullname="UI.LastWords.LastWordsUI" preserve="all" />
+    <type fullname="UI.MainMenu.ButtonsUI" preserve="all" />
+    <type fullname="UI.MainMenu.GameNameUI" preserve="all" />
+    <type fullname="UI.MainMenu.MainMenuUI" preserve="all" />
+    <type fullname="UI.SaveLoad.ButtonsUI" preserve="all" />
+    <type fullname="UI.SaveLoad.SaveLoadUI" preserve="all" />
+    <type fullname="UI.SaveLoad.WindowSaveLoadUI" preserve="all" />
+    <type fullname="UI.ChooseLanguage.ScrollViewLanguagesUI" preserve="nothing" serialized="true" />
+  </assembly>
+  <assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
+  </assembly>
+  <assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.LegacyResourcesProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
+  </assembly>
+  <assembly fullname="Unity.TextMeshPro, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="TMPro.TextMeshProUGUI" preserve="all" />
+    <type fullname="TMPro.TMP_FontAsset" preserve="all" />
+    <type fullname="TMPro.FaceInfo_Legacy" preserve="nothing" serialized="true" />
+    <type fullname="TMPro.FontAssetCreationSettings" preserve="nothing" serialized="true" />
+    <type fullname="TMPro.KerningTable" preserve="nothing" serialized="true" />
+    <type fullname="TMPro.TMP_Character" preserve="nothing" serialized="true" />
+    <type fullname="TMPro.TMP_FontFeatureTable" preserve="nothing" serialized="true" />
+    <type fullname="TMPro.TMP_FontWeightPair" preserve="nothing" serialized="true" />
+    <type fullname="TMPro.VertexGradient" preserve="nothing" serialized="true" />
+  </assembly>
+  <assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UnityEngine.GameObject" preserve="all" />
+    <type fullname="UnityEngine.Material" preserve="all" />
+    <type fullname="UnityEngine.Object" preserve="all" />
+    <type fullname="UnityEngine.RectTransform" preserve="all" />
+    <type fullname="UnityEngine.Shader" preserve="all" />
+    <type fullname="UnityEngine.Sprite" preserve="all" />
+    <type fullname="UnityEngine.Texture2D" preserve="all" />
+    <type fullname="UnityEngine.Transform" preserve="all" />
+    <type fullname="UnityEngine.Events.PersistentCallGroup" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.RectOffset" preserve="nothing" serialized="true" />
+  </assembly>
+  <assembly fullname="UnityEngine.TextRenderingModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UnityEngine.Font" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UnityEngine.UI.Button" preserve="all" />
+    <type fullname="UnityEngine.UI.CanvasScaler" preserve="all" />
+    <type fullname="UnityEngine.UI.GraphicRaycaster" preserve="all" />
+    <type fullname="UnityEngine.UI.Image" preserve="all" />
+    <type fullname="UnityEngine.UI.Mask" preserve="all" />
+    <type fullname="UnityEngine.UI.Scrollbar" preserve="all" />
+    <type fullname="UnityEngine.UI.ScrollRect" preserve="all" />
+    <type fullname="UnityEngine.UI.VerticalLayoutGroup" preserve="all" />
+    <type fullname="UnityEngine.UI.AnimationTriggers" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.UI.Button/ButtonClickedEvent" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.UI.ColorBlock" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.UI.MaskableGraphic/CullStateChangedEvent" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.UI.Navigation" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.UI.ScrollRect/ScrollRectEvent" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.UI.Scrollbar/ScrollEvent" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.UI.SpriteState" preserve="nothing" serialized="true" />
+  </assembly>
+  <assembly fullname="UnityEngine.UIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+    <type fullname="UnityEngine.Canvas" preserve="all" />
+    <type fullname="UnityEngine.CanvasRenderer" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.TextCoreFontEngineModule">
+    <type fullname="UnityEngine.TextCore.FaceInfo" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.TextCore.Glyph" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.TextCore.GlyphMetrics" preserve="nothing" serialized="true" />
+    <type fullname="UnityEngine.TextCore.GlyphRect" preserve="nothing" serialized="true" />
+  </assembly>
+</linker>
diff --git a/src/Visual novel/Assets/AddressableAssetsData/link.xml.meta b/src/Visual novel/Assets/AddressableAssetsData/link.xml.meta
diff --git a/src/Visual novel/Assets/Plugins/BuildsManager/Settings/GeneralBuildData.asset b/src/Visual novel/Assets/Plugins/BuildsManager/Settings/GeneralBuildData.asset
@@ -13,52 +13,52 @@ MonoBehaviour:
   m_Name: GeneralBuildData
   m_EditorClassIdentifier: 
   isReleaseBuild: 1
-  isNeedZip: 0
+  isNeedZip: 1
   builds:
-  - isEnabled: 1
+  - isEnabled: 0
     isCompress: 0
-    buildPath: Builds/Windows32_1.0.2/Between_Two_Worlds_1.0.2/Between_Two_Worlds.exe
+    buildPath: Builds/Windows32_1.0.4/Between_Two_Worlds.exe
     addonsUsed: 0
     options: 0
     target: 5
     targetGroup: 1
-  - isEnabled: 1
+  - isEnabled: 0
     isCompress: 0
-    buildPath: Builds/Windows64_1.0.2/Between_Two_Worlds_1.0.2/Between_Two_Worlds.exe
+    buildPath: Builds/Windows64_1.0.4/Between_Two_Worlds.exe
     addonsUsed: 0
     options: 0
     target: 19
     targetGroup: 1
-  - isEnabled: 1
+  - isEnabled: 0
     isCompress: 0
-    buildPath: Builds/Linux_1.0.2/Between_Two_Worlds_1.0.2/Between_Two_Worldsx86_64
+    buildPath: Builds/Linux_1.0.4/Between_Two_Worldsx86_64
     addonsUsed: 0
     options: 0
     target: 24
     targetGroup: 1
-  - isEnabled: 1
+  - isEnabled: 0
     isCompress: 0
-    buildPath: Builds/Android_1.0.2/Between_Two_Worlds_1.0.2/Between_Two_Worlds.apk
+    buildPath: Builds/Android_1.0.4/Between_Two_Worlds.apk
     addonsUsed: 0
     options: 0
     target: 13
     targetGroup: 7
-  - isEnabled: 1
+  - isEnabled: 0
     isCompress: 0
-    buildPath: Builds/WebGL_1.0.2/Between_Two_Worlds_1.0.2/Between_Two_Worlds
+    buildPath: Builds/WebGL_1.0.4/Between_Two_Worlds
     addonsUsed: 0
-    options: 0
+    options: 4
     target: 20
     targetGroup: 13
   - isEnabled: 1
     isCompress: 0
-    buildPath: Builds/WebGL_YandexGame1.0.2/Between_Two_Worlds_1.0.2/Between_Two_Worlds
+    buildPath: Builds/WebGL_YandexGame1.0.4/Between_Two_Worlds
     addonsUsed: 1
-    options: 0
+    options: 4
     target: 20
     targetGroup: 13
   addonsUsed: 0
   generalScriptingDefineSymbols: 
   outputRoot: Builds/
-  middlePath: $PLATFORM_$ADDONS$VERSION/$NAME_$VERSION/$NAME$EXECUTABLE
+  middlePath: $PLATFORM_$ADDONS$VERSION/$NAME$EXECUTABLE
   dirPathForPostProcess: $PLATFORM_$ADDONS$VERSION
diff --git a/src/Visual novel/Assets/Project Files/Data/Addressables/Screens/BackgroundScreen.prefab b/src/Visual novel/Assets/Project Files/Data/Addressables/Screens/BackgroundScreen.prefab
@@ -152,7 +152,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _backgroundImage: {fileID: 4300806037247321405}
-  _backgroundScreenGameObject: {fileID: 6922902121283289269}
+  canvas: {fileID: 3786040181869080432}
 --- !u!1 &7873796638826089811
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/src/Visual novel/Assets/Project Files/Data/Addressables/Screens/ConfirmationScreen.prefab b/src/Visual novel/Assets/Project Files/Data/Addressables/Screens/ConfirmationScreen.prefab
@@ -1062,6 +1062,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 195cb20d696e8734ea121543a065fb48, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _confirmationScreenGameObject: {fileID: 5290560068533709456}
+  canvas: {fileID: 1522671980725902596}
   <Buttons>k__BackingField: {fileID: 4096363266801128770}
   <Text>k__BackingField: {fileID: 8438593658389667757}
diff --git a/src/Visual novel/Assets/Project Files/Data/Addressables/Screens/DialogueScreen.prefab b/src/Visual novel/Assets/Project Files/Data/Addressables/Screens/DialogueScreen.prefab
@@ -696,7 +696,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d4df10d7bdf447b585e3f01c13d2558b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _dialogueScreenGameObject: {fileID: 4136458253577208461}
+  canvas: {fileID: 6686033194798059184}
   <Answers>k__BackingField: {fileID: 2108221363639294097}
   <Person>k__BackingField: {fileID: 8747564789639568428}
   <DialogueText>k__BackingField: {fileID: 1669926806809939411}