diff --git a/Assets/RedHotRoast/Helper/GameHelper.cs b/Assets/RedHotRoast/Helper/GameHelper.cs index d1fb389d..d38df807 100644 --- a/Assets/RedHotRoast/Helper/GameHelper.cs +++ b/Assets/RedHotRoast/Helper/GameHelper.cs @@ -109,17 +109,12 @@ namespace RedHotRoast public static void ShowInterstitial(string key) { - if (GetVipPrivilege(Subscription.RemoveInterstitialAd.As())) return; MaxADKit.ShowInterstitial(key, isSuccess => { if (isSuccess) { SaveData.GetSaveObject().InterstitialPLayNum++; - if (SaveData.GetSaveObject().InterstitialPLayNum >= GetCommonModel().RemoveADsPackPopup) - { - SaveData.GetSaveObject().InterstitialPLayNum = 0; - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LuckyPackUI_Open, true); - } + SaveData.SaveDataFunc(); CtrlDispatcher.Instance.Dispatch(CtrlMsg.WatchIntVideoFinish); @@ -935,25 +930,24 @@ namespace RedHotRoast public static void addInterAdnumber() { - return; + // return; - if (GetVipPrivilege(Subscription.RemoveInterstitialAd.As())) return; + // if (GetVipPrivilege(Subscription.RemoveInterstitialAd.As())) return; look_interad_numbers++; - Debug.Log($"[back hall]1 SaveData.GetSaveObject().is_get_removead=========={SaveData.GetSaveObject().is_get_removead} "); if (!SaveData.GetSaveObject().is_get_removead && look_interad_numbers >= ConfigSystem.GetCommonConf().playtimes) { look_interad_numbers = 0; if (Random.Range(0, 100) < ConfigSystem.GetCommonConf().interstitialtype) { - if (UIManager.Instance.IsExistUI(UIConst.H5UI)) - { - GameHelper.ShowInterstitial("interstitial_gameend"); - } - else - { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AdcomingUI_Open); - } + // if (UIManager.Instance.IsExistUI(UIConst.H5UI)) + // { + ShowInterstitial("interstitial_gameend"); + // } + // else + // { + // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AdcomingUI_Open); + // } } } } diff --git a/Assets/Resources/RedHotRoastAssets/Atlas/Game/icon512.png b/Assets/Resources/RedHotRoastAssets/Atlas/Game/icon512.png index e88f750a..e7421c8d 100644 Binary files a/Assets/Resources/RedHotRoastAssets/Atlas/Game/icon512.png and b/Assets/Resources/RedHotRoastAssets/Atlas/Game/icon512.png differ diff --git a/Assets/Resources/RedHotRoastAssets/FGUI/tixian_fui.bytes b/Assets/Resources/RedHotRoastAssets/FGUI/tixian_fui.bytes index 5a80da84..e31704a0 100644 Binary files a/Assets/Resources/RedHotRoastAssets/FGUI/tixian_fui.bytes and b/Assets/Resources/RedHotRoastAssets/FGUI/tixian_fui.bytes differ diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/de.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/de.xml index 706bccfe..7f3009f5 100644 --- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/de.xml +++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/de.xml @@ -685,7 +685,7 @@ GUTSCHEIN Einlösen Code Konto eingeben - Bitte bestätige dein Konto für Arrow Game: Beat Tap, um die Zahlung zu senden. PayPal gewährleistet die Sicherheit deines Kontos. + Bitte bestätige dein Konto für Red-Hot Arrow, um die Zahlung zu senden. PayPal gewährleistet die Sicherheit deines Kontos. Hebe das gesamte Geld dank Level {0} ab Level 2 Informationen ({0}) @@ -773,7 +773,7 @@ verlierst du {num=0} Lose. Du erhältst die $200 innerhalb von 90 Tagen Gib dein PayPal-Konto ein Bitte hinterlasse deine E-Mail-Informationen und wir senden dir einen Einlösecode für Geschenkkarten - Bitte bestätige deine E-Mail für Arrow Game: Beat Tap, um die Zahlung zu senden. Wir senden den Einlösecode für Geschenkkarten an deine E-Mail + Bitte bestätige deine E-Mail für Red-Hot Arrow, um die Zahlung zu senden. Wir senden den Einlösecode für Geschenkkarten an deine E-Mail Informationen zum Einlösen von Geschenkkarten Geschenkkarte Konto diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/en.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/en.xml index f6ab861d..1d81468a 100644 --- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/en.xml +++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/en.xml @@ -686,7 +686,7 @@ COUPON Redeem Code Enter Account - Please confirm your account for Arrow Game: Beat Tap to send out payment.Paypal will ensure your account safety. + Please confirm your account for Red-Hot Arrow to send out payment.Paypal will ensure your account safety. Withdraw all cash through level {0} Level2 Information({0}) @@ -775,7 +775,7 @@ you will lose {num=0} tickets. You will get the $200 for 90 days Enter your PayPal Account Please leave your email information and we will issue a gift card redemption code - Please confirm your email to Arrow Game: Beat Tap to send out payment.We will send the gift card redemption code to your email + Please confirm your email to Red-Hot Arrow to send out payment.We will send the gift card redemption code to your email Redemption Gift Card information Gift Card Account diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/es.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/es.xml index 4c4df262..ee0a8dd2 100644 --- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/es.xml +++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/es.xml @@ -685,7 +685,7 @@ DESCUENTO Canjear Código Ingresar cuenta - Por favor confirma tu cuenta para Arrow Game: Beat Tap para enviar el pago. PayPal garantizará la seguridad de tu cuenta. + Por favor confirma tu cuenta para Red-Hot Arrow para enviar el pago. PayPal garantizará la seguridad de tu cuenta. Retira todo el dinero gracias al nivel {0} Nivel 2 Información ({0}) @@ -773,7 +773,7 @@ perderás {num=0} boletos. Recibirás los $200 durante 90 días Ingresa tu cuenta de PayPal Por favor deja tu información de correo electrónico y enviaremos un código de canje de tarjeta de regalo - Por favor confirma tu correo electrónico para Arrow Game: Beat Tap para enviar el pago. Enviaremos el código de canje de tarjeta de regalo a tu correo electrónico + Por favor confirma tu correo electrónico para Red-Hot Arrow para enviar el pago. Enviaremos el código de canje de tarjeta de regalo a tu correo electrónico Información de tarjeta de regalo de canje Tarjeta de regalo Cuenta diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/fr.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/fr.xml index 443ff0ef..9af0b259 100644 --- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/fr.xml +++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/fr.xml @@ -686,7 +686,7 @@ RÉDUCTION Échanger Code Saisir le compte - Veuillez confirmer votre compte pour Arrow Game: Beat Tap pour envoyer le paiement. PayPal assurera la sécurité de votre compte. + Veuillez confirmer votre compte pour Red-Hot Arrow pour envoyer le paiement. PayPal assurera la sécurité de votre compte. Retirez tout l'argent grâce au niveau {0} Niveau 2 Informations ({0}) @@ -774,7 +774,7 @@ vous perdrez {num=0} billets. Vous recevrez les 200 $ pendant 90 jours Saisissez votre compte PayPal Veuillez laisser vos informations d'e-mail et nous enverrons un code d'échange de carte-cadeau - Veuillez confirmer votre e-mail pour Arrow Game: Beat Tap pour envoyer le paiement. Nous enverrons le code d'échange de carte-cadeau à votre e-mail + Veuillez confirmer votre e-mail pour Red-Hot Arrow pour envoyer le paiement. Nous enverrons le code d'échange de carte-cadeau à votre e-mail Informations sur la carte-cadeau d'échange Carte-cadeau Compte diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/id.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/id.xml index fc95b496..e6f99b25 100644 --- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/id.xml +++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/id.xml @@ -665,7 +665,7 @@ http://creativecommons.org/licenses/by/3.0/ रिडीम कोड खाता दर्ज करें - कृपया एरो गेम: बीट टैप के लिए अपना खाता पुष्टि करें ताकि भुगतान भेजा जा सके।पेपल आपके खाते की सुरक्षा सुनिश्चित करेगा। + कृपया भुगतान भेजने के लिए Red-Hot Arrow के लिए अपना खाता पुष्टि करें। PayPal आपके खाते की सुरक्षा सुनिश्चित करेगा। लेवल {0} के माध्यम से सारा नकद निकालें लेवल2 जानकारी({0}) @@ -753,7 +753,7 @@ Under normal circumstances, the payment will be credited within one month, if it आपको 90 दिनों में $200 मिलेंगे अपना पेपाल खाता दर्ज करें कृपया अपनी ईमेल जानकारी छोड़ दें, हम एक गिफ्ट कार्ड रिडेम्पशन कोड जारी करेंगे - कृपया एरो गेम: बीट टैप के लिए अपना ईमेल पुष्टि करें ताकि भुगतान भेजा जा सके।हम गिफ्ट कार्ड रिडेम्पशन कोड को आपके ईमेल पर भेजेंगे + कृपया भुगतान भेजने के लिए Red-Hot Arrow को अपना ईमेल पुष्टि करें। हम आपके ईमेल पर गिफ्ट कार्ड रिडीम कोड भेजेंगे। रिडेम्पशन गिफ्ट कार्ड जानकारी गिफ्ट कार्ड खाता diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ja.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ja.xml index fef290ac..90a71626 100644 --- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ja.xml +++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ja.xml @@ -684,7 +684,7 @@ http://creativecommons.org/licenses/by/3.0/ 引き換え コード アカウント入力 - お支払い送信のためArrow Game: Beat Tapのアカウントを確認してください。PayPalが安全性を保証します。 + お支払い送信のためRed-Hot Arrowのアカウントを確認してください。PayPalが安全性を保証します。 レベル{0}で全額出金 レベル2 情報({0}) @@ -773,7 +773,7 @@ Under normal circumstances, the payment will be credited within one month, if it 90日間で$200を獲得できます PayPalアカウントを入力 メールアドレスをご登録いただくと、ギフトカード引換コードを発行いたします - お支払い送信のためArrow Game: Beat Tapのメールアドレスを確認してください。ギフトカード引換コードをメールでお送りします + お支払い送信のためRed-Hot Arrowのメールアドレスを確認してください。ギフトカード引換コードをメールでお送りします ギフトカード引換情報 ギフトカード アカウント diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ko.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ko.xml index 2f022103..888365a3 100644 --- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ko.xml +++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ko.xml @@ -684,7 +684,7 @@ http://creativecommons.org/licenses/by/3.0/ 교환 코드 계정 입력 - 결제 전송을 위해 Arrow Game: Beat Tap 계정을 확인해 주세요. PayPal이 계정 안전을 보장합니다 + 결제 전송을 위해 Red-Hot Arrow 계정을 확인해 주세요. PayPal이 계정 안전을 보장합니다 레벨 {0}에서 전액 출금 레벨2 정보({0}) @@ -773,7 +773,7 @@ Under normal circumstances, the payment will be credited within one month, if it 90일 동안 $200를 받으실 수 있습니다 PayPal 계정을 입력하세요 이메일 정보를 남겨주시면 기프트 카드 교환 코드를 발급해 드립니다 - 결제 전송을 위해 Arrow Game: Beat Tap 이메일을 확인해 주세요. 기프트 카드 교환 코드를 이메일로 보내드립니다 + 결제 전송을 위해 Red-Hot Arrow 이메일을 확인해 주세요. 기프트 카드 교환 코드를 이메일로 보내드립니다 기프트 카드 교환 정보 기프트 카드 계정 diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/pt.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/pt.xml index e17c551b..bdeb283e 100644 --- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/pt.xml +++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/pt.xml @@ -680,7 +680,7 @@ DESCONTO Resgatar Código Inserir Conta - Por favor, confirme sua conta do Arrow Game: Beat Tap para enviar o pagamento. O PayPal garantirá a segurança da sua conta. + Por favor, confirme sua conta do Red-Hot Arrow para enviar o pagamento. O PayPal garantirá a segurança da sua conta. Saque todo o dinheiro através do nível {0} Nível2 Informação({0}) @@ -768,7 +768,7 @@ Under normal circumstances, the payment will be credited within one month, if it Você receberá os $200 em 90 dias Insira sua conta PayPal Por favor, deixe suas informações de e-mail e enviaremos um código de resgate de cartão-presente - Por favor, confirme seu e-mail do Arrow Game: Beat Tap para enviar o pagamento. Enviaremos o código de resgate do cartão-presente para seu e-mail + Por favor, confirme seu e-mail do Red-Hot Arrow para enviar o pagamento. Enviaremos o código de resgate do cartão-presente para seu e-mail Informações de Cartão-Presente de Resgate Cartão-Presente Conta diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ru.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ru.xml index c7a7b28d..bbf20709 100644 --- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ru.xml +++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ru.xml @@ -685,7 +685,7 @@ http://creativecommons.org/licenses/by/3.0/ Обменять Код Ввести счёт - Пожалуйста, подтвердите ваш счёт для Arrow Game: Beat Tap, чтобы отправить оплату. PayPal гарантирует безопасность вашего счёта. + Пожалуйста, подтвердите ваш счёт для Red-Hot Arrow, чтобы отправить оплату. PayPal гарантирует безопасность вашего счёта. Выведите все деньги благодаря уровню {0} Уровень 2 Информация ({0}) @@ -773,7 +773,7 @@ http://creativecommons.org/licenses/by/3.0/ Вы получите $200 в течение 90 дней Введите ваш счёт PayPal Пожалуйста, оставьте данные вашей электронной почты, и мы отправим вам промокод на подарочные карты - Пожалуйста, подтвердите вашу электронную почту для Arrow Game: Beat Tap, чтобы отправить оплату. Мы отправим промокод на подарочные карты на вашу электронную почту + Пожалуйста, подтвердите вашу электронную почту для Red-Hot Arrow, чтобы отправить оплату. Мы отправим промокод на подарочные карты на вашу электронную почту Информация об обмене подарочных карт Подарочная карта Счёт diff --git a/Assets/Resources/SDKConfig.asset b/Assets/Resources/SDKConfig.asset index 66503ff3..61b67a61 100644 --- a/Assets/Resources/SDKConfig.asset +++ b/Assets/Resources/SDKConfig.asset @@ -17,11 +17,11 @@ MonoBehaviour: appKey: 9ED1D82AE75244D6A4F2E111D44C6AF2 appSecret: 3F4DF55A91334AE6A4E0099CC1ABDAE8 logReportUrl: npw.reddhotcompangost.com - maxAppKey: LHx_tPFslZpTTiIPABmS24T7Ev1QEVOUVOzirpkxLUuTwJTVZGCKAk9L3Tm3FwuM5LxHK3q1EIbAemJB5sNpX2 + maxAppKey: mmVXU9O_ESeur52h0VwzCGfbI4wB8LxeBfydReplRMm2JmN8eNMVgSuiKy2bmTJ00m4DHSKFxhaH1pnpEME5bB splashUnitId: bannerUnitId: - interUnitId: 8971dfc98065c2c0 - videoUnitId: 13c3601021e6a8b9 + interUnitId: f1fc6d212646e9c8 + videoUnitId: d53e49b93713819b kwaiAppId: 805891 kwaiVideoUnitId: [] kwaiInterUnitId: [] diff --git a/Assets/Scripts/FreeWebViewManager.cs b/Assets/Scripts/FreeWebViewManager.cs index b59f31f2..1f96942f 100644 --- a/Assets/Scripts/FreeWebViewManager.cs +++ b/Assets/Scripts/FreeWebViewManager.cs @@ -23,40 +23,6 @@ public class FreeWebViewManager : MonoBehaviour } public void initView() - { - if (_webObj != null) return; - - // 创建WebView对象 - _webObj = new GameObject("WebViewObject1"); - _webView = _webObj.AddComponent(); - - // 关键：开启WKWebView，规避苹果审核拒绝 - _webView.Init( - enableWKWebView: true, - cb: OnWebMessage // JS调用Unity回调 - ); - - float top_offset = 0;//fgui中的顶部信息的高度 - float buttom_offset = 155; - if (Screen.safeArea.y != 0) - {//刘海屏 - top_offset += Screen.safeArea.y; - } - - // 铺满屏幕，适配刘海安全区 - _webView.SetMargins(0, (int)top_offset, 0, (int)buttom_offset); - // 禁止下拉回弹（可选） - _webView.SetScrollBounceEnabled(false); - - _webView.LoadURL("about:blank"); - _webView.SetVisibility(false); - - } - - /// - /// 打开网页 - /// - public void OpenWeb(string url) { // if (_webObj != null) return; // @@ -82,6 +48,40 @@ public class FreeWebViewManager : MonoBehaviour // // 禁止下拉回弹（可选） // _webView.SetScrollBounceEnabled(false); // + // _webView.LoadURL("about:blank"); + // _webView.SetVisibility(false); + // + } + + /// + /// 打开网页 + /// + public void OpenWeb(string url) + { + if (_webObj != null) return; + + // 创建WebView对象 + _webObj = new GameObject("WebViewObject1"); + _webView = _webObj.AddComponent(); + + // 关键：开启WKWebView，规避苹果审核拒绝 + _webView.Init( + enableWKWebView: true, + cb: OnWebMessage // JS调用Unity回调 + ); + + float top_offset = 0;//fgui中的顶部信息的高度 + float buttom_offset = 155; + if (Screen.safeArea.y != 0) + {//刘海屏 + top_offset += Screen.safeArea.y; + } + + // 铺满屏幕，适配刘海安全区 + _webView.SetMargins(0, (int)top_offset, 0, (int)buttom_offset); + // 禁止下拉回弹（可选） + _webView.SetScrollBounceEnabled(false); + // 加载网页并显示 _webView.LoadURL(url); _webView.SetVisibility(true); @@ -107,7 +107,7 @@ public class FreeWebViewManager : MonoBehaviour { if (_webObj != null) { - _webView.SetVisibility(false); + OnDestroy(); } } diff --git a/Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs b/Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs index 60c57ca6..76c24fc1 100644 --- a/Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs +++ b/Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs @@ -408,7 +408,7 @@ namespace RedHotRoast { decimal coin = DataMgr.Ticket.Value; - coin *= (decimal)GameHelper.GetExchangeRateVo().Multi; + // coin *= (decimal)GameHelper.GetExchangeRateVo().Multi; if (ui.com_money is com_money comMoney) comMoney.text_gold.text = coin.ToString("0.00"); } diff --git a/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUI.cs b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUI.cs index bec1a468..c90b1eac 100644 --- a/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUI.cs +++ b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUI.cs @@ -235,7 +235,7 @@ namespace RedHotRoast } } ui.btn_gold.GetChild("text_gold").text = $"{DataMgr.Coin.Value:N0}"; - ui.top_money.GetChild("text_gold").text = GameHelper.Get102Str(DataMgr.Ticket.Value); + ui.top_money.GetChild("text_gold").text = $"{DataMgr.Ticket.Value:N}"; ui.btn_mult.SetClick(() => { // if (!GameHelper.GetCloseResult()) @@ -344,7 +344,7 @@ namespace RedHotRoast GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData); DOVirtual.DelayedCall(1, () => { - DOVirtual.Float(0, (float)DataMgr.Ticket.Value * GameHelper.GetExchangeRateVo().Multi, 1, + DOVirtual.Float(0, (float)DataMgr.Ticket.Value , 1, value => { ui.top_money.GetChild("text_gold").text = ((decimal)value).ToString("0.00"); }); }); } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ec42b529..cb7eb682 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: tronwingame - productName: Red-Hot Roast + productName: Red-Hot Arrow defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}