diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index d86e90f05..0259f8adc 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 09546aca93a801441859af2a811fe53b m_currentHash: serializedVersion: 2 - Hash: 92887b53eb328d427e9a7895257dc677 + Hash: 6ed6d2f19819e4cad99abc794df1ec73 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_BundleLocalCatalog: 0 @@ -48,10 +48,9 @@ MonoBehaviour: - {fileID: 11400000, guid: b9026802c7966cf4799a8df997d603e3, type: 2} - {fileID: 11400000, guid: d582f9080605ab34cbcde3249c980030, type: 2} - {fileID: 11400000, guid: 54799118a585dda439cab043d56ec68c, type: 2} - - {fileID: 11400000, guid: 7ef6dfbb568739341818a3c18623ef6a, type: 2} - {fileID: 11400000, guid: b593dc98ea11a484995123de77d9bf1a, type: 2} - {fileID: 11400000, guid: 62a92c74b9bd5bd439690727c1831500, type: 2} - - {fileID: 11400000, guid: 999dab2963249f7468bdacbd80c1b764, type: 2} + - {fileID: 11400000, guid: 2534b5778664d10419ffabfb1f40ef7d, type: 2} m_BuildSettings: m_CompileScriptsInVirtualMode: 0 m_CleanupStreamingAssetsAfterBuilds: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Prefabs.asset b/Assets/AddressableAssetsData/AssetGroups/Prefabs.asset index 9edfd3fde..e3f7de6f9 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Prefabs.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Prefabs.asset @@ -28,3 +28,4 @@ MonoBehaviour: m_Schemas: - {fileID: 11400000, guid: 2bcd0e1e759f58642bfebbbfb2675973, type: 2} - {fileID: 11400000, guid: 72228f7d1b854a642aca5fbc9bc7488c, type: 2} + - {fileID: 11400000, guid: e681af37b5cf1164eb54957a45d00347, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_PlayerDataGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_PlayerDataGroupSchema.asset new file mode 100644 index 000000000..44d3c45a6 --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_PlayerDataGroupSchema.asset @@ -0,0 +1,17 @@ +%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: b1487f5d688e4f94f828f879d599dbdc, type: 3} + m_Name: Prefabs_PlayerDataGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: 2534b5778664d10419ffabfb1f40ef7d, type: 2} + m_IncludeResourcesFolders: 1 + m_IncludeBuildSettingsScenes: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_PlayerDataGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_PlayerDataGroupSchema.asset.meta new file mode 100644 index 000000000..9627da3aa --- /dev/null +++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_PlayerDataGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e681af37b5cf1164eb54957a45d00347 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml deleted file mode 100644 index f8726f7df..000000000 --- a/Assets/AddressableAssetsData/link.xml +++ /dev/null @@ -1,415 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/RawResources/Back/城市夕阳.png.meta b/Assets/RawResources/Back/城市夕阳.png.meta index b58da0f26..9326384a5 100644 --- a/Assets/RawResources/Back/城市夕阳.png.meta +++ b/Assets/RawResources/Back/城市夕阳.png.meta @@ -69,10 +69,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 2 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/RawResources/Back/城市夜晚.png.meta b/Assets/RawResources/Back/城市夜晚.png.meta index d0fcaf599..ab641be99 100644 --- a/Assets/RawResources/Back/城市夜晚.png.meta +++ b/Assets/RawResources/Back/城市夜晚.png.meta @@ -69,10 +69,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 2 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/RawResources/Back/城市黎明城市.png.meta b/Assets/RawResources/Back/城市黎明城市.png.meta index 908c69a38..18912e2ce 100644 --- a/Assets/RawResources/Back/城市黎明城市.png.meta +++ b/Assets/RawResources/Back/城市黎明城市.png.meta @@ -69,10 +69,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 2 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Render/Renderer2Dtest.asset b/Assets/Render/Renderer2Dtest.asset index 20b6152ad..bd16daaa1 100644 --- a/Assets/Render/Renderer2Dtest.asset +++ b/Assets/Render/Renderer2Dtest.asset @@ -513,15 +513,19 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 _filter: - - 0.007228916 - - 0.043749984 - - 0.12409639 - - 0.20444278 - - 0.24096388 - - 0.20444278 - - 0.12409639 - - 0.043749984 - - 0.007228916 + - 0.0048309183 + - 0.016401261 + - 0.04532712 + - 0.08293076 + - 0.12053438 + - 0.14946026 + - 0.1610306 + - 0.14946026 + - 0.12053438 + - 0.08293076 + - 0.04532712 + - 0.016401261 + - 0.0048309183 --- !u!114 &-6086986437317696584 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Scenes/OPTest.unity b/Assets/Scenes/OPTest.unity index 3d5f34a30..a65b98135 100644 --- a/Assets/Scenes/OPTest.unity +++ b/Assets/Scenes/OPTest.unity @@ -229,6 +229,251 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &103077966 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 103077971} + - component: {fileID: 103077970} + - component: {fileID: 103077969} + - component: {fileID: 103077968} + - component: {fileID: 103077967} + m_Layer: 0 + m_Name: Square (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &103077967 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 103077966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8705f3cf6aa543e39481fd5a8c98f721, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &103077968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 103077966} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 103077967} + m_TargetAssemblyTypeName: AibisDream.TriggerTest, Assembly-CSharp + m_MethodName: OnPointerEnter + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: [] +--- !u!61 &103077969 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 103077966} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &103077970 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 103077966} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &103077971 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 103077966} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.152425, y: -3.134115, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &875433551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 875433554} + - component: {fileID: 875433553} + - component: {fileID: 875433552} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &875433552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 875433551} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &875433553 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 875433551} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &875433554 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 875433551} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &899700732 GameObject: m_ObjectHideFlags: 0 @@ -406,14 +651,13 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1409397678} - - component: {fileID: 1409397679} m_Layer: 0 m_Name: OpRoot m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1409397678 Transform: m_ObjectHideFlags: 0 @@ -432,27 +676,6 @@ Transform: - {fileID: 1961630843} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &1409397679 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1409397677} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1631142626 GameObject: m_ObjectHideFlags: 0 @@ -599,13 +822,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1961630843} + - component: {fileID: 1961630844} m_Layer: 0 m_Name: City m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1961630843 Transform: m_ObjectHideFlags: 0 @@ -623,6 +847,23 @@ Transform: - {fileID: 1142087280} m_Father: {fileID: 1409397678} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1961630844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961630842} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 46b06a7e067e04142a7715ae3571abde, type: 3} + m_Name: + m_EditorClassIdentifier: + sprites: + - {fileID: 21300000, guid: 4a5fa5e37dcc5de4c9d60a4e182082d1, type: 3} + - {fileID: 21300000, guid: b9bc66b473fa0694ea435860b272e476, type: 3} + - {fileID: 21300000, guid: 106d4594ed76dd5418987646aa7a61bb, type: 3} + fadeRadio: 0.3 --- !u!4 &544582782120738436 Transform: m_ObjectHideFlags: 0 @@ -653,18 +894,6 @@ Transform: m_Children: [] m_Father: {fileID: 7878350318588464646} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!210 &1085558427379555331 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6969460405161338467} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1 - m_SortAtRoot: 0 --- !u!212 &1826857772296429145 SpriteRenderer: m_ObjectHideFlags: 0 @@ -733,7 +962,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2537073069275785521 Transform: m_ObjectHideFlags: 0 @@ -817,7 +1046,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2779701727718134091 Transform: m_ObjectHideFlags: 0 @@ -953,7 +1182,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &3747464629480801101 Transform: m_ObjectHideFlags: 0 @@ -1037,7 +1266,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &4137358311507739380 GameObject: m_ObjectHideFlags: 0 @@ -1048,6 +1277,9 @@ GameObject: m_Component: - component: {fileID: 8956069381302392700} - component: {fileID: 3564758508944586520} + - component: {fileID: 8956069381302392701} + - component: {fileID: 8956069381302392702} + - component: {fileID: 8956069381302392703} m_Layer: 0 m_Name: fenzhen m_TagString: Untagged @@ -1123,7 +1355,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &5368080179919599142 GameObject: m_ObjectHideFlags: 0 @@ -1140,7 +1372,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!212 &5737484090166123053 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1202,14 +1434,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7878350318588464646} - - component: {fileID: 1085558427379555331} + - component: {fileID: 7878350318588464647} m_Layer: 0 m_Name: Clock m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &7413731904273156045 Transform: m_ObjectHideFlags: 0 @@ -1247,6 +1479,18 @@ Transform: - {fileID: 3747464629480801101} m_Father: {fileID: 1409397678} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!210 &7878350318588464647 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6969460405161338467} + m_Enabled: 1 + m_SortingLayerID: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 0 + m_SortAtRoot: 0 --- !u!4 &8956069381302392700 Transform: m_ObjectHideFlags: 0 @@ -1262,9 +1506,103 @@ Transform: m_Children: [] m_Father: {fileID: 7878350318588464646} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &8956069381302392701 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4137358311507739380} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.007195592, y: -1.6963542} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.50000095, y: 0.88549614} + oldSize: {x: 0.18604651, y: 3.0465117} + newSize: {x: 0.18604651, y: 3.0465117} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.45947424, y: 2.0026402} + m_EdgeRadius: 0 +--- !u!114 &8956069381302392702 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4137358311507739380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c4fbab01ad40c2449c849cd2a8c620f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: [] + - eventID: 1 + callback: + m_PersistentCalls: + m_Calls: [] + - eventID: 5 + callback: + m_PersistentCalls: + m_Calls: [] + - eventID: 13 + callback: + m_PersistentCalls: + m_Calls: [] + - eventID: 14 + callback: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &8956069381302392703 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4137358311507739380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a04d4c06c6864b9cbaeb9d798ef6908d, type: 3} + m_Name: + m_EditorClassIdentifier: + rotationSpeedLimit: 10 + rotationThreshold: 30 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1631142629} - {fileID: 1409397678} + - {fileID: 875433554} + - {fileID: 103077971} diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index b455b043c..54d7596d8 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -63636,5 +63636,5 @@ SceneRoots: - {fileID: 1450136610} - {fileID: 1343879457} - {fileID: 1009826577} - - {fileID: 1655147933} - {fileID: 1110722291} + - {fileID: 1655147933} diff --git a/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs b/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs index 93b761c97..42a0d5a78 100644 --- a/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs +++ b/Assets/Scripts/Framework/EventSystemKit/EventTriggerEx.cs @@ -1,3 +1,4 @@ +using System; using System.Linq; using UnityEngine; using UnityEngine.Events; @@ -75,12 +76,14 @@ namespace AibisDream.Framework public override void OnPointerEnter(PointerEventData data) { + Debug.Log("enter"); EventSystemEx.Instance.OnPointerEnter(_interaction); base.OnPointerEnter(data); } public override void OnPointerExit(PointerEventData data) { + Debug.Log("exit"); EventSystemEx.Instance.OnPointerExit(_interaction); base.OnPointerExit(data); } diff --git a/Assets/Scripts/TimeLine.meta b/Assets/Scripts/Framework/PlayKit.meta similarity index 77% rename from Assets/Scripts/TimeLine.meta rename to Assets/Scripts/Framework/PlayKit.meta index 6c4a692b8..2c6355d60 100644 --- a/Assets/Scripts/TimeLine.meta +++ b/Assets/Scripts/Framework/PlayKit.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 739462617160ec64eb44e38a3fe4bc3d +guid: c00f5e40d3b7f9a48a72591616c67de4 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Framework/PlayKit/SpriteLooper.cs b/Assets/Scripts/Framework/PlayKit/SpriteLooper.cs new file mode 100644 index 000000000..b4429c06f --- /dev/null +++ b/Assets/Scripts/Framework/PlayKit/SpriteLooper.cs @@ -0,0 +1,74 @@ +using UnityEngine; + +namespace AibisDream.Kit +{ + public class SpriteLooper : MonoBehaviour + { + private SpriteRenderer _fadeOutRenderer; + private SpriteRenderer _fadeInRenderer; + + public Sprite[] sprites; + [Range(0, 1)]public float fadeRadio; + + public float CurProgress { get; private set; } + + private void Awake() + { + InitRefs(); + } + + private void InitRefs() + { + _fadeOutRenderer = transform.Find("Sprite1").GetComponent(); + _fadeInRenderer = transform.Find("Sprite2").GetComponent(); + } + + public void Init() + { + CurProgress = 0; + // 激活初始状态 + _fadeOutRenderer.sprite = sprites[0]; + _fadeOutRenderer.color = Color.white; + _fadeInRenderer.sprite = sprites[1]; + _fadeInRenderer.color = Color.clear; + } + + public void SetLoopProgress(float progress) + { + CurProgress = progress; + + // 将进度条转为图片序号和淡出进度 + var calculator = new LoopDataCalculator(progress, sprites.Length, fadeRadio); + + _fadeOutRenderer.sprite = sprites[calculator.CurIdx]; + _fadeInRenderer.color = calculator.FadeOutColor; + _fadeOutRenderer.sprite = sprites[calculator.NextIdx]; + _fadeInRenderer.color = calculator.FadeInColor; + } + } + + public readonly struct LoopDataCalculator + { + private readonly float _progress; + private readonly float _localProgress; + private readonly float _fadeRadio; + public int CurIdx { get; } + public int NextIdx { get; } + + public LoopDataCalculator(float progress, int spriteCount, float fadeRadio) + { + _progress = progress; + _localProgress = 1 / (float)spriteCount; + _fadeRadio = fadeRadio; + CurIdx = Mathf.FloorToInt(progress / _localProgress); + NextIdx = CurIdx + 1 >= spriteCount - 1 ? 0 : CurIdx + 1; + } + + private float LeftProgress => + Mathf.Clamp01((_progress - (CurIdx + 1 - _fadeRadio) * _localProgress) / (_localProgress * _fadeRadio)); + + public Color FadeOutColor => new(1f, 1f, 1f, 1 - LeftProgress); + + public Color FadeInColor => new(1f, 1f, 1f, LeftProgress); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Framework/PlayKit/SpriteLooper.cs.meta b/Assets/Scripts/Framework/PlayKit/SpriteLooper.cs.meta new file mode 100644 index 000000000..4a8d31c2f --- /dev/null +++ b/Assets/Scripts/Framework/PlayKit/SpriteLooper.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 46b06a7e067e04142a7715ae3571abde +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/Scripts/SpecialPlay.meta similarity index 57% rename from Assets/AddressableAssetsData/link.xml.meta rename to Assets/Scripts/SpecialPlay.meta index 640523d9b..67cd89c7b 100644 --- a/Assets/AddressableAssetsData/link.xml.meta +++ b/Assets/Scripts/SpecialPlay.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: 85d2d28057fa50d419186d2f0c1f82ee -TextScriptImporter: +guid: 85859e891aba8f24e8165a31ab4d04ca +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Scripts/SpecialPlay/DeepInClock.cs b/Assets/Scripts/SpecialPlay/DeepInClock.cs new file mode 100644 index 000000000..2bf842d78 --- /dev/null +++ b/Assets/Scripts/SpecialPlay/DeepInClock.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +namespace AibisDream +{ + public class DeepInClock : MonoBehaviour + { + #region 索引 + + private Transform _minHand; + private Transform _secondHand; + private Transform _hourHand; + + #endregion + } +} diff --git a/Assets/Scripts/SpecialPlay/DeepInClock.cs.meta b/Assets/Scripts/SpecialPlay/DeepInClock.cs.meta new file mode 100644 index 000000000..934f7aa59 --- /dev/null +++ b/Assets/Scripts/SpecialPlay/DeepInClock.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 753608042500c23428ad33810592d3a0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/SpecialPlay/MinHand.cs b/Assets/Scripts/SpecialPlay/MinHand.cs new file mode 100644 index 000000000..26ea82f05 --- /dev/null +++ b/Assets/Scripts/SpecialPlay/MinHand.cs @@ -0,0 +1,101 @@ +using AibisDream.Framework; +using AibisDream.Utility; +using UnityEngine; +using UnityEngine.EventSystems; + +namespace AibisDream +{ + public class MinHand : MonoBehaviour, IInteraction + { + #region 索引 + + private EventTriggerEx _trigger; + + #endregion + + #region 参数 + + public float rotationSpeedLimit = 10f; // 旋转速度限制（度/秒） + public float rotationThreshold = 30f; // 触发事件的角度阈值（度） + + #endregion + + private void Awake() + { + _trigger = GetComponent(); + _trigger.Register(EventTriggerType.PointerEnter, OnPointerEnter); + _trigger.Register(EventTriggerType.BeginDrag, OnBeginDrag); + _trigger.Register(EventTriggerType.EndDrag, OnEndDrag); + _trigger.Register(EventTriggerType.Drag, OnDrag); + + EventSystemEx.Instance.isLocked = false; + } + + private void OnPointerEnter(BaseEventData arg0) + { + Debug.Log("PointerEnter"); + } + + private void OnEndDrag(BaseEventData arg0) + { + Debug.Log("EndDrag"); + } + + private void OnBeginDrag(BaseEventData arg0) + { + Debug.Log("BeginDrag"); + } + + private void OnDrag(BaseEventData data) + { + Debug.Log("Drag"); + // 这里是一些阻碍拖动的情况 + if (!IsActive) return; + + if (data is not PointerEventData pointerData) return; + + // 计算鼠标位置与分针中心点的向量 + Vector2 worldPoint = CommonUtil.GetMouseWorldPos(pointerData.position); + Vector2 direction = worldPoint - new Vector2(transform.position.x, transform.position.y); + // 计算当前角度 + float currentAngle = Mathf.Atan2(direction.y, direction.x) * Mathf.Rad2Deg; + + // 计算角度差 + float deltaAngle = Mathf.DeltaAngle(transform.rotation.z, currentAngle); + + // 限制旋转方向（仅允许逆时针旋转） + if (deltaAngle > 0) + { + deltaAngle = 0; + } + + // 限制旋转速度 + if (Mathf.Abs(deltaAngle) > rotationSpeedLimit * Time.deltaTime) + { + deltaAngle = -rotationSpeedLimit * Time.deltaTime; + } + + // 更新分针的旋转 + transform.Rotate(0, 0, deltaAngle); + + // 触发事件 + // if (_totalRotation >= rotationThreshold) + // { + // // 触发事件逻辑 + // Debug.Log("Rotation threshold reached!"); + // _totalRotation = 0f; // 重置总旋转角度 + // } + } + + #region 交互属性 + + public bool IsActive => true; + public bool IsAvailable => true; + public GameObject GetGameObject() + { + return gameObject; + } + + #endregion + } +} \ No newline at end of file diff --git a/Assets/Scripts/SpecialPlay/MinHand.cs.meta b/Assets/Scripts/SpecialPlay/MinHand.cs.meta new file mode 100644 index 000000000..bc22e34cb --- /dev/null +++ b/Assets/Scripts/SpecialPlay/MinHand.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: a04d4c06c6864b9cbaeb9d798ef6908d +timeCreated: 1746508524 \ No newline at end of file diff --git a/Assets/Scripts/SpecialPlay/TriggerTest.cs b/Assets/Scripts/SpecialPlay/TriggerTest.cs new file mode 100644 index 000000000..596aef3c6 --- /dev/null +++ b/Assets/Scripts/SpecialPlay/TriggerTest.cs @@ -0,0 +1,35 @@ +using AibisDream.Framework; +using UnityEngine; +using UnityEngine.EventSystems; + +namespace AibisDream +{ + public class TriggerTest : MonoBehaviour, IInteraction + { + private EventTrigger _trigger; + + private void Awake() + { + // _trigger = GetComponent(); + // _trigger(EventTriggerType.PointerEnter, OnPointerEnter); + // _trigger.Register(EventTriggerType.BeginDrag, OnBeginDrag); + // _trigger.Register(EventTriggerType.EndDrag, OnEndDrag); + // _trigger.Register(EventTriggerType.Drag, OnDrag); + + // EventSystemEx.Instance.isLocked = false; + } + + public void OnPointerEnter(BaseEventData arg0) + { + Debug.LogWarning(arg0.ToString()); + } + + + public bool IsActive => true; + public bool IsAvailable => true; + public GameObject GetGameObject() + { + return gameObject; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/SpecialPlay/TriggerTest.cs.meta b/Assets/Scripts/SpecialPlay/TriggerTest.cs.meta new file mode 100644 index 000000000..064565745 --- /dev/null +++ b/Assets/Scripts/SpecialPlay/TriggerTest.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 8705f3cf6aa543e39481fd5a8c98f721 +timeCreated: 1746517883 \ No newline at end of file diff --git a/Assets/Scripts/TimeLine/SpriteLoop.meta b/Assets/Scripts/TimeLine/SpriteLoop.meta deleted file mode 100644 index 14238f78d..000000000 --- a/Assets/Scripts/TimeLine/SpriteLoop.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 36223b4e4ec343f9916d0846916b2ac7 -timeCreated: 1746426962 \ No newline at end of file diff --git a/Assets/Scripts/TimeLine/SpriteLoop/SpriteLoopAsset.cs b/Assets/Scripts/TimeLine/SpriteLoop/SpriteLoopAsset.cs deleted file mode 100644 index 4da1147e8..000000000 --- a/Assets/Scripts/TimeLine/SpriteLoop/SpriteLoopAsset.cs +++ /dev/null @@ -1,18 +0,0 @@ -using UnityEngine; -using UnityEngine.Playables; - -namespace AibisDream -{ - public class SpriteLoopAsset : PlayableAsset - { - public override Playable CreatePlayable(PlayableGraph graph, GameObject owner) - { - var playable = ScriptPlayable.Create(graph); - var behaviour = playable.GetBehaviour(); - - // behaviour.targetRenderer = - - return playable; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/TimeLine/SpriteLoop/SpriteLoopAsset.cs.meta b/Assets/Scripts/TimeLine/SpriteLoop/SpriteLoopAsset.cs.meta deleted file mode 100644 index 8bfff5bc8..000000000 --- a/Assets/Scripts/TimeLine/SpriteLoop/SpriteLoopAsset.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 2c1426f388fb47d38898bba5b0a05289 -timeCreated: 1746426976 \ No newline at end of file diff --git a/Assets/Scripts/TimeLine/SpriteLoop/SpriteLoopBehaviour.cs b/Assets/Scripts/TimeLine/SpriteLoop/SpriteLoopBehaviour.cs deleted file mode 100644 index 652622389..000000000 --- a/Assets/Scripts/TimeLine/SpriteLoop/SpriteLoopBehaviour.cs +++ /dev/null @@ -1,10 +0,0 @@ -using UnityEngine; -using UnityEngine.Playables; - -namespace AibisDream -{ - public class SpriteLoopBehaviour : PlayableBehaviour - { - public Renderer targetRenderer; - } -} \ No newline at end of file diff --git a/Assets/Scripts/TimeLine/SpriteLoop/SpriteLoopBehaviour.cs.meta b/Assets/Scripts/TimeLine/SpriteLoop/SpriteLoopBehaviour.cs.meta deleted file mode 100644 index f3ac1e417..000000000 --- a/Assets/Scripts/TimeLine/SpriteLoop/SpriteLoopBehaviour.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 647ac6c4f2be4b248d33ac5abe9d4871 -timeCreated: 1746427045 \ No newline at end of file