diff --git a/Client/Assets/Bundles/Audios/UI.meta b/Client/Assets/Bundles/Audios/UI.meta deleted file mode 100644 index 006349a..0000000 --- a/Client/Assets/Bundles/Audios/UI.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cce56997b037bc84bbf78dfbd0b5987f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/Bundles/Audios/UI/Click.wav b/Client/Assets/Bundles/Audios/UI/Click.wav deleted file mode 100644 index 40fc4d3..0000000 Binary files a/Client/Assets/Bundles/Audios/UI/Click.wav and /dev/null differ diff --git a/Client/Assets/Bundles/Audios/UI/Click.wav.meta b/Client/Assets/Bundles/Audios/UI/Click.wav.meta deleted file mode 100644 index b3218fa..0000000 --- a/Client/Assets/Bundles/Audios/UI/Click.wav.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: b399b083c59f6d240bcad9b7dc52b7d3 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/Bundles/Audios/UI/Hover.wav b/Client/Assets/Bundles/Audios/UI/Hover.wav deleted file mode 100644 index 9bb514c..0000000 Binary files a/Client/Assets/Bundles/Audios/UI/Hover.wav and /dev/null differ diff --git a/Client/Assets/Bundles/Audios/UI/Hover.wav.meta b/Client/Assets/Bundles/Audios/UI/Hover.wav.meta deleted file mode 100644 index 656a551..0000000 --- a/Client/Assets/Bundles/Audios/UI/Hover.wav.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: d7cfd9f6afac6a24794f9a95c6aebcbb -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/Bundles/Configs/bytes/tables_tbachievement.bytes b/Client/Assets/Bundles/Configs/bytes/tables_tbachievement.bytes deleted file mode 100644 index 6ad9832..0000000 --- a/Client/Assets/Bundles/Configs/bytes/tables_tbachievement.bytes +++ /dev/null @@ -1 +0,0 @@ -]J_独自享受的日常`您已解锁“独自享受的日常”路线！恭喜您！这是只属于您一人的物语！成就未解锁]J_神社的守护者W您已赢得巫女玲奈的芳心，并肩负起守护神社的责任！（大概吧）成就未解锁 \ No newline at end of file diff --git a/Client/Assets/Bundles/Configs/bytes/tables_tbachievement.bytes.meta b/Client/Assets/Bundles/Configs/bytes/tables_tbachievement.bytes.meta deleted file mode 100644 index 436e4c0..0000000 --- a/Client/Assets/Bundles/Configs/bytes/tables_tbachievement.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 75eea157ac5c3ae429454d73c741530f -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/InputGlyphDatabase.asset b/Client/Assets/InputGlyphDatabase.asset deleted file mode 100644 index 6197176..0000000 --- a/Client/Assets/InputGlyphDatabase.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 53ed017cef844d11842ba16553c6391d, type: 3} - m_Name: InputGlyphDatabase - m_EditorClassIdentifier: - tables: [] - placeholderSprite: {fileID: 0} diff --git a/Client/Assets/InputGlyphDatabase.asset.meta b/Client/Assets/InputGlyphDatabase.asset.meta deleted file mode 100644 index bbe948d..0000000 --- a/Client/Assets/InputGlyphDatabase.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e43c1733d8e85a5419c0754bbd597e3b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/Event.meta b/Client/Assets/Scripts/Hotfix/GameLogic/Event.meta deleted file mode 100644 index e484060..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/Event.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 5b13f03f2a8a4b3d9c87b8b4cb6e51ba -timeCreated: 1763021850 \ No newline at end of file diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/Event/TestUIOpenEvent.cs b/Client/Assets/Scripts/Hotfix/GameLogic/Event/TestUIOpenEvent.cs deleted file mode 100644 index 51daf14..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/Event/TestUIOpenEvent.cs +++ /dev/null @@ -1,16 +0,0 @@ -using AlicizaX; - -namespace GameLogic.Event -{ - public readonly struct TestUIOpenEvent:IEventArgs - { - public readonly string UIName; - public readonly bool State; - - public TestUIOpenEvent(string uiName, bool state) - { - UIName = uiName; - State = state; - } - } -} diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/Event/TestUIOpenEvent.cs.meta b/Client/Assets/Scripts/Hotfix/GameLogic/Event/TestUIOpenEvent.cs.meta deleted file mode 100644 index c8cf6e7..0000000 --- a/Client/Assets/Scripts/Hotfix/GameLogic/Event/TestUIOpenEvent.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 6e99bec8aaa34153b84e0d09164c9e02 -timeCreated: 1763021859 \ No newline at end of file diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs b/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs index 7b70e7f..5fe5ef7 100644 --- a/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs +++ b/Client/Assets/Scripts/Hotfix/GameLogic/UI/UILoadUpdate.cs @@ -5,7 +5,6 @@ using AlicizaX.UI; using AlicizaX.UI.Runtime; using Cysharp.Threading.Tasks; using Game.UI; -using GameLogic.Event; using GameLogic.UI; using UnityEngine; @@ -74,14 +73,6 @@ public class UILoadUpdate : UITabWindow _list.RecyclerView.TryFocusIndex(0); } - protected override void OnRegisterEvent(EventListenerProxy proxy) - { - proxy.AddUIEvent(OnHandleTestUIOpenEevent); - } - - private void OnHandleTestUIOpenEevent(TestUIOpenEvent obj) - { - } private void OnTestClick() { diff --git a/Client/UserSettings/EditorUserSettings.asset b/Client/UserSettings/EditorUserSettings.asset index d7386d6..61296a3 100644 --- a/Client/UserSettings/EditorUserSettings.asset +++ b/Client/UserSettings/EditorUserSettings.asset @@ -30,14 +30,14 @@ EditorUserSettings: value: 0606045450065e5d55575a241522064444161c797f7b7234757c4f32e1b0353d flags: 0 RecentlyUsedSceneGuid-7: - value: 5001560504060c590f5b0f7245725a44404f1d7c297e2233787e4a36b5e4666b - flags: 0 - RecentlyUsedSceneGuid-8: value: 5a07065703500c59585e0e7748770d44444f4a737d2d7f35787d4f63e0b26668 flags: 0 - RecentlyUsedSceneGuid-9: + RecentlyUsedSceneGuid-8: value: 50500404540c580d0f0b5e7543725b44424f4c7a7b7c7734747e4f36e4b1676d flags: 0 + RecentlyUsedSceneGuid-9: + value: 5001560504060c590f5b0f7245725a44404f1d7c297e2233787e4a36b5e4666b + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0 diff --git a/Client/UserSettings/Layouts/default-2022.dwlt b/Client/UserSettings/Layouts/default-2022.dwlt index 2d071c0..2a49be8 100644 --- a/Client/UserSettings/Layouts/default-2022.dwlt +++ b/Client/UserSettings/Layouts/default-2022.dwlt @@ -14,12 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 1920 - y: 48 + x: 0 + y: 43 width: 1920 height: 997 m_ShowMode: 4 - m_Title: Inspector + m_Title: Project m_RootView: {fileID: 4} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -41,10 +41,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 360 - width: 503 + width: 534 height: 587 - m_MinSize: {x: 50, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 51, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -70,12 +70,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 503 + width: 534 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 17 + controlID: 25 draggingID: 0 --- !u!114 &4 MonoBehaviour: @@ -174,7 +174,7 @@ MonoBehaviour: m_MinSize: {x: 400, y: 100} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 48 + controlID: 149 draggingID: 0 --- !u!114 &8 MonoBehaviour: @@ -193,7 +193,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 503 + width: 534 height: 360 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -219,9 +219,9 @@ MonoBehaviour: - {fileID: 11} m_Position: serializedVersion: 2 - x: 503 + x: 534 y: 0 - width: 421 + width: 189 height: 947 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} @@ -245,7 +245,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 421 + width: 189 height: 465 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} @@ -271,10 +271,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 465 - width: 421 + width: 189 height: 482 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -295,9 +295,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 924 + x: 723 y: 0 - width: 529 + width: 730 height: 947 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} @@ -325,8 +325,8 @@ MonoBehaviour: y: 0 width: 467 height: 947 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -352,9 +352,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1920 - y: 438 - width: 502 + x: 0 + y: 433 + width: 533 height: 566 m_SerializedDataModeController: m_DataMode: 0 @@ -408,10 +408,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 502 + width: 533 height: 545 - m_Scale: {x: 0.26145834, y: 0.26145834} - m_Translation: {x: 251, y: 272.5} + m_Scale: {x: 0.27760416, y: 0.27760416} + m_Translation: {x: 266.5, y: 272.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -419,12 +419,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -960 - y: -1042.2311 + y: -981.6135 width: 1920 - height: 2084.4622 + height: 1963.227 m_MinimalGUI: 1 - m_defaultScale: 0.26145834 - m_LastWindowPixelSize: {x: 502, y: 566} + m_defaultScale: 0.27760416 + m_LastWindowPixelSize: {x: 533, y: 566} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -520,9 +520,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1920 - y: 78 - width: 502 + x: 0 + y: 73 + width: 533 height: 339 m_SerializedDataModeController: m_DataMode: 0 @@ -1163,9 +1163,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2423 - y: 78 - width: 419 + x: 534 + y: 73 + width: 187 height: 444 m_SerializedDataModeController: m_DataMode: 0 @@ -1180,9 +1180,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 8c690000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 2a3dffff363dffff5e3dffff403fffff643fffff6c3fffff8a98ffffa498ffffb098ffffd898ffffba9affffde9affffe69affffc8a1ffffd4a1fffffca1ffffdea3ffff02a4ffff0aa4ffff1cfbfffff4ffffff + m_ExpandedIDs: 20faffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1226,9 +1226,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2423 - y: 543 - width: 419 + x: 534 + y: 538 + width: 187 height: 461 m_SerializedDataModeController: m_DataMode: 0 @@ -1260,9 +1260,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2844 - y: 78 - width: 527 + x: 723 + y: 73 + width: 728 height: 926 m_SerializedDataModeController: m_DataMode: 0 @@ -1284,8 +1284,7 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 2 - m_Folders: - - Assets/YooAsset + m_Folders: [] m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1301,7 +1300,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: e48c0000 m_LastClickedID: 36068 - m_ExpandedIDs: 000000007e020000706a0000726a0000746a0000766a0000786a00007a6a00007c6a00007e6a0000806a0000826a0000846a0000866a0000886a00008a6a00008c6a00008e6a0000906a0000926a0000946a0000966a0000986a00009a6a00009c6a00009e6a0000a06a0000a26a0000a46a0000a66a0000a86a0000aa6a0000ac6a0000ae6a0000b06a0000b26a0000b46a0000b66a0000b86a0000ba6a0000bc6a0000be6a0000c06a0000c26a0000c46a0000c66a0000c86a0000ca6a0000cc6a0000ce6a0000d06a0000d26a0000d46a0000d66a0000d86a0000da6a0000dc6a0000de6a0000e06a0000e26a0000e46a0000e66a0000e86a0000ea6a0000ec6a0000ee6a0000f06a0000f26a0000f46a0000f66a0000f86a0000fa6a0000fc6a0000fe6a0000006b0000026b0000046b0000066b0000086b00000a6b00000c6b00000e6b0000106b0000126b0000146b0000166b0000186b00001a6b00001c6b00001e6b0000206b0000226b0000246b0000266b0000286b00002a6b00002c6b00002e6b0000306b0000326b0000346b0000366b0000386b00003a6b00003c6b0000 + m_ExpandedIDs: 000000007e020000fe0c0000c26a0000c46a0000c66a0000c86a0000ca6a0000cc6a0000ce6a0000d06a0000d26a0000d46a0000d66a0000d86a0000da6a0000dc6a0000de6a0000e06a0000e26a0000e46a0000e66a0000e86a0000ea6a0000ec6a0000ee6a0000f06a0000f26a0000f46a0000f66a0000f86a0000fa6a0000fc6a0000fe6a0000006b0000026b0000046b0000066b0000086b00000a6b00000c6b00000e6b0000106b0000126b0000146b0000166b0000186b00001a6b00001c6b00001e6b0000206b0000226b0000246b0000266b0000286b00002a6b00002c6b00002e6b0000306b0000326b0000346b0000366b0000386b00003a6b00003c6b00003e6b0000406b0000426b0000446b0000466b0000486b00004a6b00004c6b00004e6b0000506b0000526b0000546b0000566b0000586b00005a6b00005c6b00005e6b0000606b0000626b0000646b0000666b0000686b00006a6b00006c6b00006e6b0000706b0000726b0000746b0000766b0000786b00007a6b00007c6b00007e6b0000806b0000826b0000846b0000866b0000886b00008a6b00008c6b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1329,21 +1328,21 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff000000007e020000fe0c0000706a0000726a0000746a0000766a0000786a00007a6a00007c6a00007e6a0000806a0000826a0000846a0000866a0000886a00008a6a00008c6a00008e6a0000906a0000926a0000946a0000966a0000986a00009a6a00009c6a00009e6a0000a06a0000a26a0000a46a0000a66a0000a86a0000aa6a0000ac6a0000ae6a0000b06a0000b26a0000b46a0000b66a0000b86a0000ba6a0000bc6a0000c06a0000c26a0000c46a0000c66a0000c86a0000ca6a0000cc6a0000ce6a0000d06a0000d26a0000d46a0000d66a0000d86a0000da6a0000dc6a0000de6a0000e06a0000e26a0000e46a0000e66a0000e86a0000ea6a0000ec6a0000ee6a0000f06a0000f26a0000f66a0000f86a0000fa6a0000fc6a0000fe6a0000006b0000026b0000046b0000066b0000086b00000a6b00000c6b00000e6b0000106b0000126b0000146b0000166b0000186b00001a6b00001c6b00001e6b0000226b0000246b0000266b0000286b00002a6b00002e6b0000306b0000326b0000346b0000366b0000386b00003a6b00003c6b0000466d0000646d000030760000 + m_ExpandedIDs: ffffffff000000007e020000fe0c0000c26a0000c46a0000c66a0000c86a0000ca6a0000cc6a0000ce6a0000d06a0000d26a0000d46a0000d66a0000d86a0000da6a0000dc6a0000de6a0000e06a0000e26a0000e46a0000e66a0000e86a0000ea6a0000ec6a0000ee6a0000f06a0000f26a0000f46a0000f66a0000f86a0000fa6a0000fc6a0000fe6a0000006b0000026b0000046b0000066b0000086b00000a6b00000c6b00000e6b0000106b0000126b0000146b0000166b0000186b00001a6b00001c6b00001e6b0000206b0000226b0000246b0000266b0000286b00002a6b00002c6b0000306b0000326b0000346b0000366b0000386b00003a6b00003c6b00003e6b0000406b0000426b0000446b0000466b0000486b00004a6b00004c6b00004e6b0000506b0000526b0000546b0000566b0000586b00005a6b00005c6b00005e6b0000606b0000626b0000646b0000666b0000686b00006a6b00006c6b00006e6b0000706b0000726b0000746b0000766b0000786b00007a6b00007c6b00007e6b0000806b0000826b0000846b0000866b0000886b00008c6b0000846d0000966d0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: TestScrollItemRender - m_OriginalName: TestScrollItemRender + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 1808 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 12} m_SearchString: @@ -1405,8 +1404,8 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3373 - y: 78 + x: 1453 + y: 73 width: 466 height: 926 m_SerializedDataModeController: