diff --git a/Assets/Editor/StarkBuilderSetting.asset b/Assets/Editor/StarkBuilderSetting.asset index 5a2dd0ba..8b3c565b 100644 --- a/Assets/Editor/StarkBuilderSetting.asset +++ b/Assets/Editor/StarkBuilderSetting.asset @@ -14,12 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: a: 0 b: 0 - c: tt48073ebad739259407 + c: d: e: 2 f: 1 g: 0 - h: 1 + h: 0 i: 2 j: 0 k: 0 diff --git a/Assets/Scripts/UI/CustomControl/LevelPage/LevelPage.cs b/Assets/Scripts/UI/CustomControl/LevelPage/LevelPage.cs index 4e873e9c..eba96e13 100644 --- a/Assets/Scripts/UI/CustomControl/LevelPage/LevelPage.cs +++ b/Assets/Scripts/UI/CustomControl/LevelPage/LevelPage.cs @@ -101,8 +101,8 @@ public class LevelPage : PageView } }); - PlayerData.Instance.UnlockNewLevel(false); - LoadData(true); + //PlayerData.Instance.UnlockNewLevel(false); + //LoadData(true); } private void OnClickShareUnlockLevel(int pLevelIndex) diff --git a/Assets/Scripts/UI/PanelGame.cs b/Assets/Scripts/UI/PanelGame.cs index d3fb05a0..3fde50b2 100644 --- a/Assets/Scripts/UI/PanelGame.cs +++ b/Assets/Scripts/UI/PanelGame.cs @@ -49,7 +49,7 @@ public class PanelGame : BasePanel UIUtils.BindBtn(mBtnMenu, OnClickMenu, AudioClipType.Click_Tip); UIUtils.BindBtn(mBtnPlay, OnClickPlay, AudioClipType.Click_Play); - mBtnEndings.DelClick = OnClickEndings; + mBtnEndings.DelClick = OnClickShowEndingsDirectly; mAni = GetComponent(); @@ -200,6 +200,12 @@ public class PanelGame : BasePanel } } + private void OnClickShowEndingsDirectly() + { + PanelEndings tUIEndings = UIManager.Instance.OpenUI(); + tUIEndings.Init(PlayerData.Instance.CurrentLevelID); + } + private void OnClickPlay() { mGobTapTip.SetActive(false); diff --git a/Assets/Scripts/UI/PanelResult.cs b/Assets/Scripts/UI/PanelResult.cs index d8d1d489..862e3396 100644 --- a/Assets/Scripts/UI/PanelResult.cs +++ b/Assets/Scripts/UI/PanelResult.cs @@ -59,7 +59,7 @@ public class PanelResult : BasePanel UIUtils.BindBtn(mBtnSkip, OnClickSkip, AudioClipType.Click_Normal); UIUtils.BindBtn(mBtnShareSkip, OnClickShareSkip, AudioClipType.Click_Normal); - mBtnEndings.DelClick = OnClickEndings; + mBtnEndings.DelClick = OnClickShowEndingsDirectly; string platform = StarkSDK.API.GetSystemInfo().platform; @@ -213,6 +213,12 @@ public class PanelResult : BasePanel } } + private void OnClickShowEndingsDirectly() + { + PanelEndings tUIEndings = UIManager.Instance.OpenUI(); + tUIEndings.Init(PlayerData.Instance.CurrentLevelID); + } + private void OnClickSkip() { TKGSDKManager.Instance.ShowRewardAd(TKGRVPositionName.RV_end_skip, (pResult) => @@ -224,8 +230,8 @@ public class PanelResult : BasePanel } }); - PlayerData.Instance.UnlockNewLevel(); - GameManager.Instance.NextLevel(); + //PlayerData.Instance.UnlockNewLevel(); + //GameManager.Instance.NextLevel(); } private void OnClickShareSkip() diff --git a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceWebgl.cs b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceWebgl.cs index 0a96d4f9..998f9747 100644 --- a/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceWebgl.cs +++ b/Assets/TKGSDK/NativeSDK/Scripts/SDK/TKGNativeInterfaceWebgl.cs @@ -400,6 +400,11 @@ namespace Touka }, (errcode, errmessage) => { Debug.Log("失败回调, errorcode : " + errcode + " , errmessage : " + errmessage); + if (TKGSDKCallback.mRewardShowFailedCallback != null) + { + TKGSDKCallback.mRewardShowFailedCallback.Invoke(); + TKGSDKCallback.mRewardShowFailedCallback = null; + } }, null); #endif }