From f3b7fd6631a3c3b87b17ac40b4542c2485103b46 Mon Sep 17 00:00:00 2001 From: lspdC <961907320@qq.com> Date: Tue, 15 Mar 2022 10:37:34 +0800 Subject: [PATCH] =?UTF-8?q?3.14=E8=BF=9B=E5=BA=A6=EF=BC=88=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=89=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Plugins/Fungus/Textures/Mushroom.png.meta | 29 ++- .../TheHunter/Sprites/Ciara.psd.meta | 25 +- Assets/Scenes/乐/Sample1.unity | 218 +++++++++++++++++- Assets/Scripts/乐/Tree.cs | 30 ++- UserSettings/EditorUserSettings.asset | 8 +- 5 files changed, 282 insertions(+), 28 deletions(-) diff --git a/Assets/Plugins/Fungus/Textures/Mushroom.png.meta b/Assets/Plugins/Fungus/Textures/Mushroom.png.meta index d508e23..6ca9571 100644 --- a/Assets/Plugins/Fungus/Textures/Mushroom.png.meta +++ b/Assets/Plugins/Fungus/Textures/Mushroom.png.meta @@ -6,7 +6,7 @@ TextureImporter: 213: 21300000 second: Mushroom externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -26,6 +26,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -34,9 +35,9 @@ TextureImporter: maxTextureSize: 1024 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 1 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -46,9 +47,9 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + alignment: 7 + spritePivot: {x: 0.5, y: 0} + spritePixelsToUnits: 300 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -57,9 +58,13 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -73,6 +78,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Plugins/FungusExamples/TheHunter/Sprites/Ciara.psd.meta b/Assets/Plugins/FungusExamples/TheHunter/Sprites/Ciara.psd.meta index 4e555c0..4823ecc 100644 --- a/Assets/Plugins/FungusExamples/TheHunter/Sprites/Ciara.psd.meta +++ b/Assets/Plugins/FungusExamples/TheHunter/Sprites/Ciara.psd.meta @@ -9,7 +9,7 @@ TextureImporter: 213: 21300002 second: Ciara externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -29,6 +29,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -37,9 +38,9 @@ TextureImporter: maxTextureSize: 1024 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 1 aniso: 1 - mipBias: -100 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -51,7 +52,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 580 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -60,9 +61,13 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -76,6 +81,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Scenes/乐/Sample1.unity b/Assets/Scenes/乐/Sample1.unity index b8c6d34..a7be077 100644 --- a/Assets/Scenes/乐/Sample1.unity +++ b/Assets/Scenes/乐/Sample1.unity @@ -226,12 +226,178 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 223863017} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -4.06, z: 0} - m_LocalScale: {x: 17.697626, y: 2.321, z: 2.321} + m_LocalPosition: {x: -7.57, y: -4.06, z: 0} + m_LocalScale: {x: 18.835022, y: 2.321, z: 2.321} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &314654742 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 314654743} + - component: {fileID: 314654744} + m_Layer: 0 + m_Name: LimitCollder + m_TagString: Ground + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &314654743 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 314654742} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.48, y: 0.242, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 663361288} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &314654744 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 314654742} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + 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, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!1 &522233063 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 522233066} + - component: {fileID: 522233065} + - component: {fileID: 522233064} + m_Layer: 0 + m_Name: Ground (1) + m_TagString: Ground + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &522233064 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 522233063} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + 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 &522233065 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 522233063} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + 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: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} + m_Color: {r: 0, g: 0, b: 0, 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 &522233066 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 522233063} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 20.15, y: -4.06, z: 0} + m_LocalScale: {x: 24.701668, y: 2.321, z: 2.321} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &537498726 GameObject: m_ObjectHideFlags: 0 @@ -360,9 +526,10 @@ GameObject: - component: {fileID: 663361288} - component: {fileID: 663361287} - component: {fileID: 663361289} + - component: {fileID: 663361290} m_Layer: 0 m_Name: Tree - m_TagString: Untagged + m_TagString: Ground m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -407,8 +574,8 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3} + m_Color: {r: 0.9622642, g: 0.87602353, b: 0.87602353, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -426,11 +593,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 663361286} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.78, y: 0.75, z: 0} - m_LocalScale: {x: 1, y: 7.266563, z: 1} - m_Children: [] + m_LocalPosition: {x: 1.18, y: -3.12, z: 0} + m_LocalScale: {x: 2.5875, y: 7.266563, z: 1} + m_Children: + - {fileID: 314654743} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &663361289 MonoBehaviour: @@ -444,6 +612,34 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 037f21dc1592db342a165700917f287f, type: 3} m_Name: m_EditorClassIdentifier: + rotateDuration: 1 + sprite_Mu: {fileID: 21300000, guid: c784f0adc2ce544be915fc26a2b4b510, type: 3} +--- !u!61 &663361290 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 663361286} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0.5} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0} + 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!1 &751536331 GameObject: m_ObjectHideFlags: 0 @@ -605,7 +801,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: 280dd2a14df942246955c1936e6114bd, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -671,7 +867,7 @@ Rigidbody2D: m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 - m_Constraints: 0 + m_Constraints: 4 --- !u!61 &1658378291 BoxCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/乐/Tree.cs b/Assets/Scripts/乐/Tree.cs index 390578d..b6de203 100644 --- a/Assets/Scripts/乐/Tree.cs +++ b/Assets/Scripts/乐/Tree.cs @@ -1,18 +1,42 @@ +using DG.Tweening; using System.Collections; using System.Collections.Generic; using UnityEngine; -public class Tree : MonoBehaviour +public class Tree : Interactable { - // Start is called before the first frame update + int interactState = 0; + public float rotateDuration=0.5f; + SpriteRenderer m_spr; + public Sprite sprite_Mu; void Start() { - + m_spr = GetComponent(); } // Update is called once per frame void Update() { + } + + public override void OnCall() + { + switch (interactState) { + case 0: + transform.DORotate(new Vector3(0, 0, -90), rotateDuration); + interactState++; + break; + case 1: + m_spr.sprite = sprite_Mu; + interactState++; + break; + default: + break; + } + + + + } } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 614f2eb..2f87e15 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -18,14 +18,14 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d - flags: 0 - RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb flags: 0 - RecentlyUsedScenePath-6: + RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0 flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0