From 850af8407878aa58b5a3dcf0e49869b6990913b6 Mon Sep 17 00:00:00 2001
From: zhangjie0072 <zhangjie0072@126.com>
Date: Tue, 9 Aug 2022 10:01:52 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=8E=BB=E6=8E=89=E4=BA=86=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E8=8E=B7=E5=BE=97=E5=A5=96=E5=8A=B1=E7=9A=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=9B=E7=BB=93=E5=B1=80=E6=8C=89=E9=92=AE=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E5=BC=B9=E5=87=BA=E6=9D=A5=E9=9D=A2=E6=9D=BF=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Editor/StarkBuilderSetting.asset              |  4 ++--
 .../Scripts/UI/CustomControl/LevelPage/LevelPage.cs  |  4 ++--
 Assets/Scripts/UI/PanelGame.cs                       |  8 +++++++-
 Assets/Scripts/UI/PanelResult.cs                     | 12 +++++++++---
 .../NativeSDK/Scripts/SDK/TKGNativeInterfaceWebgl.cs |  5 +++++
 5 files changed, 25 insertions(+), 8 deletions(-)

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<PanelGameAni>();
 
@@ -200,6 +200,12 @@ public class PanelGame : BasePanel
         }
     }
 
+    private void OnClickShowEndingsDirectly()
+    {
+        PanelEndings tUIEndings = UIManager.Instance.OpenUI<PanelEndings>();
+        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<PanelEndings>();
+        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
         }