diff --git a/Assets/Scenes/BossRoom.unity b/Assets/Scenes/BossRoom.unity index aeb2f54a..fb24c95b 100644 --- a/Assets/Scenes/BossRoom.unity +++ b/Assets/Scenes/BossRoom.unity @@ -4750,13 +4750,14 @@ GameObject: - component: {fileID: 733993263} - component: {fileID: 733993262} - component: {fileID: 733993261} + - component: {fileID: 733993264} m_Layer: 5 - m_Name: Image + m_Name: ScreenHit m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &733993260 RectTransform: m_ObjectHideFlags: 0 @@ -4805,7 +4806,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 1102464587} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4830,6 +4831,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 733993259} m_CullTransparentMesh: 1 +--- !u!114 &733993264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 733993259} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c90604c00a8a6a468ca644094c69dd5, type: 3} + m_Name: + m_EditorClassIdentifier: + fadeDuration: 0.3 --- !u!1 &734818076 GameObject: m_ObjectHideFlags: 0 @@ -14547,7 +14561,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1676734516724634599, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.w - value: 0.80276686 + value: 0.8027669 objectReference: {fileID: 0} - target: {fileID: 1676734516724634599, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.x @@ -14555,11 +14569,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1676734516724634599, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.y - value: 0.2921833 + value: 0.29218328 objectReference: {fileID: 0} - target: {fileID: 1676734516724634599, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_LocalRotation.z - value: -0.17778286 + value: -0.17778282 objectReference: {fileID: 0} - target: {fileID: 1676734516866984540, guid: 0193228de87741d40a42e561901c9083, type: 3} propertyPath: m_VerticalDamping @@ -15081,8 +15095,12 @@ Material: m_Shader: {fileID: 4800000, guid: a36b7719ff0465b42ab1407d67672c5f, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] + m_ValidKeywords: + - GLOW_ON + - GRADIENT_ON + - RADIALGRADIENT_ON + m_InvalidKeywords: + - _GRADISRADIAL_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -15193,9 +15211,9 @@ Material: - _Glow: 10 - _GlowGlobal: 1 - _GradBlend: 1 - - _GradBoostX: 1.2 + - _GradBoostX: 2 - _GradBoostY: 1.2 - - _GradIsRadial: 0 + - _GradIsRadial: 1 - _GrassManualAnim: 1 - _GrassManualToggle: 0 - _GrassRadialBend: 0.1 @@ -15292,7 +15310,7 @@ Material: - _ColorSwapRed: {r: 1, g: 1, b: 1, a: 1} - _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1} - _GlowColor: {r: 1, g: 1, b: 1, a: 1} - - _GradBotLeftCol: {r: 0, g: 0, b: 1, a: 1} + - _GradBotLeftCol: {r: 1, g: 0, b: 0, a: 0} - _GradBotRightCol: {r: 0, g: 1, b: 0, a: 1} - _GradTopLeftCol: {r: 1, g: 0, b: 0, a: 1} - _GradTopRightCol: {r: 1, g: 1, b: 0, a: 1} @@ -18701,97 +18719,6 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 1 ---- !u!1001 &1677074423 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5277713031461887262} - m_Modifications: - - target: {fileID: 108676305740267431, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 516877461761749120, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_LocalScale.x - value: 3.32 - objectReference: {fileID: 0} - - target: {fileID: 516877461761749120, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_LocalScale.y - value: 3.32 - objectReference: {fileID: 0} - - target: {fileID: 516877461761749120, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_LocalScale.z - value: 3.32 - objectReference: {fileID: 0} - - target: {fileID: 516877461761749120, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_LocalPosition.x - value: -760 - objectReference: {fileID: 0} - - target: {fileID: 516877461761749120, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_LocalPosition.y - value: -540 - objectReference: {fileID: 0} - - target: {fileID: 516877461761749120, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 516877461761749120, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 516877461761749120, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 516877461761749120, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 516877461761749120, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 516877461761749120, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 516877461761749120, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 516877461761749120, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 516877461761749120, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4873889555389619246, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 1719343796} - - target: {fileID: 8024604998774400320, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_Name - value: ScreenHit - objectReference: {fileID: 0} - - target: {fileID: 9177040301879258186, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - propertyPath: m_LocalPosition.y - value: 2.55 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 4431182916468833469, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} ---- !u!4 &1677074424 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 516877461761749120, guid: e74146e0c4e4b7f4bbbe0782e5773fd1, type: 3} - m_PrefabInstance: {fileID: 1677074423} - m_PrefabAsset: {fileID: 0} --- !u!114 &1677955205 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19482,245 +19409,6 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 1 ---- !u!21 &1719343796 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: AllIn1SpriteShader/AllIn1SpriteShader - m_Shader: {fileID: 4800000, guid: a36b7719ff0465b42ab1407d67672c5f, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - GLOW_ON - - GRADIENT_ON - - RADIALGRADIENT_ON - m_InvalidKeywords: - - _GRADISRADIAL_ON - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _ColorRampTex: - m_Texture: {fileID: 2800000, guid: 279657edc397ece4b8029c727adf6ddc, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ColorRampTexGradient: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ColorSwapTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DistortTex: - m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _FadeBurnTex: - m_Texture: {fileID: 2800000, guid: 677cca399782dea41aedc1d292ecb67d, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _FadeTex: - m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _GlowTex: - 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} - - _OutlineDistortTex: - m_Texture: {fileID: 2800000, guid: 7aad8c583ef292e48b06af0d1f2fab97, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OutlineTex: - m_Texture: {fileID: 2800000, guid: 74087f6d03f233e4a8a142fa01f9e5cf, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OverlayTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ShineMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Alpha: 1 - - _AlphaCutoffValue: 0.25 - - _AlphaOutlineBlend: 1 - - _AlphaOutlineGlow: 5 - - _AlphaOutlineMinAlpha: 0 - - _AlphaOutlinePower: 1 - - _AlphaRoundThreshold: 0.5 - - _BillboardY: 0 - - _BlurHD: 0 - - _BlurIntensity: 10 - - _Brightness: 0 - - _ChromAberrAlpha: 0.4 - - _ChromAberrAmount: 1 - - _ClipUvDown: 0 - - _ClipUvLeft: 0 - - _ClipUvRight: 0 - - _ClipUvUp: 0 - - _ColorChangeLuminosity: 0 - - _ColorChangeTolerance: 0.25 - - _ColorChangeTolerance2: 0.25 - - _ColorChangeTolerance3: 0.25 - - _ColorRampBlend: 1 - - _ColorRampLuminosity: 0 - - _ColorRampOutline: 0 - - _ColorSwapBlend: 1 - - _ColorSwapBlueLuminosity: 0.5 - - _ColorSwapGreenLuminosity: 0.5 - - _ColorSwapRedLuminosity: 0.5 - - _Contrast: 1 - - _CullingOption: 0 - - _DistortAmount: 0.5 - - _DistortTexXSpeed: 5 - - _DistortTexYSpeed: 5 - - _EditorDrawers: 6 - - _FadeAmount: -0.1 - - _FadeBurnGlow: 2 - - _FadeBurnTransition: 0.075 - - _FadeBurnWidth: 0.025 - - _FishEyeUvAmount: 0.35 - - _FlickerAlpha: 0 - - _FlickerFreq: 0.2 - - _FlickerPercent: 0.05 - - _GhostBlend: 1 - - _GhostColorBoost: 1 - - _GhostTransparency: 0 - - _GlitchAmount: 3 - - _GlitchSize: 1 - - _Glow: 10 - - _GlowGlobal: 1 - - _GradBlend: 1 - - _GradBoostX: 1.2 - - _GradBoostY: 1.2 - - _GradIsRadial: 1 - - _GrassManualAnim: 1 - - _GrassManualToggle: 0 - - _GrassRadialBend: 0.1 - - _GrassSpeed: 2 - - _GrassWind: 20 - - _GreyscaleBlend: 1 - - _GreyscaleLuminosity: 0 - - _GreyscaleOutline: 0 - - _HandDrawnAmount: 10 - - _HandDrawnSpeed: 5 - - _HitEffectBlend: 1 - - _HitEffectGlow: 5 - - _HologramBlend: 1 - - _HologramMaxAlpha: 0.75 - - _HologramMinAlpha: 0.1 - - _HologramStripesAmount: 0.1 - - _HologramStripesSpeed: 4.5 - - _HologramUnmodAmount: 0 - - _HsvBright: 1 - - _HsvSaturation: 1 - - _HsvShift: 180 - - _InnerOutlineAlpha: 1 - - _InnerOutlineGlow: 4 - - _InnerOutlineThickness: 1 - - _MaxXUV: 1 - - _MaxYUV: 1 - - _MinXUV: 0 - - _MinYUV: 0 - - _MotionBlurAngle: 0.1 - - _MotionBlurDist: 1.25 - - _MyDstMode: 10 - - _MySrcMode: 5 - - _NegativeAmount: 1 - - _OffsetUvX: 0 - - _OffsetUvY: 0 - - _OnlyInnerOutline: 0 - - _OnlyOutline: 0 - - _OutlineAlpha: 1 - - _OutlineDistortAmount: 0.5 - - _OutlineDistortTexXSpeed: 5 - - _OutlineDistortTexYSpeed: 5 - - _OutlineGlow: 1.5 - - _OutlinePixelWidth: 1 - - _OutlineTexXSpeed: 10 - - _OutlineTexYSpeed: 0 - - _OutlineWidth: 0.004 - - _OverlayBlend: 1 - - _OverlayGlow: 1 - - _PinchUvAmount: 0.35 - - _PixelateSize: 32 - - _PosterizeGamma: 0.75 - - _PosterizeNumColors: 8 - - _PosterizeOutline: 0 - - _RandomSeed: 0 - - _RectSize: 1 - - _RotateUvAmount: 0 - - _RoundWaveSpeed: 2 - - _RoundWaveStrength: 0.7 - - _ShadowAlpha: 0.5 - - _ShadowX: 0.1 - - _ShadowY: -0.05 - - _ShakeUvSpeed: 2.5 - - _ShakeUvX: 1.5 - - _ShakeUvY: 1 - - _ShineGlow: 1 - - _ShineLocation: 0.5 - - _ShineRotate: 0 - - _ShineWidth: 0.1 - - _TextureScrollXSpeed: 1 - - _TextureScrollYSpeed: 0 - - _TwistUvAmount: 1 - - _TwistUvPosX: 0.5 - - _TwistUvPosY: 0.5 - - _TwistUvRadius: 0.75 - - _WaveAmount: 7 - - _WaveSpeed: 10 - - _WaveStrength: 7.5 - - _WaveX: 0 - - _WaveY: 0.5 - - _ZTestMode: 4 - - _ZWrite: 0 - - _ZoomUvAmount: 0.5 - m_Colors: - - _AlphaOutlineColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorChangeNewCol: {r: 1, g: 1, b: 0, a: 1} - - _ColorChangeNewCol2: {r: 1, g: 1, b: 0, a: 1} - - _ColorChangeNewCol3: {r: 1, g: 1, b: 0, a: 1} - - _ColorChangeTarget: {r: 1, g: 0, b: 0, a: 1} - - _ColorChangeTarget2: {r: 1, g: 0, b: 0, a: 1} - - _ColorChangeTarget3: {r: 1, g: 0, b: 0, a: 1} - - _ColorSwapBlue: {r: 1, g: 1, b: 1, a: 1} - - _ColorSwapGreen: {r: 1, g: 1, b: 1, a: 1} - - _ColorSwapRed: {r: 1, g: 1, b: 1, a: 1} - - _FadeBurnColor: {r: 1, g: 1, b: 0, a: 1} - - _GlowColor: {r: 1, g: 1, b: 1, a: 1} - - _GradBotLeftCol: {r: 1, g: 0, b: 0, a: 1} - - _GradBotRightCol: {r: 0, g: 1, b: 0, a: 1} - - _GradTopLeftCol: {r: 1, g: 0, b: 0, a: 1} - - _GradTopRightCol: {r: 1, g: 1, b: 0, a: 1} - - _GreyscaleTintColor: {r: 1, g: 1, b: 1, a: 1} - - _HitEffectColor: {r: 1, g: 1, b: 1, a: 1} - - _HologramStripeColor: {r: 0, g: 1, b: 1, a: 1} - - _InnerOutlineColor: {r: 1, g: 0, b: 0, a: 1} - - _OutlineColor: {r: 1, g: 1, b: 1, a: 1} - - _OverlayColor: {r: 1, g: 1, b: 1, a: 1} - - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} - - _ShineColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] --- !u!1 &1722816487 GameObject: m_ObjectHideFlags: 0 @@ -271009,7 +270697,6 @@ RectTransform: - {fileID: 1388188197} - {fileID: 1599220877} - {fileID: 731395403} - - {fileID: 1677074424} - {fileID: 733993260} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}