diff --git a/Assets/PipeOut/Scenes/HomeScene.unity b/Assets/PipeOut/Scenes/HomeScene.unity index 2253801d..08aa2170 100644 --- a/Assets/PipeOut/Scenes/HomeScene.unity +++ b/Assets/PipeOut/Scenes/HomeScene.unity @@ -1102,46 +1102,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 43372957} m_CullTransparentMesh: 1 ---- !u!21 &45468731 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 2DxFX/Standard/GrayScale - m_Shader: {fileID: 4800000, guid: 62ced1108742e2c4d99c2a6c0708300f, 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: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Alpha: 0 - - _ColorMask: 15 - - _EffectAmount: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] --- !u!1 &46670093 GameObject: m_ObjectHideFlags: 0 @@ -1937,6 +1897,46 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 71913724} m_CullTransparentMesh: 1 +--- !u!21 &72233774 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 2DxFX/Standard/GrayScale + m_Shader: {fileID: 4800000, guid: 62ced1108742e2c4d99c2a6c0708300f, 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: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Alpha: 0 + - _ColorMask: 15 + - _EffectAmount: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!1001 &74812769 PrefabInstance: m_ObjectHideFlags: 0 @@ -2575,7 +2575,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.4117647} + m_Color: {r: 0, g: 0, b: 0, a: 0.003921569} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2980,10 +2980,10 @@ RectTransform: - {fileID: 11357886} m_Father: {fileID: 1498741825} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194, y: -209.5} + m_SizeDelta: {x: 326, y: 419} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &172872626 MonoBehaviour: @@ -3507,6 +3507,46 @@ CanvasRenderer: m_GameObject: {fileID: 197020553} m_CullTransparentMesh: 1 --- !u!21 &200346472 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 2DxFX/Standard/GrayScale + m_Shader: {fileID: 4800000, guid: 62ced1108742e2c4d99c2a6c0708300f, 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: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Alpha: 0 + - _ColorMask: 15 + - _EffectAmount: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] +--- !u!21 &203731761 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -4328,10 +4368,10 @@ RectTransform: - {fileID: 571402966} m_Father: {fileID: 729044174} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 540, y: -466} - m_SizeDelta: {x: 350, y: 419} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 419} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &241898822 MonoBehaviour: @@ -7356,12 +7396,12 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1678934079} m_TargetAssemblyTypeName: ShopManager, Assembly-CSharp - m_MethodName: Consumable_Btn_Pressed + m_MethodName: EquipUnEquipPipe m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 1 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -8252,6 +8292,46 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!21 &398192806 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 2DxFX/Standard/GrayScale + m_Shader: {fileID: 4800000, guid: 62ced1108742e2c4d99c2a6c0708300f, 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: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Alpha: 0 + - _ColorMask: 15 + - _EffectAmount: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!1 &404524444 GameObject: m_ObjectHideFlags: 0 @@ -10041,12 +10121,12 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1678934079} m_TargetAssemblyTypeName: ShopManager, Assembly-CSharp - m_MethodName: Consumable_Btn_Pressed + m_MethodName: Consumable_Btn_Pressed_Pipes m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 5 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -10250,12 +10330,12 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1678934079} m_TargetAssemblyTypeName: ShopManager, Assembly-CSharp - m_MethodName: Consumable_Btn_Pressed + m_MethodName: Consumable_Btn_Pressed_Pipes m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 4 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -11281,53 +11361,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 603237721} m_CullTransparentMesh: 1 ---- !u!21 &607389983 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 2DxFX/Standard/Shiny_Reflect - m_Shader: {fileID: 4800000, guid: 6fc94ae14d17d3642b09718b5b932fd2, 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: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex2: - m_Texture: {fileID: 2800000, guid: 6ed1aafd335608e48aa3198044a161df, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Alpha: 0 - - _ColorMask: 15 - - _Distortion: -0.5231153 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _Value2: 0.261 - - _Value3: 0.53 - - _Value4: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] --- !u!1 &622172422 GameObject: m_ObjectHideFlags: 0 @@ -12041,12 +12074,12 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1678934079} m_TargetAssemblyTypeName: ShopManager, Assembly-CSharp - m_MethodName: Consumable_Btn_Pressed + m_MethodName: EquipUnEquipPipe m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 3 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -12345,12 +12378,12 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1678934079} m_TargetAssemblyTypeName: ShopManager, Assembly-CSharp - m_MethodName: Consumable_Btn_Pressed + m_MethodName: Consumable_Btn_Pressed_Pipes m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 2 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -12478,12 +12511,12 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1678934079} m_TargetAssemblyTypeName: ShopManager, Assembly-CSharp - m_MethodName: Consumable_Btn_Pressed + m_MethodName: EquipUnEquipPipe m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 5 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -13172,12 +13205,12 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1678934079} m_TargetAssemblyTypeName: ShopManager, Assembly-CSharp - m_MethodName: Consumable_Btn_Pressed + m_MethodName: EquipUnEquipPipe m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 4 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -13330,10 +13363,10 @@ RectTransform: - {fileID: 468287106} m_Father: {fileID: 729044174} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 190, y: -466} - m_SizeDelta: {x: 350, y: 419} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 419} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &742312105 MonoBehaviour: @@ -14770,6 +14803,46 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 799869584} m_CullTransparentMesh: 1 +--- !u!21 &804472034 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 2DxFX/Standard/GrayScale + m_Shader: {fileID: 4800000, guid: 62ced1108742e2c4d99c2a6c0708300f, 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: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Alpha: 0 + - _ColorMask: 15 + - _EffectAmount: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!1 &806029249 GameObject: m_ObjectHideFlags: 0 @@ -15488,10 +15561,10 @@ RectTransform: - {fileID: 1962511984} m_Father: {fileID: 1498741825} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 886, y: -690.47} + m_SizeDelta: {x: 326, y: 419} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &834114142 MonoBehaviour: @@ -18281,7 +18354,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1678934079} m_TargetAssemblyTypeName: ShopManager, Assembly-CSharp - m_MethodName: Consumable_Btn_Pressed + m_MethodName: EquipUnEquipPipe m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -20365,7 +20438,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1065494041 RectTransform: m_ObjectHideFlags: 0 @@ -25178,10 +25251,10 @@ RectTransform: - {fileID: 1179743920} m_Father: {fileID: 1498741825} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 540, y: -209.5} + m_SizeDelta: {x: 326, y: 419} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1281964638 MonoBehaviour: @@ -25952,46 +26025,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1317342453} m_CullTransparentMesh: 1 ---- !u!21 &1319606043 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 2DxFX/Standard/GrayScale - m_Shader: {fileID: 4800000, guid: 62ced1108742e2c4d99c2a6c0708300f, 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: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Alpha: 0 - - _ColorMask: 15 - - _EffectAmount: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] --- !u!1 &1320384014 GameObject: m_ObjectHideFlags: 0 @@ -26736,10 +26769,10 @@ RectTransform: - {fileID: 451883053} m_Father: {fileID: 1498741825} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 540, y: -690.47} + m_SizeDelta: {x: 326, y: 419} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1358291108 MonoBehaviour: @@ -27988,10 +28021,10 @@ RectTransform: - {fileID: 918846004} m_Father: {fileID: 1498741825} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 886, y: -209.5} + m_SizeDelta: {x: 326, y: 419} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1422877297 MonoBehaviour: @@ -29240,6 +29273,53 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1463309813} m_CullTransparentMesh: 1 +--- !u!21 &1465077386 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 2DxFX/Standard/Shiny_Reflect + m_Shader: {fileID: 4800000, guid: 6fc94ae14d17d3642b09718b5b932fd2, 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: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex2: + m_Texture: {fileID: 2800000, guid: 6ed1aafd335608e48aa3198044a161df, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Alpha: 0 + - _ColorMask: 15 + - _Distortion: 1.1208586 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _Value2: 0.261 + - _Value3: 0.53 + - _Value4: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!1001 &1470481044 PrefabInstance: m_ObjectHideFlags: 0 @@ -30202,6 +30282,46 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!21 &1515310021 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 2DxFX/Standard/GrayScale + m_Shader: {fileID: 4800000, guid: 62ced1108742e2c4d99c2a6c0708300f, 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: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Alpha: 0 + - _ColorMask: 15 + - _EffectAmount: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!1 &1518156832 GameObject: m_ObjectHideFlags: 0 @@ -30738,7 +30858,7 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1546842696} m_Enabled: 1 - m_Alpha: 1 + m_Alpha: 0 m_Interactable: 1 m_BlocksRaycasts: 0 m_IgnoreParentGroups: 0 @@ -31011,10 +31131,10 @@ RectTransform: - {fileID: 1358473670} m_Father: {fileID: 729044174} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 890, y: -466} - m_SizeDelta: {x: 350, y: 419} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 419} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1581228821 MonoBehaviour: @@ -32248,6 +32368,10 @@ MonoBehaviour: desc: price: 14.99 pItem: + - Name: PiPuzzle Pipe variation 0 + Id: pipuzzle.pipes_0 + desc: + price: 4.99 - Name: PiPuzzle Pipe variation 1 Id: pipuzzle.pipes_1 desc: @@ -32256,6 +32380,18 @@ MonoBehaviour: Id: pipuzzle.pipes_2 desc: price: 4.99 + - Name: PiPuzzle pipe variation 3 + Id: pipuzzle.pipes_3 + desc: + price: 4.99 + - Name: PiPuzzle pipe variation 4 + Id: pipuzzle.pipes_4 + desc: + price: 4.99 + - Name: PiPuzzle pipe variation 5 + Id: pipuzzle.pipes_5 + desc: + price: 4.99 coinsRewards: 320000006400000096000000fa000000f4010000 inp: {fileID: 0} data: @@ -32290,6 +32426,31 @@ MonoBehaviour: PurchaseButton: {fileID: 2049085955} EquipButton: {fileID: 939809641} equipButtonText: {fileID: 1010265900} + - isPurchased: 0 + isEquipped: 0 + PurchaseButton: {fileID: 2099440483} + EquipButton: {fileID: 363766444} + equipButtonText: {fileID: 979198870} + - isPurchased: 0 + isEquipped: 0 + PurchaseButton: {fileID: 670529723} + EquipButton: {fileID: 2009561877} + equipButtonText: {fileID: 1174361472} + - isPurchased: 0 + isEquipped: 0 + PurchaseButton: {fileID: 2134556135} + EquipButton: {fileID: 648177455} + equipButtonText: {fileID: 1496153180} + - isPurchased: 0 + isEquipped: 0 + PurchaseButton: {fileID: 529338874} + EquipButton: {fileID: 734654934} + equipButtonText: {fileID: 652325416} + - isPurchased: 0 + isEquipped: 0 + PurchaseButton: {fileID: 491212896} + EquipButton: {fileID: 672771275} + equipButtonText: {fileID: 251198323} currentPurchaseType: 0 coinTxt: {fileID: 1790415148045805690} AdsPurchasedWindow: {fileID: 0} @@ -32950,7 +33111,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 607389983} + m_Material: {fileID: 1465077386} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -32958,7 +33119,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 06dffca9e3f00254ca057e54eeaf4db6, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -35402,46 +35563,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!21 &1884848740 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 2DxFX/Standard/GrayScale - m_Shader: {fileID: 4800000, guid: 62ced1108742e2c4d99c2a6c0708300f, 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: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Alpha: 0 - - _ColorMask: 15 - - _EffectAmount: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] --- !u!1 &1891858550 GameObject: m_ObjectHideFlags: 0 @@ -35457,7 +35578,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1891858551 RectTransform: m_ObjectHideFlags: 0 @@ -35613,46 +35734,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1894494159} m_CullTransparentMesh: 1 ---- !u!21 &1897819835 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 2DxFX/Standard/GrayScale - m_Shader: {fileID: 4800000, guid: 62ced1108742e2c4d99c2a6c0708300f, 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: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Alpha: 0 - - _ColorMask: 15 - - _EffectAmount: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] --- !u!1 &1900893649 GameObject: m_ObjectHideFlags: 0 @@ -36447,46 +36528,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1943962636} m_CullTransparentMesh: 1 ---- !u!21 &1956643102 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 2DxFX/Standard/GrayScale - m_Shader: {fileID: 4800000, guid: 62ced1108742e2c4d99c2a6c0708300f, 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: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Alpha: 0 - - _ColorMask: 15 - - _EffectAmount: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] --- !u!1 &1957314459 GameObject: m_ObjectHideFlags: 0 @@ -37294,12 +37335,12 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1678934079} m_TargetAssemblyTypeName: ShopManager, Assembly-CSharp - m_MethodName: Consumable_Btn_Pressed + m_MethodName: EquipUnEquipPipe m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 2 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -37511,10 +37552,10 @@ RectTransform: - {fileID: 1518156833} m_Father: {fileID: 1498741825} 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: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 194, y: -690.47} + m_SizeDelta: {x: 326, y: 419} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2020170880 MonoBehaviour: @@ -38160,7 +38201,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1678934079} m_TargetAssemblyTypeName: ShopManager, Assembly-CSharp - m_MethodName: Consumable_Btn_Pressed + m_MethodName: Consumable_Btn_Pressed_Pipes m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -38909,12 +38950,12 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1678934079} m_TargetAssemblyTypeName: ShopManager, Assembly-CSharp - m_MethodName: Consumable_Btn_Pressed + m_MethodName: Consumable_Btn_Pressed_Pipes m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 1 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 @@ -39855,12 +39896,12 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1678934079} m_TargetAssemblyTypeName: ShopManager, Assembly-CSharp - m_MethodName: Consumable_Btn_Pressed + m_MethodName: Consumable_Btn_Pressed_Pipes m_Mode: 3 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 + m_IntArgument: 3 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 diff --git a/Assets/Scripts/HomeScene.cs b/Assets/Scripts/HomeScene.cs index 182790d3..e8bbc6de 100644 --- a/Assets/Scripts/HomeScene.cs +++ b/Assets/Scripts/HomeScene.cs @@ -97,9 +97,11 @@ public class HomeScene : MonoBehaviour } Music.instance.Play(Music.Type.MainMusic); Application.targetFrameRate = 60; + EnteredNameButton.interactable = false; } + private void CheckForAvatar() { int hasSelectedAvatar = PlayerPrefs.GetInt(GameConstants.AvatarSelectedCheckKey, 0); diff --git a/Assets/ShopManager.cs b/Assets/ShopManager.cs index b9825125..9386d1c2 100644 --- a/Assets/ShopManager.cs +++ b/Assets/ShopManager.cs @@ -114,9 +114,8 @@ public class ShopManager : MonoBehaviour, IDetailedStoreListener builder.AddProduct(cItem[i].Id, ProductType.Consumable); } - for (int i = 0; i < pItem.Count; i++) + for (int i = 1; i < pItem.Count; i++)//Starting from 1 because 1 set of pipe is already bought by default. { - builder.AddProduct(pItem[i].Id, ProductType.NonConsumable); } //builder.AddProduct(ncItem.Id, ProductType.NonConsumable);