diff --git a/Assets/3rd/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset b/Assets/3rd/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset index 34b94a49..c4d31e71 100644 --- a/Assets/3rd/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset +++ b/Assets/3rd/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset @@ -44,6 +44,7 @@ MonoBehaviour: - MoreMountains.Feedbacks.TextMeshPro - AV.Inspector - NaughtyAttributes.Editor + - IAPResolver - Sirenix.OdinInspector.CompatibilityLayer.Editor - UniTask.Linq - MPUIKit.Editor @@ -74,6 +75,7 @@ MonoBehaviour: - NavMeshComponents - Animancer.FSM - MoreMountains.Feedbacks.NiceVibrations + - Purchasing.Common - UniTask.TextMeshPro - MoreMountains.Feedbacks.Authorizations - UniTask.DOTween diff --git a/Assets/GUI Kit Casual Game/Prefabs/UI_Slider/Slider_LoadingBar.prefab b/Assets/GUI Kit Casual Game/Prefabs/UI_Slider/Slider_LoadingBar.prefab index c1e9ef35..6f67446f 100644 --- a/Assets/GUI Kit Casual Game/Prefabs/UI_Slider/Slider_LoadingBar.prefab +++ b/Assets/GUI Kit Casual Game/Prefabs/UI_Slider/Slider_LoadingBar.prefab @@ -28,9 +28,9 @@ RectTransform: 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: 2482728081838297372} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -60,6 +60,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -67,8 +68,7 @@ MonoBehaviour: m_text: Text...99% m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 50c12c23294124aa48490c44ac65a9e4, type: 2} - m_sharedMaterial: {fileID: 7746803525459343344, guid: 50c12c23294124aa48490c44ac65a9e4, - type: 2} + m_sharedMaterial: {fileID: 7746803525459343344, guid: 50c12c23294124aa48490c44ac65a9e4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -86,13 +86,12 @@ MonoBehaviour: m_fontColorGradientPreset: {fileID: 0} m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_outlineColor: - serializedVersion: 2 - rgba: 4278190080 m_fontSize: 40 m_fontSizeBase: 40 m_fontWeight: 400 @@ -100,7 +99,9 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_textAlignment: 514 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 m_lineSpacing: 0 @@ -110,10 +111,8 @@ MonoBehaviour: m_enableWordWrapping: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 - m_firstOverflowCharacterIndex: -1 m_linkedTextComponent: {fileID: 0} - m_isLinkedTextComponent: 0 - m_isTextTruncated: 0 + parentLinkedComponent: {fileID: 0} m_enableKerning: 1 m_enableExtraPadding: 0 checkPaddingRequired: 0 @@ -121,40 +120,18 @@ MonoBehaviour: m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 - m_ignoreRectMaskCulling: 0 - m_ignoreCulling: 1 m_horizontalMapping: 0 m_verticalMapping: 0 m_uvLineOffset: 0 m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 m_VertexBufferAutoSizeReduction: 1 - m_firstVisibleCharacter: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 m_margin: {x: 0, y: 0, z: 0, w: 0} - m_textInfo: - textComponent: {fileID: 2482728080564616998} - characterCount: 10 - spriteCount: 0 - spaceCount: 0 - wordCount: 2 - linkCount: 0 - lineCount: 1 - pageCount: 1 - materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_spriteAnimator: {fileID: 0} m_hasFontAssetChanged: 0 - m_subTextObjects: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2482728081313853794 @@ -185,9 +162,9 @@ RectTransform: 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: 2482728081838297372} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -217,6 +194,7 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -260,11 +238,11 @@ RectTransform: 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: - {fileID: 2482728081313853795} - {fileID: 2482728080564617017} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -294,12 +272,13 @@ MonoBehaviour: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f9e47d48ae68e48eab6bcdcc8fcac328, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: cc49fd84e1887474dad5380ad522d253, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -322,6 +301,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Navigation: m_Mode: 3 + m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} diff --git a/Assets/Prefab/ShopManager.prefab b/Assets/Prefab/ShopManager.prefab new file mode 100644 index 00000000..9fd296c8 --- /dev/null +++ b/Assets/Prefab/ShopManager.prefab @@ -0,0 +1,148 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3967412330329717953 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2062263522730748915} + - component: {fileID: 3350659821264205536} + m_Layer: 0 + m_Name: ShopManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2062263522730748915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3967412330329717953} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.6210089, y: -1.0801344, z: 90} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3350659821264205536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3967412330329717953} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a5467920342753f45af6cb2b5de436de, type: 3} + m_Name: + m_EditorClassIdentifier: + cItem: + - Name: PiPuzzle Coin Pack 1 + Id: pipuzzle.coin_pack_1 + desc: + price: 1.99 + - Name: PiPuzzle Coin Pack 2 + Id: pipuzzle.coin_pack_2 + desc: + price: 3.49 + - Name: PiPuzzle Coin Pack 3 + Id: pipuzzle.coin_pack_3 + desc: + price: 4.99 + - Name: PiPuzzle Coin Pack 4 + Id: pipuzzle.coin_pack_4 + desc: + price: 7.99 + - Name: PiPuzzle Coin Pack 5 + Id: pipuzzle.coin_pack_5 + 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: + price: 4.99 + - Name: PiPuzzle pipe variation 2 + 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 + coinsRewards: 320000006400000096000000fa000000f4010000 + inp: {fileID: 0} + data: + Payload: + Store: + TransactionID: + payload: + json: + signature: + skuDetails: [] + payloadData: + orderId: + packageName: + productId: + purchaseTime: 0 + purchaseState: 0 + purchaseToken: + quantity: 0 + acknowledged: 0 + payloadData: + orderId: + packageName: + productId: + purchaseTime: 0 + purchaseState: 0 + purchaseToken: + quantity: 0 + acknowledged: 0 + PipeButtons: + - isPurchased: 0 + isEquipped: 0 + PurchaseButton: {fileID: 0} + EquipButton: {fileID: 0} + equipButtonText: {fileID: 0} + - isPurchased: 0 + isEquipped: 0 + PurchaseButton: {fileID: 0} + EquipButton: {fileID: 0} + equipButtonText: {fileID: 0} + - isPurchased: 0 + isEquipped: 0 + PurchaseButton: {fileID: 0} + EquipButton: {fileID: 0} + equipButtonText: {fileID: 0} + - isPurchased: 0 + isEquipped: 0 + PurchaseButton: {fileID: 0} + EquipButton: {fileID: 0} + equipButtonText: {fileID: 0} + - isPurchased: 0 + isEquipped: 0 + PurchaseButton: {fileID: 0} + EquipButton: {fileID: 0} + equipButtonText: {fileID: 0} + currentPurchaseType: 0 + coinTxt: {fileID: 0} + AdsPurchasedWindow: {fileID: 0} + adsBanner: {fileID: 0} + subActivatedWindow: {fileID: 0} + premiumBanner: {fileID: 0} diff --git a/Assets/Prefab/ShopManager.prefab.meta b/Assets/Prefab/ShopManager.prefab.meta new file mode 100644 index 00000000..3ea5f78b --- /dev/null +++ b/Assets/Prefab/ShopManager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4dfd2d4eff9989c4db41b8946355349b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Loading.unity b/Assets/Scenes/Loading.unity index 980d013f..65473d1a 100644 --- a/Assets/Scenes/Loading.unity +++ b/Assets/Scenes/Loading.unity @@ -197,211 +197,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 38584164} m_CullTransparentMesh: 1 ---- !u!1001 &104955743 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1285621382} - m_Modifications: - - target: {fileID: 2482728080564616998, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_text - value: Fight, Survive, and Rise as a Hero of the Labyrinth! - objectReference: {fileID: 0} - - target: {fileID: 2482728080564616998, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_fontSize - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 2482728080564616998, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: d052530be2da14133b3b3f5f9e4babf8, type: 2} - - target: {fileID: 2482728080564616998, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_fontSizeBase - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 2482728080564616998, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_textAlignment - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 2482728080564616998, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: 7970192556030056548, guid: d052530be2da14133b3b3f5f9e4babf8, type: 2} - - target: {fileID: 2482728080564616998, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_enableAutoSizing - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728080564616998, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 2482728080564616998, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_VerticalAlignment - value: 512 - objectReference: {fileID: 0} - - target: {fileID: 2482728080564616998, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2482728080564616998, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_hasFontAssetChanged - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728080564617016, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2482728080564617017, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728080564617017, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728080564617017, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728080564617017, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_SizeDelta.x - value: 781.4438 - objectReference: {fileID: 0} - - target: {fileID: 2482728080564617017, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_SizeDelta.y - value: 65 - objectReference: {fileID: 0} - - target: {fileID: 2482728080564617017, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728080564617017, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_AnchoredPosition.y - value: -110 - objectReference: {fileID: 0} - - target: {fileID: 2482728081313853795, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081313853795, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081313853795, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_SizeDelta.x - value: 0.5793 - objectReference: {fileID: 0} - - target: {fileID: 2482728081313853795, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_AnchoredPosition.x - value: 3.2896118 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_SizeDelta.x - value: 889.334 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_SizeDelta.y - value: 50.81781 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_AnchoredPosition.y - value: 220 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297373, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_Value - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297373, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_MaxValue - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297375, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_Name - value: Slider_LoadingBar - objectReference: {fileID: 0} - - target: {fileID: 2482728081838297375, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} --- !u!224 &119874042 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} @@ -511,6 +306,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &448233534 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 448233535} + - component: {fileID: 448233537} + - component: {fileID: 448233536} + m_Layer: 5 + m_Name: LoadingBarFill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &448233535 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 448233534} + 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: 1845972578} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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: 923, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &448233536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 448233534} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7d0a967d4d6b16845adec2dd0991fd5b, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 0 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &448233537 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 448233534} + m_CullTransparentMesh: 1 --- !u!1 &564785406 GameObject: m_ObjectHideFlags: 0 @@ -579,22 +449,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!224 &591558630 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2482728081838297372, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - m_PrefabInstance: {fileID: 104955743} - m_PrefabAsset: {fileID: 0} ---- !u!114 &591558631 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2482728081838297373, guid: 1655ad8223f244d34a1dc63ee78eac3f, type: 3} - m_PrefabInstance: {fileID: 104955743} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &654387948 GameObject: m_ObjectHideFlags: 0 @@ -1424,8 +1278,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 38584165} - - {fileID: 591558630} - {fileID: 794248334} + - {fileID: 1845972578} m_Father: {fileID: 183355944} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1899,7 +1753,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f98315eaed90eac48829d8d8dda4a446, type: 3} m_Name: m_EditorClassIdentifier: - loadingSlider: {fileID: 591558631} + loadingSlider: {fileID: 448233536} --- !u!4 &1696995257 Transform: m_ObjectHideFlags: 0 @@ -1915,6 +1769,82 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1845972577 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1845972578} + - component: {fileID: 1845972580} + - component: {fileID: 1845972579} + m_Layer: 5 + m_Name: LoadingBarBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1845972578 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845972577} + 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: + - {fileID: 448233535} + m_Father: {fileID: 1285621382} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 140} + m_SizeDelta: {x: 960, y: 81} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &1845972579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845972577} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: cc49fd84e1887474dad5380ad522d253, 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!222 &1845972580 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845972577} + m_CullTransparentMesh: 1 --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Dev/Bootstrapper.cs b/Assets/Scripts/Dev/Bootstrapper.cs index 173b4a7a..d562aa5a 100644 --- a/Assets/Scripts/Dev/Bootstrapper.cs +++ b/Assets/Scripts/Dev/Bootstrapper.cs @@ -7,11 +7,11 @@ using UnityEngine.UI; public class Bootstrapper : MonoBehaviour { - [SerializeField] private Slider loadingSlider; + [SerializeField] private Image loadingSlider; // Start is called before the first frame update void Start() { - loadingSlider.DOValue(100f, 2.5f).OnComplete(() => + loadingSlider.DOFillAmount(1f, 2.5f).OnComplete(() => { SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex + 1); }); diff --git a/Assets/ShopManager.cs b/Assets/ShopManager.cs new file mode 100644 index 00000000..d98f70c6 --- /dev/null +++ b/Assets/ShopManager.cs @@ -0,0 +1,565 @@ +using System.Collections; +using UnityEngine; +using TMPro; +using System; +using UnityEngine.Purchasing; +using System.Collections.Generic; +using static UnityEngine.Networking.UnityWebRequest; +using UnityEngine.Purchasing.Extension; +using UnityEngine.UI; +//using UnityEngine.WSA; +using DG.Tweening; + +[Serializable] +public class ConsumableItem +{ + public string Name; + public string Id; + public string desc; + public float price; +} +[Serializable] +public class NonConsumableItem +{ + public string Name; + public string Id; + public string desc; + public float price; +} +[Serializable] +public class SubscriptionItem +{ + public string Name; + public string Id; + public string desc; + public float price; + public int timeDuration;// in Days +} + +public class ShopManager : MonoBehaviour, IDetailedStoreListener +{ + IStoreController m_StoreController; + + public List cItem; + public List pItem; + public List coinsRewards; + //public NonConsumableItem ncItem; + //public SubscriptionItem sItem; + + public TMP_InputField inp; + + + public Data data; + public Payload payload; + public PayloadData payloadData; + + public List PipeButtons; + //public List