From 6abae508a3c5683873d19cf30215b66a341ec9c5 Mon Sep 17 00:00:00 2001 From: "xiaohui.wang" Date: Wed, 1 Feb 2023 15:49:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/IronSource.meta | 8 - .../Editor/Build/Editor_Android/export_apk.sh | 2 +- .../Editor/Build/Editor_iOS/export_ipa.sh | 2 +- .../Assets/Joypac/Resources/StockCoin.prefab | 937 ++++++++++++++++++ .../Resources/StockCoin.prefab.meta} | 5 +- popcorn/Assets/MyGame/Scripts/AdManager.cs | 180 ---- .../Assets/MyGame/Scripts/AdManager.cs.meta | 11 - .../Assets/MyGame/Scripts/AnalyticsInit.cs | 87 -- .../MyGame/Scripts/AnalyticsInit.cs.meta | 11 - popcorn/Assets/MyGame/Scripts/CoinManager.cs | 5 + 10 files changed, 946 insertions(+), 302 deletions(-) delete mode 100644 popcorn/Assets/IronSource.meta create mode 100644 popcorn/Assets/Joypac/Resources/StockCoin.prefab rename popcorn/Assets/{FacebookSDK.meta => Joypac/Resources/StockCoin.prefab.meta} (57%) delete mode 100644 popcorn/Assets/MyGame/Scripts/AdManager.cs delete mode 100644 popcorn/Assets/MyGame/Scripts/AdManager.cs.meta delete mode 100644 popcorn/Assets/MyGame/Scripts/AnalyticsInit.cs delete mode 100644 popcorn/Assets/MyGame/Scripts/AnalyticsInit.cs.meta diff --git a/popcorn/Assets/IronSource.meta b/popcorn/Assets/IronSource.meta deleted file mode 100644 index 54bb0951..00000000 --- a/popcorn/Assets/IronSource.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: be9a61d6240244534a682941853f5391 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_Android/export_apk.sh b/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_Android/export_apk.sh index ae2c78df..36bd3575 100644 --- a/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_Android/export_apk.sh +++ b/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_Android/export_apk.sh @@ -31,7 +31,7 @@ PROJ_PATH=${CurrentScriptPath//${CurrentScriptRelativePath}//""} PROJ_PATH=${PROJ_PATH%?} # unity app path -UNITY_PATH=/Applications/Unity/Hub/Editor/2019.4.19f1/Unity.app/Contents/MacOS/Unity +UNITY_PATH=/Applications/Unity/Hub/Editor/2021.3.3f1/Unity.app/Contents/MacOS/Unity # 构建日志的输出路径 LOG_PATH=$PROJ_PATH/BuildProductDir/Android/Log/BuildApk.log diff --git a/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_iOS/export_ipa.sh b/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_iOS/export_ipa.sh index 8ffa6deb..b4b68dbd 100644 --- a/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_iOS/export_ipa.sh +++ b/popcorn/Assets/JoyPacSDK/Core/Automation/Editor/Build/Editor_iOS/export_ipa.sh @@ -31,7 +31,7 @@ PROJ_PATH=${CurrentScriptPath//${CurrentScriptRelativePath}//""} PROJ_PATH=${PROJ_PATH%?} # unity app path -UNITY_PATH=/Applications/Unity/Hub/Editor/2019.4.19f1/Unity.app/Contents/MacOS/Unity +UNITY_PATH=/Applications/Unity/Hub/Editor/2021.3.3f1/Unity.app/Contents/MacOS/Unity # 构建日志的输出路径 LOG_PATH=$PROJ_PATH/BuildProductDir/iOS/Log/BuildIpa.log diff --git a/popcorn/Assets/Joypac/Resources/StockCoin.prefab b/popcorn/Assets/Joypac/Resources/StockCoin.prefab new file mode 100644 index 00000000..870a60d7 --- /dev/null +++ b/popcorn/Assets/Joypac/Resources/StockCoin.prefab @@ -0,0 +1,937 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &346840282760502410 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2122735258353778075} + - component: {fileID: 3809661935830606709} + - component: {fileID: 1881839039929136431} + m_Layer: 5 + m_Name: Image_coin_a + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2122735258353778075 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 346840282760502410} + 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_Children: [] + m_Father: {fileID: 6089816675071985650} + 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} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 86, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3809661935830606709 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 346840282760502410} + m_CullTransparentMesh: 0 +--- !u!114 &1881839039929136431 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 346840282760502410} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 4425aa3ec48519546b72cc0a9448c2ef, 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 &611310516364815806 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2329368695348177118} + - component: {fileID: 4677843214926807376} + - component: {fileID: 3169563452070944995} + m_Layer: 5 + m_Name: Image_coin_c + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2329368695348177118 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 611310516364815806} + 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_Children: [] + m_Father: {fileID: 6089816675071985650} + m_RootOrder: 3 + 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: 86, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4677843214926807376 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 611310516364815806} + m_CullTransparentMesh: 0 +--- !u!114 &3169563452070944995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 611310516364815806} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: bb3bb9ab8a6fdc64a901cd21bf76a87b, 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 &1035302578426612489 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 958532220953090317} + - component: {fileID: 4252276149255043770} + - component: {fileID: 476683824169288246} + m_Layer: 5 + m_Name: Image_coin_b + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &958532220953090317 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035302578426612489} + 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_Children: [] + m_Father: {fileID: 6089816675071985650} + m_RootOrder: 2 + 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: 86, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4252276149255043770 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035302578426612489} + m_CullTransparentMesh: 0 +--- !u!114 &476683824169288246 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1035302578426612489} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d919899659cd2714e8396a059015062b, 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 &2786310666687488320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6798744017922546620} + - component: {fileID: 8748086481994047027} + - component: {fileID: 8438841063172498984} + m_Layer: 5 + m_Name: Image_coin_g + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6798744017922546620 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2786310666687488320} + 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_Children: [] + m_Father: {fileID: 6089816675071985650} + m_RootOrder: 7 + 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: 86, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8748086481994047027 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2786310666687488320} + m_CullTransparentMesh: 0 +--- !u!114 &8438841063172498984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2786310666687488320} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2aba0ae42cd9d5a40bbe1235de7494c4, 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 &4773063572364199804 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7079477697412093444} + - component: {fileID: 2208658522132776518} + - component: {fileID: 8844514537513418761} + m_Layer: 5 + m_Name: Image_coin_e + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7079477697412093444 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4773063572364199804} + 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_Children: [] + m_Father: {fileID: 6089816675071985650} + m_RootOrder: 5 + 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: 86, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2208658522132776518 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4773063572364199804} + m_CullTransparentMesh: 0 +--- !u!114 &8844514537513418761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4773063572364199804} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 6b6ef205b1355db4f96c259432351c50, 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 &6089816675026951742 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6089816675026951743} + - component: {fileID: 6089816675026951873} + - component: {fileID: 6089816675026951872} + m_Layer: 5 + m_Name: Image_coin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6089816675026951743 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089816675026951742} + 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_Children: [] + m_Father: {fileID: 6089816675071985650} + 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} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 86, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6089816675026951873 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089816675026951742} + m_CullTransparentMesh: 0 +--- !u!114 &6089816675026951872 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089816675026951742} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 49b034d081d0e324cb96972d614001d9, 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 &6089816675071985649 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6089816675071985650} + - component: {fileID: 1556718050306767610} + m_Layer: 5 + m_Name: Icon_Coin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6089816675071985650 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089816675071985649} + 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_Children: + - {fileID: 6089816675026951743} + - {fileID: 2122735258353778075} + - {fileID: 958532220953090317} + - {fileID: 2329368695348177118} + - {fileID: 5793718617570107943} + - {fileID: 7079477697412093444} + - {fileID: 8994223854375698877} + - {fileID: 6798744017922546620} + m_Father: {fileID: 6089816676318797793} + m_RootOrder: 0 + 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: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &1556718050306767610 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089816675071985649} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 483d9c381d24f1f47a5cb159dda7c842, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &6089816675273065153 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6089816675273065154} + - component: {fileID: 6089816675273065156} + - component: {fileID: 6089816675273065155} + m_Layer: 5 + m_Name: Text_StockCoin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6089816675273065154 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089816675273065153} + 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_Children: [] + m_Father: {fileID: 6089816676318797793} + m_RootOrder: 1 + 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: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6089816675273065156 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089816675273065153} + m_CullTransparentMesh: 0 +--- !u!114 &6089816675273065155 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089816675273065153} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.3372549, g: 0.21960784, b: 0.14117648, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_FontSize: 45 + m_FontStyle: 1 + m_BestFit: 1 + m_MinSize: 45 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: '0 ' +--- !u!1 &6089816676318797792 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6089816676318797793} + - component: {fileID: 4038288509600736832} + - component: {fileID: 6089816676318797795} + - component: {fileID: 6089816676318797794} + - component: {fileID: 6089816676318797797} + - component: {fileID: 6089816676318797796} + - component: {fileID: 493794528729404611} + - component: {fileID: 2642077970430750428} + m_Layer: 5 + m_Name: StockCoin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6089816676318797793 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089816676318797792} + 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_Children: + - {fileID: 6089816675071985650} + - {fileID: 6089816675273065154} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 26, y: -39} + m_SizeDelta: {x: 0, y: 74} + m_Pivot: {x: 0, y: 1} +--- !u!114 &4038288509600736832 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089816676318797792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3} + m_Name: + m_EditorClassIdentifier: + coinIconTransform: {fileID: 6089816675071985650} + coinCountText: {fileID: 6089816675273065155} + coinAnimator: {fileID: 1556718050306767610} + coinPrefab: {fileID: 6519287602467882899, guid: 283c4ac7154b55546841276b29f0e301, + type: 3} + bulkOrderAchievedEffect: {fileID: 0} + coinUpDuration: 0.5 + coinMoveDuration: 0.5 + rootTransform: {fileID: 0} + coinvideoButton: {fileID: 493794528729404611} + refreshRewardCoin: 100 +--- !u!222 &6089816676318797795 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089816676318797792} + m_CullTransparentMesh: 0 +--- !u!114 &6089816676318797794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089816676318797792} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 582b70d53a85e4e74be0fb9ca6be120c, type: 3} + m_Type: 1 + 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!114 &6089816676318797797 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089816676318797792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &6089816676318797796 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089816676318797792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 42 + m_Right: 30 + m_Top: -10 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 54 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!114 &493794528729404611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089816676318797792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6089816676318797794} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2642077970430750428 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089816676318797792} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} + m_Name: + m_EditorClassIdentifier: + onClickPlaySEFilename: se_ButtonTap + randomPlaySEFilenames: [] + randomPlayVoiceFilenames: [] + vibrationType: 0 +--- !u!1 &7367431627811268232 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8994223854375698877} + - component: {fileID: 638665382751716365} + - component: {fileID: 7335190463779276416} + m_Layer: 5 + m_Name: Image_coin_f + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8994223854375698877 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7367431627811268232} + 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_Children: [] + m_Father: {fileID: 6089816675071985650} + m_RootOrder: 6 + 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: 86, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &638665382751716365 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7367431627811268232} + m_CullTransparentMesh: 0 +--- !u!114 &7335190463779276416 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7367431627811268232} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: aa99a8afce5ebe44eb27d3b7863d3b7a, 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 &8728579374215151595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5793718617570107943} + - component: {fileID: 4262034483162046751} + - component: {fileID: 2676996683485168293} + m_Layer: 5 + m_Name: Image_coin_d + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5793718617570107943 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8728579374215151595} + 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_Children: [] + m_Father: {fileID: 6089816675071985650} + m_RootOrder: 4 + 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: 86, y: 92} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4262034483162046751 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8728579374215151595} + m_CullTransparentMesh: 0 +--- !u!114 &2676996683485168293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8728579374215151595} + 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_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 60ea2603d1de7db439be110aba8e1a06, 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 diff --git a/popcorn/Assets/FacebookSDK.meta b/popcorn/Assets/Joypac/Resources/StockCoin.prefab.meta similarity index 57% rename from popcorn/Assets/FacebookSDK.meta rename to popcorn/Assets/Joypac/Resources/StockCoin.prefab.meta index d2200942..729fdfae 100644 --- a/popcorn/Assets/FacebookSDK.meta +++ b/popcorn/Assets/Joypac/Resources/StockCoin.prefab.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: 70ee7d8db6d4a4a4c8c7271d8aa15ad6 -folderAsset: yes -DefaultImporter: +guid: a6d95ef34f0f240ab8adbebcf7fad87f +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/popcorn/Assets/MyGame/Scripts/AdManager.cs b/popcorn/Assets/MyGame/Scripts/AdManager.cs deleted file mode 100644 index 6a001a47..00000000 --- a/popcorn/Assets/MyGame/Scripts/AdManager.cs +++ /dev/null @@ -1,180 +0,0 @@ -using System; -using UnityEngine; -using GameAnalyticsSDK; -using MyGame.Scenes.marketing.Scripts; - -public sealed class AdManager : SingletonMonoBehaviour { - - public static readonly string AD_PLACEMENT_COIN = "coin"; - public static readonly string AD_PLACEMENT_CORNFIELD = "cornfield"; - public static readonly string AD_PLACEMENT_CUSTOMER = "increase_customer"; - public static readonly string AD_PLACEMENT_PERFECT = "perfect_popcorn"; - public static readonly string AD_PLACEMENT_VIP = "vip_customer"; - public static readonly string AD_PLACEMENT_AUTO = "auto_popcorn"; - public static readonly string AD_PLACEMENT_SCROLLGAME = "scroll_game"; - - //-- ironSource --// -#if UNITY_IOS - private static readonly string IRONSOURCE_APP_KEY = "11bc8b5ad"; -#else - private static readonly string IRONSOURCE_APP_KEY = "11bc928bd"; -#endif - - private Action _rewardAdCallback = null; - private readonly int ASYNC_FRAME_LIMIT = 60; - private int _async_frame_count = 0; - private bool _rewardAdOpen = false; - private bool _rewardAdClose = false; - private bool _rewardAdFinish = false; - private float _timeScale = 0.0f; - - private bool _marketPause; - private bool _cacheSeEnabled; - - void Awake(){ -#if UNITY_EDITOR - return; -#endif - InitializeRewardedAds(); - -#if DEVELOPMENT_BUILD - IronSource.Agent.validateIntegration (); - IronSource.Agent.setAdaptersDebug(true); -#endif - IronSource.Agent.init (IRONSOURCE_APP_KEY); - } - - void Start(){ -#if UNITY_EDITOR - return; -#endif - LoadBannerAds(); - ShowBannerAd(); - } - - void Update (){ - if(_rewardAdOpen){ - _rewardAdOpen = false; - pauseGame(); - }else if(_rewardAdClose){ - if(_rewardAdFinish){ - _rewardAdClose = false; - this.RewardAdCallbackClose(_rewardAdFinish); - }else if(ASYNC_FRAME_LIMIT > _async_frame_count){ - _async_frame_count++; - }else{ - _rewardAdClose = false; - this.RewardAdCallbackClose(_rewardAdFinish); - } - } - } - - void OnApplicationPause(bool isPaused) { - IronSource.Agent.onApplicationPause(isPaused); - } - - //-- Banners Ads --// - - public void LoadBannerAds(){ - IronSource.Agent.loadBanner(IronSourceBannerSize.SMART, IronSourceBannerPosition.BOTTOM); - - } - public void ShowBannerAd(){ - IronSource.Agent.displayBanner(); - } - public void HideBanner(){ - IronSource.Agent.hideBanner(); - } - - public void InitializeRewardedAds(){ - IronSourceEvents.onRewardedVideoAdOpenedEvent += RewardedVideoAdOpenedEvent; - IronSourceEvents.onRewardedVideoAdClosedEvent += RewardedVideoAdClosedEvent; - IronSourceEvents.onRewardedVideoAvailabilityChangedEvent += RewardedVideoAvailabilityChangedEvent; - IronSourceEvents.onRewardedVideoAdStartedEvent += RewardedVideoAdStartedEvent; - IronSourceEvents.onRewardedVideoAdRewardedEvent += RewardedVideoAdRewardedEvent; - IronSourceEvents.onRewardedVideoAdShowFailedEvent += RewardedVideoAdShowFailedEvent; - } - private void RewardedVideoAdOpenedEvent(){ - _rewardAdOpen = true; - } - private void RewardedVideoAdClosedEvent(){ - _rewardAdClose = true; - } - private void RewardedVideoAvailabilityChangedEvent(bool available){ - } - private void RewardedVideoAdStartedEvent(){ - } - private void RewardedVideoAdRewardedEvent(IronSourcePlacement placement){ - _rewardAdFinish = true; - } - private void RewardedVideoAdShowFailedEvent (IronSourceError error){ - _rewardAdClose = true; - } - public bool IsLoadedRewardVideo(){ -#if UNITY_EDITOR - return !UsayaStorageManager.LoadOrDefault(UsayaStorageFilename.Settings_Data, "DebugAlwaysVideoFailToLoad", false); -#else - return IronSource.Agent.isRewardedVideoAvailable(); -#endif - } - public void ShowRewardVideo(Action callback, string ad_placement = "none"){ -#if UNITY_EDITOR - callback(true); -#else - _rewardAdCallback = callback; - if(_rewardAdCallback == null){ - return; - }else if(IsLoadedRewardVideo()){ - _rewardAdOpen = false; - _rewardAdFinish = false; - _rewardAdClose = false; - _async_frame_count = 0; - IronSource.Agent.showRewardedVideo(); -#if !DEVELOPMENT_BUILD && !UNITY_EDITOR - GameAnalytics.NewAdEvent(GAAdAction.FailedShow, GAAdType.RewardedVideo, "ironsource", ad_placement); -#endif - }else{ - _rewardAdCallback(false); - } -#endif - } - private void RewardAdCallbackClose(bool success){ - resumeGame(); - _rewardAdCallback(success); - - // 広告カウント不具合確認用 - if (_rewardAdClose && !_rewardAdFinish) - { - Debug.Log($"_async_frame_count:{_async_frame_count}"); - throw new Exception("RewardAd closed but not finish."); - } - } - - private void pauseGame(){ - SoundManager.Instance.PauseBGM(); - SoundManager.Instance.StopSE(); - _cacheSeEnabled = SoundManager.Instance.IsEnabled(SoundType.SE); - SoundManager.Instance.SaveEnabledSE(false); - _marketPause = WorldMarketManager.Instance.IsPause.Value; - WorldMarketManager.Instance.IsPause.Value = true; - if(Time.timeScale > 0.0f){ - _timeScale = Time.timeScale; - // TimeManager.Instance.Stop(); - } - } - private void resumeGame(){ - SoundManager.Instance.ReplayBGM(); - SoundManager.Instance.SaveEnabledSE(_cacheSeEnabled); - // キャッシュしていた元の状態に戻す - if (WorldMarketManager.Instance.IsPause.Value) - { - WorldMarketManager.Instance.IsPause.Value = _marketPause; - } - if(_timeScale > 0.0f){ - Time.timeScale = _timeScale; - // TimeManager.Instance.ChangeTimeScale(_timeScale); - _timeScale = 0.0f; - } - } - -} \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scripts/AdManager.cs.meta b/popcorn/Assets/MyGame/Scripts/AdManager.cs.meta deleted file mode 100644 index ac618c67..00000000 --- a/popcorn/Assets/MyGame/Scripts/AdManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8fe33320e94734956ae359b8d952d2b6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scripts/AnalyticsInit.cs b/popcorn/Assets/MyGame/Scripts/AnalyticsInit.cs deleted file mode 100644 index 497c6fd4..00000000 --- a/popcorn/Assets/MyGame/Scripts/AnalyticsInit.cs +++ /dev/null @@ -1,87 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using Facebook.Unity; -using GameAnalyticsSDK; -#if UNITY_IOS -using Unity.Advertisement.IosSupport; -#endif - - -public class AnalyticsInit : MonoBehaviour , IGameAnalyticsATTListener{ - - private bool _attDone = false; - - public static readonly string TENJIN_API_KEY = "VCRGBQMHMGYPM2B5ITDHLSVIFTS8JQSW"; - - private void Awake() { - FacebookInit(); - } - - void Start () { - if(Application.platform == RuntimePlatform.IPhonePlayer){ - GameAnalytics.RequestTrackingAuthorization(this); - }else{ - InitAnalytics(); - } - } - - void Update(){ - if(_attDone){ - _attDone = false; - InitAnalytics(); - } - - } - - void OnApplicationPause (bool pauseStatus){ - if(pauseStatus){ - //do nothing - }else{ - TenjinConnect(); - FacebookInit(); - } - } - - private void InitAnalytics(){ -#if UNITY_IOS - SkAdNetworkBinding.SkAdNetworkRegisterAppForNetworkAttribution(); -#endif - GameAnalytics.Initialize(); - TenjinConnect(); - } - - private void TenjinConnect(){ -#if !UNITY_EDITOR - BaseTenjin instance = Tenjin.getInstance(TENJIN_API_KEY); - instance.Connect(); -#endif - } - - //-- GameAnalytics --// - public void GameAnalyticsATTListenerNotDetermined(){ - _attDone = true; - } - public void GameAnalyticsATTListenerRestricted(){ - _attDone = true; - } - public void GameAnalyticsATTListenerDenied(){ - _attDone = true; - } - public void GameAnalyticsATTListenerAuthorized(){ - _attDone = true; - } - - //-- Facebook --// - void FacebookInit(){ - if (FB.IsInitialized) { - FB.ActivateApp(); - } else { - //Handle FB.Init - FB.Init( () => { - FB.ActivateApp(); - }); - } - } - -} \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Scripts/AnalyticsInit.cs.meta b/popcorn/Assets/MyGame/Scripts/AnalyticsInit.cs.meta deleted file mode 100644 index 13aed828..00000000 --- a/popcorn/Assets/MyGame/Scripts/AnalyticsInit.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 20a0a8356965747c9b2f01a28e8e6202 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scripts/CoinManager.cs b/popcorn/Assets/MyGame/Scripts/CoinManager.cs index 2259e006..484701e6 100644 --- a/popcorn/Assets/MyGame/Scripts/CoinManager.cs +++ b/popcorn/Assets/MyGame/Scripts/CoinManager.cs @@ -65,6 +65,11 @@ public class CoinManager : SingletonMonoBehaviour #endif GameDataManager.SaveGameData(); + + if (null!= KitchenManager.CoinCold) + { + KitchenManager.CoinCold(); + } }); }); });