From fb4211e6ad049954f0d5add9f6582ffedda2753b Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Mon, 12 May 2025 20:08:43 +0800 Subject: [PATCH] OP --- Assets/AddressableAssetsData/link.xml | 417 ------------------ .../Art/深入素材/摄像头maybe.png.meta | 2 +- .../RawResources/Art/深入素材/素材A.png.meta | 2 +- .../RawResources/Art/深入素材/素材B.png.meta | 2 +- .../RawResources/Art/深入素材/素材C.png.meta | 2 +- .../RawResources/Art/深入素材/素材D.png.meta | 2 +- .../RawResources/Art/深入素材/素材F.png.meta | 2 +- .../RawResources/Art/深入素材/素材K.png.meta | 2 +- .../RawResources/Art/深入素材/素材e.png.meta | 2 +- .../RawResources/Art/深入素材/素材g.png.meta | 2 +- .../RawResources/Art/深入素材/素材h.png.meta | 2 +- .../Art/深入素材/素材hongdeng.png.meta | 2 +- .../RawResources/Art/深入素材/素材i.png.meta | 2 +- .../RawResources/Art/深入素材/素材j.png.meta | 2 +- .../Art/深入素材/素材shexiangtou_.png.meta | 2 +- Assets/Scenes/OPTest.unity | 202 ++++++++- .../Scripts/Framework/PlayKit/SpriteDeepIn.cs | 24 +- 17 files changed, 232 insertions(+), 439 deletions(-) delete mode 100644 Assets/AddressableAssetsData/link.xml diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml deleted file mode 100644 index 38f057677..000000000 --- a/Assets/AddressableAssetsData/link.xml +++ /dev/null @@ -1,417 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/RawResources/Art/深入素材/摄像头maybe.png.meta b/Assets/RawResources/Art/深入素材/摄像头maybe.png.meta index 9edfee6d0..293e1d054 100644 --- a/Assets/RawResources/Art/深入素材/摄像头maybe.png.meta +++ b/Assets/RawResources/Art/深入素材/摄像头maybe.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/RawResources/Art/深入素材/素材A.png.meta b/Assets/RawResources/Art/深入素材/素材A.png.meta index 0eb85af11..600aa4b39 100644 --- a/Assets/RawResources/Art/深入素材/素材A.png.meta +++ b/Assets/RawResources/Art/深入素材/素材A.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/RawResources/Art/深入素材/素材B.png.meta b/Assets/RawResources/Art/深入素材/素材B.png.meta index 6d6e1be57..c9dd03c13 100644 --- a/Assets/RawResources/Art/深入素材/素材B.png.meta +++ b/Assets/RawResources/Art/深入素材/素材B.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/RawResources/Art/深入素材/素材C.png.meta b/Assets/RawResources/Art/深入素材/素材C.png.meta index 5401f034c..01179f437 100644 --- a/Assets/RawResources/Art/深入素材/素材C.png.meta +++ b/Assets/RawResources/Art/深入素材/素材C.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/RawResources/Art/深入素材/素材D.png.meta b/Assets/RawResources/Art/深入素材/素材D.png.meta index 9c4dcb671..2e47624fc 100644 --- a/Assets/RawResources/Art/深入素材/素材D.png.meta +++ b/Assets/RawResources/Art/深入素材/素材D.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/RawResources/Art/深入素材/素材F.png.meta b/Assets/RawResources/Art/深入素材/素材F.png.meta index cd68c8832..06dcf4c1a 100644 --- a/Assets/RawResources/Art/深入素材/素材F.png.meta +++ b/Assets/RawResources/Art/深入素材/素材F.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/RawResources/Art/深入素材/素材K.png.meta b/Assets/RawResources/Art/深入素材/素材K.png.meta index 725283574..ba8c8d8a4 100644 --- a/Assets/RawResources/Art/深入素材/素材K.png.meta +++ b/Assets/RawResources/Art/深入素材/素材K.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/RawResources/Art/深入素材/素材e.png.meta b/Assets/RawResources/Art/深入素材/素材e.png.meta index adadf3070..13fc233e6 100644 --- a/Assets/RawResources/Art/深入素材/素材e.png.meta +++ b/Assets/RawResources/Art/深入素材/素材e.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/RawResources/Art/深入素材/素材g.png.meta b/Assets/RawResources/Art/深入素材/素材g.png.meta index fe54cefcb..606c05212 100644 --- a/Assets/RawResources/Art/深入素材/素材g.png.meta +++ b/Assets/RawResources/Art/深入素材/素材g.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/RawResources/Art/深入素材/素材h.png.meta b/Assets/RawResources/Art/深入素材/素材h.png.meta index be5877afe..1f1398997 100644 --- a/Assets/RawResources/Art/深入素材/素材h.png.meta +++ b/Assets/RawResources/Art/深入素材/素材h.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/RawResources/Art/深入素材/素材hongdeng.png.meta b/Assets/RawResources/Art/深入素材/素材hongdeng.png.meta index 64470bc36..c07760b97 100644 --- a/Assets/RawResources/Art/深入素材/素材hongdeng.png.meta +++ b/Assets/RawResources/Art/深入素材/素材hongdeng.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/RawResources/Art/深入素材/素材i.png.meta b/Assets/RawResources/Art/深入素材/素材i.png.meta index c9a778b08..d76ed1ffd 100644 --- a/Assets/RawResources/Art/深入素材/素材i.png.meta +++ b/Assets/RawResources/Art/深入素材/素材i.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/RawResources/Art/深入素材/素材j.png.meta b/Assets/RawResources/Art/深入素材/素材j.png.meta index 5831c15bb..1e103d6d3 100644 --- a/Assets/RawResources/Art/深入素材/素材j.png.meta +++ b/Assets/RawResources/Art/深入素材/素材j.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/RawResources/Art/深入素材/素材shexiangtou_.png.meta b/Assets/RawResources/Art/深入素材/素材shexiangtou_.png.meta index f48bb2cda..834b33079 100644 --- a/Assets/RawResources/Art/深入素材/素材shexiangtou_.png.meta +++ b/Assets/RawResources/Art/深入素材/素材shexiangtou_.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 215 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Scenes/OPTest.unity b/Assets/Scenes/OPTest.unity index 63310b6de..9132014fc 100644 --- a/Assets/Scenes/OPTest.unity +++ b/Assets/Scenes/OPTest.unity @@ -229,6 +229,174 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &46046729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 46046730} + - component: {fileID: 46046731} + m_Layer: 0 + m_Name: Renderer1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &46046730 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 46046729} + 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: 2043595397} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &46046731 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 46046729} + 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: 21300000, guid: 2b9ab64eaef31264199b9cd3cdef0652, 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!1 &348344971 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 348344972} + - component: {fileID: 348344973} + m_Layer: 0 + m_Name: Renderer2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &348344972 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 348344971} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 2043595397} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &348344973 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 348344971} + 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: 21300000, guid: 1971bbfa20ea0d14e983e26011be594c, 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!1 &875433551 GameObject: m_ObjectHideFlags: 0 @@ -733,6 +901,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2043595397} + - component: {fileID: 2043595398} m_Layer: 0 m_Name: DeepIn m_TagString: Untagged @@ -752,9 +921,38 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 46046730} + - {fileID: 348344972} m_Father: {fileID: 1409397678} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2043595398 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2043595396} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 885cefce8d27b9c44b433278584f254d, type: 3} + m_Name: + m_EditorClassIdentifier: + spriteArr: + - {fileID: 21300000, guid: 2b9ab64eaef31264199b9cd3cdef0652, type: 3} + - {fileID: 21300000, guid: 1971bbfa20ea0d14e983e26011be594c, type: 3} + - {fileID: 21300000, guid: 3f969e1f0cc170549be1f3837d5a363d, type: 3} + - {fileID: 21300000, guid: deb8eb32e0390cf419b754655c7461d1, type: 3} + - {fileID: 21300000, guid: 49efe4bbed8d7da42ac13ca1ce3d70bc, type: 3} + - {fileID: 21300000, guid: 39fef532867ce7849b382b3ec15e0c0a, type: 3} + - {fileID: 21300000, guid: 071006eee544c2c439689ae279265459, type: 3} + - {fileID: 21300000, guid: f634d4872fd21b54b8796beb78c25c03, type: 3} + - {fileID: 21300000, guid: 75513e9ed2ae78c4996f0aeb4486f05c, type: 3} + - {fileID: 21300000, guid: 545a5771b5c79e442868ce6a99b4b148, type: 3} + - {fileID: 21300000, guid: 5d94c888748e7594ba79ea7637c2833e, type: 3} + - {fileID: 21300000, guid: 66085339cceb37945ad68984ba1c36cf, type: 3} + - {fileID: 21300000, guid: 46409852478e37948991147b3df33d09, type: 3} + - {fileID: 21300000, guid: 9530e0a2f1a55cb4d9e08580d53e1505, type: 3} --- !u!212 &17283047974486987 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1454,7 +1652,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &8781831196185115634 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Framework/PlayKit/SpriteDeepIn.cs b/Assets/Scripts/Framework/PlayKit/SpriteDeepIn.cs index ac2a1f05f..0a4f2c53e 100644 --- a/Assets/Scripts/Framework/PlayKit/SpriteDeepIn.cs +++ b/Assets/Scripts/Framework/PlayKit/SpriteDeepIn.cs @@ -1,18 +1,30 @@ +using DG.Tweening; using UnityEngine; namespace AibisDream { public class SpriteDeepIn : MonoBehaviour { - #region 索引 - public Sprite[] spriteArr; + public float duration = 10; + private SpriteRenderer _renderer1; private SpriteRenderer _renderer2; - #endregion - - + private float _curProgress; + + + public void Play() + { + DOTween.To(() => _curProgress, value => _curProgress = value, spriteArr.Length, duration) + .SetEase(Ease.Linear) + .OnUpdate(UpdateSprite); + } + + private void UpdateSprite() + { + + } } -} +} \ No newline at end of file