From a3a42a5378b6649b57cd62c1b4a9a3984e4cf22c Mon Sep 17 00:00:00 2001 From: DPS2004 <10176105+DPS2004@users.noreply.github.com> Date: Wed, 17 Aug 2022 12:24:24 -0400 Subject: [PATCH] remove assetbundle stuff --- Assets/Resources/Games/tunnel.prefab | 83 +++++++++++++++++++++++++++ Assets/Scripts/Games/Tunnel/Tunnel.cs | 10 ++-- 2 files changed, 88 insertions(+), 5 deletions(-) diff --git a/Assets/Resources/Games/tunnel.prefab b/Assets/Resources/Games/tunnel.prefab index 293654ae..2209bab7 100644 --- a/Assets/Resources/Games/tunnel.prefab +++ b/Assets/Resources/Games/tunnel.prefab @@ -30,6 +30,7 @@ Transform: m_Children: - {fileID: 3774069930178808389} - {fileID: 6685952024114090199} + - {fileID: 5169543304007498296} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -224,6 +225,88 @@ MonoBehaviour: _SortingLayer: 0 _SortingLayerID: 0 _SortingOrder: 0 +--- !u!1 &6920721706041956679 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5169543304007498296} + - component: {fileID: 7264738122385836137} + m_Layer: 0 + m_Name: testsquare + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5169543304007498296 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6920721706041956679} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 5.86, y: 3.42, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8034898466080482128} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7264738122385836137 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6920721706041956679} + 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: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 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 &7723745442768519090 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Games/Tunnel/Tunnel.cs b/Assets/Scripts/Games/Tunnel/Tunnel.cs index 75bdfac8..326aa7dc 100644 --- a/Assets/Scripts/Games/Tunnel/Tunnel.cs +++ b/Assets/Scripts/Games/Tunnel/Tunnel.cs @@ -48,10 +48,10 @@ namespace HeavenStudio.Games.Loaders new Param("colorA", Color.white, "Start Color", "The starting color in the fade"), new Param("colorB", Tunnel.defaultFgColor, "End Color", "The ending color in the fade") }, hidden: true ), - }, - new List() {"ntr", "aim"}, - "ntrcoin", "en", - new List() {} + } + //new List() {"ntr", "aim"}, + //"ntrcoin", "en", + //new List() {} ); } } @@ -170,7 +170,7 @@ namespace HeavenStudio.Games public void ChangeBackgroundColor(Color color, float beats, bool isFg = false) { var seconds = Conductor.instance.secPerBeat * beats; - + if(!isFg) { if (bgColorTween != null)