diff --git a/Assets/Bundles/Prefabs/HuntingSlot.prefab b/Assets/Bundles/Prefabs/HuntingSlot.prefab index 801f831..b5dd730 100644 --- a/Assets/Bundles/Prefabs/HuntingSlot.prefab +++ b/Assets/Bundles/Prefabs/HuntingSlot.prefab @@ -104,7 +104,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3939562142913770387} - {fileID: 1532309723192952378} m_Father: {fileID: 1075369012370353055} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -284,7 +283,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 200} + m_SizeDelta: {x: 240, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1075369012289201019 CanvasRenderer: @@ -314,7 +313,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 24e03dbc027602c43bf44f19292ddec2, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -582,6 +581,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e37637135cd745f4b96408d1c6b642c9, type: 3} m_Name: m_EditorClassIdentifier: + mat_blur: {fileID: 2100000, guid: e457caa43c8e39a4ea1bbc7d8c7d8b5b, type: 2} NameTMP: {fileID: 1075369011951149182} AI_Left: {fileID: 1075369012289201016} AI_Right: {fileID: 3175243965314032831} @@ -1185,81 +1185,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &4967644975648593591 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3939562142913770387} - - component: {fileID: 3653947423062522205} - - component: {fileID: 3815891119031752423} - m_Layer: 5 - m_Name: blur - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3939562142913770387 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4967644975648593591} - 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: 1075369011134930243} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -56, y: -56} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3653947423062522205 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4967644975648593591} - m_CullTransparentMesh: 1 ---- !u!114 &3815891119031752423 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4967644975648593591} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 854834127d4924f4faad0c767281fc00, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &5396100670606708332 GameObject: m_ObjectHideFlags: 0 @@ -1954,81 +1879,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &6898962153088255326 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4486398462038190288} - - component: {fileID: 3889122414768101807} - - component: {fileID: 4410624295154607027} - m_Layer: 5 - m_Name: blur - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4486398462038190288 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6898962153088255326} - 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: 8817793937024032257} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -56, y: -56} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3889122414768101807 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6898962153088255326} - m_CullTransparentMesh: 1 ---- !u!114 &4410624295154607027 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6898962153088255326} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 854834127d4924f4faad0c767281fc00, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!1 &7136751291644174444 GameObject: m_ObjectHideFlags: 0 @@ -2556,7 +2406,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4486398462038190288} - {fileID: 3814698690714162587} m_Father: {fileID: 1075369012651726326} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2600,7 +2449,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 200} + m_SizeDelta: {x: 240, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5230902123716158034 CanvasRenderer: diff --git a/Assets/Memo.txt b/Assets/Memo.txt index cee939d..994acf0 100644 --- a/Assets/Memo.txt +++ b/Assets/Memo.txt @@ -27,7 +27,6 @@ -게임 시작 시 튜토리얼 비활성화 앨범 수집 목록만 타입으로 구분 //////////////////////////////////////////////////////////////////////////////////////////////////// 아래는 게등위 버전 이후 작업 예정 목록입니다. diff --git a/Assets/Resources/Textures/ImageBlur.mat b/Assets/Resources/Textures/ImageBlur.mat new file mode 100644 index 0000000..532ae49 --- /dev/null +++ b/Assets/Resources/Textures/ImageBlur.mat @@ -0,0 +1,94 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ImageBlur + m_Shader: {fileID: 4800000, guid: 27231c72f8933a54c9552d66112386a6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _Distance: 0.012 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Size: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _Vibrancy: 1.14 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _ColorMask: {r: 1, g: 1, b: 1, a: 0.2} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _TintColor: {r: 1, g: 1, b: 1, a: 0.2} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Resources/Textures/ImageBlur.mat.meta b/Assets/Resources/Textures/ImageBlur.mat.meta new file mode 100644 index 0000000..870c889 --- /dev/null +++ b/Assets/Resources/Textures/ImageBlur.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e457caa43c8e39a4ea1bbc7d8c7d8b5b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Textures/ImageBlur.shader b/Assets/Resources/Textures/ImageBlur.shader new file mode 100644 index 0000000..4998c8d --- /dev/null +++ b/Assets/Resources/Textures/ImageBlur.shader @@ -0,0 +1,125 @@ +Shader "UI/BlurMasked" +{ + Properties + { + _MainTex ("Base (RGB), Alpha (A)", 2D) = "white" {} + _Distance ("Blur Distance", Float) = 0.01 + + // UI Mask (Stencil) 호환용 표준 프로퍼티 + _StencilComp ("Stencil Comparison", Float) = 8 + _Stencil ("Stencil ID", Float) = 0 + _StencilOp ("Stencil Operation", Float) = 0 + _StencilWriteMask ("Stencil Write Mask", Float) = 255 + _StencilReadMask ("Stencil Read Mask", Float) = 255 + _ColorMask ("Color Mask", Float) = 15 + } + + SubShader + { + Tags + { + "Queue"="Transparent" + "IgnoreProjector"="True" + "RenderType"="Transparent" + "PreviewType"="Plane" + "CanUseSpriteAtlas"="True" + } + + Cull Off + Lighting Off + ZWrite Off + Blend SrcAlpha OneMinusSrcAlpha + + // UI Mask(그래픽 기반 Mask) 지원 + Stencil + { + Ref [_Stencil] + Comp [_StencilComp] + Pass [_StencilOp] + ReadMask [_StencilReadMask] + WriteMask [_StencilWriteMask] + } + ColorMask [_ColorMask] + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma target 2.0 + + // RectMask2D/MaskableGraphic 클리핑 지원 + #pragma multi_compile __ UNITY_UI_CLIP_RECT + #pragma multi_compile __ UNITY_UI_ALPHACLIP + + #include "UnityCG.cginc" + #include "UnityUI.cginc" + + struct appdata_t + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + float4 color : COLOR; + }; + + struct v2f + { + float4 vertex : SV_POSITION; + float2 uv : TEXCOORD0; + float4 color : COLOR; + float4 worldPosition : TEXCOORD1; // 클리핑 계산용 + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + float _Distance; + + // RectMask2D에서 주입되는 클리핑 사각형 + float4 _ClipRect; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = TRANSFORM_TEX(v.uv, _MainTex); + o.color = v.color; + + // UI 클리핑 함수가 사용하는 좌표(로컬/월드 상관없이 일관되게 사용) + // 보통 v.vertex(오브젝트 로컬)를 넘겨도 동작합니다. + o.worldPosition = v.vertex; + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + float2 uv = i.uv; + float d = _Distance; + + // 9탭 박스 블러 + fixed4 col = tex2D(_MainTex, uv); + col += tex2D(_MainTex, uv + float2( d, 0)); + col += tex2D(_MainTex, uv + float2(-d, 0)); + col += tex2D(_MainTex, uv + float2( 0, d)); + col += tex2D(_MainTex, uv + float2( 0, -d)); + col += tex2D(_MainTex, uv + float2( d, d)); + col += tex2D(_MainTex, uv + float2(-d, d)); + col += tex2D(_MainTex, uv + float2( d, -d)); + col += tex2D(_MainTex, uv + float2(-d, -d)); + col /= 9.0; + + // UI 마스크(ScrollView의 RectMask2D 등) 클리핑 적용 + #ifdef UNITY_UI_CLIP_RECT + col.a *= UnityGet2DClipping(i.worldPosition.xy, _ClipRect); + #endif + + // AlphaClip 옵션 사용 시(마스크 가장자리 하드 컷) + #ifdef UNITY_UI_ALPHACLIP + clip(col.a - 0.001); + #endif + + return col * i.color; + } + ENDCG + } + } +} \ No newline at end of file diff --git a/Assets/Resources/Textures/ImageBlur.shader.meta b/Assets/Resources/Textures/ImageBlur.shader.meta new file mode 100644 index 0000000..28351d1 --- /dev/null +++ b/Assets/Resources/Textures/ImageBlur.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 27231c72f8933a54c9552d66112386a6 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 78d44a9..311ba71 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -6291,10 +6291,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1655609077} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 583.7001, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &110428666 MonoBehaviour: @@ -6935,10 +6935,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1129600970} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 583.7001, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &157977247 MonoBehaviour: @@ -13871,7 +13871,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &264014381 RectTransform: m_ObjectHideFlags: 0 @@ -14286,10 +14286,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1655609077} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 247.30002, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &294027875 MonoBehaviour: @@ -38335,10 +38335,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1129600970} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 415.50003, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &545788163 MonoBehaviour: @@ -45929,8 +45929,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -261, y: -133} - m_SizeDelta: {x: -661.65, y: -1676.37} + m_AnchoredPosition: {x: 0, y: 705} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!1 &727366516 GameObject: @@ -46039,10 +46039,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1129600970} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 247.30002, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &727989100 MonoBehaviour: @@ -55774,7 +55774,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 375.52698, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -543.66003, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &748618263 MonoBehaviour: @@ -56403,7 +56403,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &771770700 RectTransform: m_ObjectHideFlags: 0 @@ -63826,10 +63826,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1655609077} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 751.9, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &899195709 MonoBehaviour: @@ -71361,7 +71361,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -437.76306, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -1080, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1042151481 MonoBehaviour: @@ -71841,7 +71841,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 375.52698, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -776.84174, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1070010677 MonoBehaviour: @@ -72663,7 +72663,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -166.31567, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -1080, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1114363786 MonoBehaviour: @@ -72923,7 +72923,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: -311.3} + m_SizeDelta: {x: -248.99994, y: -311.3} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1129600972 MonoBehaviour: @@ -74769,7 +74769,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 88.158264, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -880.66003, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1230955786 MonoBehaviour: @@ -97493,7 +97493,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -166.31567, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -880.66003, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1458972175 MonoBehaviour: @@ -103335,7 +103335,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1535761049 RectTransform: m_ObjectHideFlags: 0 @@ -108634,10 +108634,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1129600970} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 751.9, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1568529521 MonoBehaviour: @@ -114939,10 +114939,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1655609077} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 79.100006, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1643606556 MonoBehaviour: @@ -115097,7 +115097,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 200} - m_SizeDelta: {x: 0, y: -311.3} + m_SizeDelta: {x: -248.99994, y: -311.3} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1655609078 MonoBehaviour: @@ -120573,7 +120573,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 88.158264, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: -1080, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1674831522 MonoBehaviour: @@ -142199,10 +142199,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1655609077} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 415.50003, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1880837240 MonoBehaviour: @@ -174787,10 +174787,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1129600970} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 158.20001, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 79.100006, y: -238.70001} + m_SizeDelta: {x: 158.20001, y: 238.70001} m_Pivot: {x: 0.5, y: 0} --- !u!114 &2128021909 MonoBehaviour: diff --git a/Assets/Scripts/SingletonManagers/Managers/DBManager.cs b/Assets/Scripts/SingletonManagers/Managers/DBManager.cs index 52332df..10a57ba 100644 --- a/Assets/Scripts/SingletonManagers/Managers/DBManager.cs +++ b/Assets/Scripts/SingletonManagers/Managers/DBManager.cs @@ -532,6 +532,18 @@ public partial class DBManager : MonoBehaviour return _lstHuntindData[index]; } } + public List Get_AlbumDatas() + { + var rtn = new List(); + var lst = _lstHuntindData; + for (int i = 0; i < lst.Count; i++) + { + rtn.Add(new HuntingUIData { m_Left = lst[i], m_Right = lst[i + 1] }); + ++i; + } + + return rtn; + } public List Get_AlbumDatas(int type) { var rtn = new List(); diff --git a/Assets/Scripts/UI/HuntingPanel.cs b/Assets/Scripts/UI/HuntingPanel.cs index 77bec31..cbd26fc 100644 --- a/Assets/Scripts/UI/HuntingPanel.cs +++ b/Assets/Scripts/UI/HuntingPanel.cs @@ -70,7 +70,7 @@ public class HuntingPanel : uScrollViewMgr DB_HuntingListData huntingListData = DB_HuntingListData.GetEntity(curtargetindex); TitleTMP.text = huntingListData.DBF_Title; t_type.text = $"Type{CurAlbumType}"; - Set_ScrollView(GameManager.DB.Get_AlbumDatas(CurAlbumType)); + Set_ScrollView(GameManager.DB.Get_AlbumDatas()); } private void OnClickFullView(object huntingDataID, object huntingListDataID) diff --git a/Assets/Scripts/UI/HuntingSlot.cs b/Assets/Scripts/UI/HuntingSlot.cs index 7601571..6c5c918 100644 --- a/Assets/Scripts/UI/HuntingSlot.cs +++ b/Assets/Scripts/UI/HuntingSlot.cs @@ -8,6 +8,7 @@ using TMPro; public class HuntingSlot : CardBase { + public Material mat_blur; [SerializeField] private TextMeshProUGUI NameTMP; [Space(20)] @@ -93,16 +94,20 @@ public class HuntingSlot : CardBase gos_openbutton[0].SetActive(false); gos_openbutton[1].SetActive(false); + AI_Left.color = Color.white; + AI_Left.material = null; if (_data_left != null) { if (_data_left.n_Group == unlockTargetIndex_left) { // 구매 가능 gos_openbutton[0].SetActive(true); + AI_Left.material = mat_blur; Block_Left.SetActive(true); } else if (_data_left.n_Group > unlockTargetIndex_left) { // 잠김 Block_Left.SetActive(true); + AI_Left.color = Color.black; } else { // 열림 @@ -110,16 +115,20 @@ public class HuntingSlot : CardBase } } + AI_Right.color = Color.white; + AI_Right.material = null; if (_data_right != null) { if (_data_right.n_Group == unlockTargetIndex_right) { // 구매 가능 gos_openbutton[1].SetActive(true); + AI_Right.material = mat_blur; Block_Right.SetActive(true); } else if (_data_right.n_Group > unlockTargetIndex_right) { // 잠김 Block_Right.SetActive(true); + AI_Right.color = Color.black; } else { // 열림 diff --git a/Assets/Super Confetti FX/Materials/blastvertical.mat b/Assets/Super Confetti FX/Materials/blastvertical.mat index e40f4fa..1f4e675 100644 --- a/Assets/Super Confetti FX/Materials/blastvertical.mat +++ b/Assets/Super Confetti FX/Materials/blastvertical.mat @@ -2,13 +2,21 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: blastvertical m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _COLORCOLOR_ON _EMISSION _FADING_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHABLEND_ON + - _COLORCOLOR_ON + - _EMISSION + - _FADING_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -16,7 +24,8 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -32,6 +41,7 @@ Material: m_Texture: {fileID: 2800000, guid: 1b89aee09ede5654bbbb2b4c6ff929bf, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -61,3 +71,5 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0.35, g: 0.35, b: 0.35, a: 1} - _SoftParticleFadeParams: {r: 0.1, g: 2.222222, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Super Confetti FX/Materials/blastvertical_toon.mat b/Assets/Super Confetti FX/Materials/blastvertical_toon.mat index b50214b..0e97a7e 100644 --- a/Assets/Super Confetti FX/Materials/blastvertical_toon.mat +++ b/Assets/Super Confetti FX/Materials/blastvertical_toon.mat @@ -2,13 +2,21 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: blastvertical_toon m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _COLORCOLOR_ON _EMISSION _FADING_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHABLEND_ON + - _COLORCOLOR_ON + - _EMISSION + - _FADING_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -16,7 +24,8 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -32,6 +41,7 @@ Material: m_Texture: {fileID: 2800000, guid: 14978d23d163e634094522d79a8644da, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -61,3 +71,5 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0.35, g: 0.35, b: 0.35, a: 1} - _SoftParticleFadeParams: {r: 0.1, g: 2.222222, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Super Confetti FX/Materials/confetti4x4_magic.mat b/Assets/Super Confetti FX/Materials/confetti4x4_magic.mat index be57a63..24d215c 100644 --- a/Assets/Super Confetti FX/Materials/confetti4x4_magic.mat +++ b/Assets/Super Confetti FX/Materials/confetti4x4_magic.mat @@ -2,13 +2,21 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: confetti4x4_magic m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _COLORCOLOR_ON _EMISSION _FADING_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHABLEND_ON + - _COLORCOLOR_ON + - _EMISSION + - _FADING_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -16,7 +24,8 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -36,6 +45,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -68,3 +78,5 @@ Material: - _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0.7, g: 0.7, b: 0.7, a: 1} - _SoftParticleFadeParams: {r: 0, g: 5, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Super Confetti FX/Materials/confetti4x4_realistic.mat b/Assets/Super Confetti FX/Materials/confetti4x4_realistic.mat index c1075b5..105a1ab 100644 --- a/Assets/Super Confetti FX/Materials/confetti4x4_realistic.mat +++ b/Assets/Super Confetti FX/Materials/confetti4x4_realistic.mat @@ -2,13 +2,20 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: confetti4x4_realistic m_Shader: {fileID: 210, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _FADING_ON _NORMALMAP + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHABLEND_ON + - _FADING_ON + - _NORMALMAP + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -16,7 +23,8 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -36,6 +44,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -68,3 +77,5 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0.3, g: 0.3, b: 0.3, a: 1} - _SoftParticleFadeParams: {r: 0, g: 10, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Super Confetti FX/Materials/confetti4x4_realistic_glossy.mat b/Assets/Super Confetti FX/Materials/confetti4x4_realistic_glossy.mat index 0933aa8..dacdb97 100644 --- a/Assets/Super Confetti FX/Materials/confetti4x4_realistic_glossy.mat +++ b/Assets/Super Confetti FX/Materials/confetti4x4_realistic_glossy.mat @@ -2,13 +2,20 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: confetti4x4_realistic_glossy m_Shader: {fileID: 210, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _FADING_ON _NORMALMAP + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHABLEND_ON + - _FADING_ON + - _NORMALMAP + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -16,7 +23,8 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -36,6 +44,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -68,3 +77,5 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0.3, g: 0.3, b: 0.3, a: 1} - _SoftParticleFadeParams: {r: 0, g: 10, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Super Confetti FX/Materials/confetti4x4_toon.mat b/Assets/Super Confetti FX/Materials/confetti4x4_toon.mat index 38cbe2b..5de396d 100644 --- a/Assets/Super Confetti FX/Materials/confetti4x4_toon.mat +++ b/Assets/Super Confetti FX/Materials/confetti4x4_toon.mat @@ -2,13 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: confetti4x4_toon m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _FADING_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHABLEND_ON + - _FADING_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -16,7 +22,8 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -36,6 +43,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -68,3 +76,5 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0.3, g: 0.3, b: 0.3, a: 1} - _SoftParticleFadeParams: {r: 0, g: 5, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Super Confetti FX/Materials/confetti4x4_toon_shaded.mat b/Assets/Super Confetti FX/Materials/confetti4x4_toon_shaded.mat index 17740a4..675e86a 100644 --- a/Assets/Super Confetti FX/Materials/confetti4x4_toon_shaded.mat +++ b/Assets/Super Confetti FX/Materials/confetti4x4_toon_shaded.mat @@ -2,13 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: confetti4x4_toon_shaded m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _FADING_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHABLEND_ON + - _FADING_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -16,7 +22,8 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -36,6 +43,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -68,3 +76,5 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0.3, g: 0.3, b: 0.3, a: 1} - _SoftParticleFadeParams: {r: 0, g: 5, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Super Confetti FX/Materials/shockwave_magic.mat b/Assets/Super Confetti FX/Materials/shockwave_magic.mat index 2da5c1e..74338c9 100644 --- a/Assets/Super Confetti FX/Materials/shockwave_magic.mat +++ b/Assets/Super Confetti FX/Materials/shockwave_magic.mat @@ -2,13 +2,21 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: shockwave_magic m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _COLORCOLOR_ON _EMISSION _FADING_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHABLEND_ON + - _COLORCOLOR_ON + - _EMISSION + - _FADING_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -16,7 +24,8 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -32,6 +41,7 @@ Material: m_Texture: {fileID: 2800000, guid: e087e0ae4dbbc5c40a0a3106d7f57d0b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -61,3 +71,5 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _SoftParticleFadeParams: {r: 0, g: 1.5384616, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Super Confetti FX/Materials/spark.mat b/Assets/Super Confetti FX/Materials/spark.mat index 06691e0..01d8982 100644 --- a/Assets/Super Confetti FX/Materials/spark.mat +++ b/Assets/Super Confetti FX/Materials/spark.mat @@ -2,13 +2,21 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: spark m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _COLORCOLOR_ON _EMISSION _FADING_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHABLEND_ON + - _COLORCOLOR_ON + - _EMISSION + - _FADING_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -16,7 +24,8 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -32,6 +41,7 @@ Material: m_Texture: {fileID: 2800000, guid: bdda5f1ead1a0cc4e80cad90197814bf, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -61,3 +71,5 @@ Material: - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0.35, g: 0.35, b: 0.35, a: 1} - _SoftParticleFadeParams: {r: 0, g: 5, b: 0, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Super Confetti FX/Materials/streamer_magic.mat b/Assets/Super Confetti FX/Materials/streamer_magic.mat index 5d721a7..c2fd007 100644 --- a/Assets/Super Confetti FX/Materials/streamer_magic.mat +++ b/Assets/Super Confetti FX/Materials/streamer_magic.mat @@ -2,13 +2,20 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: streamer_magic m_Shader: {fileID: 210, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _COLORCOLOR_ON _EMISSION + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHABLEND_ON + - _EMISSION + m_InvalidKeywords: + - _COLORCOLOR_ON m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -16,7 +23,8 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -56,6 +64,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 0 @@ -97,3 +106,5 @@ Material: - _EmissionColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Super Confetti FX/Materials/streamer_realistic.mat b/Assets/Super Confetti FX/Materials/streamer_realistic.mat index aa0cdf9..9c55e6a 100644 --- a/Assets/Super Confetti FX/Materials/streamer_realistic.mat +++ b/Assets/Super Confetti FX/Materials/streamer_realistic.mat @@ -2,13 +2,20 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: streamer_realistic m_Shader: {fileID: 210, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _COLORCOLOR_ON _NORMALMAP + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHABLEND_ON + - _NORMALMAP + m_InvalidKeywords: + - _COLORCOLOR_ON m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -16,7 +23,8 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -56,6 +64,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 2 @@ -97,3 +106,5 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Super Confetti FX/Materials/streamer_toon.mat b/Assets/Super Confetti FX/Materials/streamer_toon.mat index 01d93a3..0e1a081 100644 --- a/Assets/Super Confetti FX/Materials/streamer_toon.mat +++ b/Assets/Super Confetti FX/Materials/streamer_toon.mat @@ -2,13 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: streamer_toon m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _COLORCOLOR_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHABLEND_ON + - _COLORCOLOR_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -16,7 +22,8 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -56,6 +63,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -97,3 +105,5 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] + m_AllowLocking: 1