tron_wz/ArrowBeatTap-Gp
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：1、修复bug。2、添加跳转亚马逊。

Browse Source
This commit is contained in:
barry
2026-07-08 15:36:17 +08:00
parent 3fd1e034c9
commit 8277a8e614
61 changed files with 77331 additions and 39566 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/ChillConnect/FGUI/package/tixian/com_redeem_code.cs
+2
View File
@@ -10,6 +10,7 @@ namespace FGUI.tixian
public GTextField text_title;
public GButton btn_close1;
public GTextField lab_mn2;
public GTextField text_rate;
public GTextField lab_ticket;
public GTextField lab_code;
public btn_code btn_copy;
@@ -29,6 +30,7 @@ namespace FGUI.tixian
text_title = (GTextField)GetChildAt(1);
btn_close1 = (GButton)GetChildAt(2);
lab_mn2 = (GTextField)GetChildAt(6);
text_rate = (GTextField)GetChildAt(9);
lab_ticket = (GTextField)GetChildAt(14);
lab_code = (GTextField)GetChildAt(16);
btn_copy = (btn_code)GetChildAt(17);
Assets/ChillConnect/Helper/GameHelper.cs
+1 -1
View File
@@ -601,7 +601,7 @@ namespace ChillConnect
ch = (decimal)exchangeRateVo.Multi * ch;
if (GameHelper.isRDExchangeMode()&&GameHelper.IsGiftSwitch())
{
string str = "<img src='ui://o9974uc5qbo98'/>";
string str = "<img src='ui://o9974uc5qbo98' scale=0.75/>";
return str + $"{exchangeRateVo.Payicon}{ch:N}";
}
else
Assets/ChillConnect/Manager/HallManager.cs
+16 -22
View File
@@ -123,42 +123,36 @@ namespace ChillConnect
private void OpenWb(object obj) {
return;
if (obj is not SDKOpenConfig openConfig) return;
Debug.Log($"open wb normal==={openConfig.normal} url==={openConfig.url}");
SetCameraVisible(false);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open, openConfig);
GameDispatcher.Instance.Dispatch(GameMsg.hideBroadCast);
if (UIManager.Instance.IsExistUI(UIConst.GameLoginUI))
{
Debug.Log($"gamelogin ui is exist ");
}
}
public void SetCameraVisible(bool visible)
{
// // 只在首次调用时查找
// if (_gameCamera == null)
// {
// // 使用 FindWithTag 确保能找到非激活对象
//
// _gameCamera = GameObject.Find("GameCamera").GetComponent<Camera>();
//
// }
// if (_gameCamera != null)
// {
// _gameCamera.enabled = visible;
// }
// else
// {
// Debug.LogError("GameCamera reference not found!");
// }
if (_gameCamera == null)
{
// 使用 FindWithTag 确保能找到非激活对象
_gameCamera = GameObject.Find("GameCamera").GetComponent<Camera>();
}
if (_gameCamera != null)
{
_gameCamera.enabled = visible;
}
else
{
Debug.LogError("GameCamera reference not found!");
}
GameHelper.ShowSheepPlayUI(visible);
}
Assets/DFFFQTVUv39wKIBSDK/ThirdParty/WebView/WebViewObject1.cs
Vendored
+2161
View File
File diff suppressed because it is too large Load Diff
Assets/DFFFQTVUv39wKIBSDK/ThirdParty/WebView/WebViewObject1.cs.meta
Vendored
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 3ad08b3d428af764c8c4cc7a8b68944c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/OPS/Obfuscator/Log/Android.txt
+73042 -38453
View File
File diff suppressed because it is too large Load Diff
Assets/OPS/Obfuscator/Settings/Obfuscator_Settings.json
+2 -10
View File
@@ -175,7 +175,7 @@
{
"Type" : "Bool",
"Key" : "Obfuscate_Namespaces",
"Value" : "False",
"Value" : "True",
"Values" : null
},
{
@@ -189,15 +189,7 @@
"Key" : "Skip_Namespace_Array",
"Value" : null,
"Values" : [
"IgnoreOPS",
"DFFFQTVUv39wKIBSDK",
"BigoAds",
"KwaiAds",
"AD",
"AppsFlyerSDK",
"AppLovinMax",
"AnyThinkAds",
"AnyThink"
"IgnoreOPS"
]
}
]
Assets/Plugins/Android/FirebaseCrashlytics.androidlib/res/values/crashlytics_build_id.xml
+1 -1
View File
@@ -1 +1 @@
<?xml version="1.0" encoding="utf-8"?><resources><string name="com.crashlytics.android.build_id" translatable="false">602f3837-09d2-4b5d-9661-02f63bfad863</string></resources>
<?xml version="1.0" encoding="utf-8"?><resources><string name="com.crashlytics.android.build_id" translatable="false">d0e301db-272e-40c4-b5dc-39b57b534421</string></resources>
Assets/Plugins/Android/WebViewPlugin-development.aar.tmpl
BIN
View File
Binary file not shown.
Assets/Plugins/Android/WebViewPlugin-release.aar.tmpl
BIN
View File
Binary file not shown.
Assets/Plugins/Editor/UnityWebViewPostprocessBuild.cs
+32 -3
View File
@@ -8,6 +8,9 @@ using System.Text;
using System.Xml;
using System;
using UnityEditor.Android;
#if UNITY_2020_1_OR_NEWER
using UnityEditor.Build.Reporting;
#endif
#if UNITY_2018_1_OR_NEWER
using UnityEditor.Build;
#endif
@@ -15,7 +18,11 @@ using UnityEditor.Callbacks;
using UnityEditor;
using UnityEngine;
#if UNITY_2018_1_OR_NEWER
namespace Gree.UnityWebView
{
#if UNITY_2020_1_OR_NEWER
public class UnityWebViewPostprocessBuild : IPreprocessBuildWithReport, IPostGenerateGradleAndroidProject
#elif UNITY_2018_1_OR_NEWER
public class UnityWebViewPostprocessBuild : IPreprocessBuild, IPostGenerateGradleAndroidProject
#else
public class UnityWebViewPostprocessBuild
@@ -28,7 +35,12 @@ public class UnityWebViewPostprocessBuild
//// cf. https://github.com/Over17/UnityAndroidManifestCallback
#if UNITY_2018_1_OR_NEWER
#if UNITY_2020_1_OR_NEWER
public void OnPreprocessBuild(BuildReport buildReport) {
var buildTarget = buildReport.summary.platform;
#else
public void OnPreprocessBuild(BuildTarget buildTarget, string path) {
#endif
if (buildTarget == BuildTarget.Android) {
var dev = "Packages/net.gree.unity-webview/Assets/Plugins/Android/WebViewPlugin-development.aar.tmpl";
var rel = "Packages/net.gree.unity-webview/Assets/Plugins/Android/WebViewPlugin-release.aar.tmpl";
@@ -100,13 +112,15 @@ public class UnityWebViewPostprocessBuild
#if UNITYWEBVIEW_ANDROID_USES_CLEARTEXT_TRAFFIC
changed = (androidManifest.SetUsesCleartextTraffic(true) || changed);
#endif
if (!nofragment) {
changed = (androidManifest.AddGallery() || changed);
#if UNITYWEBVIEW_ANDROID_ENABLE_CAMERA
changed = (androidManifest.AddCamera() || changed);
changed = (androidManifest.AddGallery() || changed);
#endif
#if UNITYWEBVIEW_ANDROID_ENABLE_MICROPHONE
changed = (androidManifest.AddMicrophone() || changed);
#endif
}
if (changed) {
androidManifest.Save();
Debug.Log("unitywebview: adjusted AndroidManifest.xml.");
@@ -210,13 +224,15 @@ public class UnityWebViewPostprocessBuild
#if UNITYWEBVIEW_ANDROID_USES_CLEARTEXT_TRAFFIC
changed = (androidManifest.SetUsesCleartextTraffic(true) || changed);
#endif
if (!nofragment) {
changed = (androidManifest.AddGallery() || changed);
#if UNITYWEBVIEW_ANDROID_ENABLE_CAMERA
changed = (androidManifest.AddCamera() || changed);
changed = (androidManifest.AddGallery() || changed);
#endif
#if UNITYWEBVIEW_ANDROID_ENABLE_MICROPHONE
changed = (androidManifest.AddMicrophone() || changed);
#endif
}
#if UNITY_5_6_0 || UNITY_5_6_1
changed = (androidManifest.SetActivityName("net.gree.unitywebview.CUnityPlayerActivity") || changed);
#endif
@@ -350,6 +366,9 @@ internal class AndroidManifest : AndroidXmlDocument {
internal bool SetExported(bool enabled) {
bool changed = false;
var activity = GetActivityWithLaunchIntent() as XmlElement;
if (activity == null) {
return false;
}
if (activity.GetAttribute("exported", AndroidXmlNamespace) != ((enabled) ? "true" : "false")) {
activity.SetAttribute("exported", AndroidXmlNamespace, (enabled) ? "true" : "false");
changed = true;
@@ -360,6 +379,9 @@ internal class AndroidManifest : AndroidXmlDocument {
internal bool SetWindowSoftInputMode(string mode) {
bool changed = false;
var activity = GetActivityWithLaunchIntent() as XmlElement;
if (activity == null) {
return false;
}
if (activity.GetAttribute("windowSoftInputMode", AndroidXmlNamespace) != mode) {
activity.SetAttribute("windowSoftInputMode", AndroidXmlNamespace, mode);
changed = true;
@@ -370,6 +392,9 @@ internal class AndroidManifest : AndroidXmlDocument {
internal bool SetHardwareAccelerated(bool enabled) {
bool changed = false;
var activity = GetActivityWithLaunchIntent() as XmlElement;
if (activity == null) {
return false;
}
if (activity.GetAttribute("hardwareAccelerated", AndroidXmlNamespace) != ((enabled) ? "true" : "false")) {
activity.SetAttribute("hardwareAccelerated", AndroidXmlNamespace, (enabled) ? "true" : "false");
changed = true;
@@ -380,6 +405,9 @@ internal class AndroidManifest : AndroidXmlDocument {
internal bool SetActivityName(string name) {
bool changed = false;
var activity = GetActivityWithLaunchIntent() as XmlElement;
if (activity == null) {
return false;
}
if (activity.GetAttribute("name", AndroidXmlNamespace) != name) {
activity.SetAttribute("name", AndroidXmlNamespace, name);
changed = true;
@@ -536,4 +564,5 @@ internal class AndroidManifest : AndroidXmlDocument {
return changed;
}
}
}
#endif
Assets/Plugins/WebView.bundle.meta
+58
View File
@@ -0,0 +1,58 @@
fileFormatVersion: 2
guid: 60e7bf38137eb4950b2f02b7d57c1ad3
folderAsset: yes
PluginImporter:
serializedVersion: 1
iconMap: {}
executionOrder: {}
isPreloaded: 0
platformData:
Android:
enabled: 0
settings:
CPU: AnyCPU
Any:
enabled: 0
settings: {}
Editor:
enabled: 1
settings:
CPU: AnyCPU
DefaultValueInitialized: true
OS: OSX
Linux:
enabled: 0
settings:
CPU: x86
Linux64:
enabled: 0
settings:
CPU: x86_64
OSXIntel:
enabled: 1
settings:
CPU: AnyCPU
OSXIntel64:
enabled: 1
settings:
CPU: AnyCPU
OSXUniversal:
enabled: 1
settings:
CPU: AnyCPU
Win:
enabled: 0
settings:
CPU: AnyCPU
Win64:
enabled: 0
settings:
CPU: AnyCPU
iOS:
enabled: 0
settings:
CompileFlags:
FrameworkDependencies:
userData:
assetBundleName:
assetBundleVariant:
Assets/Plugins/WebView.bundle/Contents/Info.plist
+48
View File
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>25F80</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>WebView</string>
<key>CFBundleIdentifier</key>
<string>net.gree.unitywebview.WebView</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>WebView</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>25F70</string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>26.5</string>
<key>DTSDKBuild</key>
<string>25F70</string>
<key>DTSDKName</key>
<string>macosx26.5</string>
<key>DTXcode</key>
<string>2650</string>
<key>DTXcodeBuild</key>
<string>17F42</string>
<key>LSMinimumSystemVersion</key>
<string>10.13</string>
</dict>
</plist>
Assets/Plugins/WebView.bundle/Contents/MacOS/WebView
BIN
View File
Binary file not shown.
Assets/Plugins/WebView.bundle/Contents/Resources/InfoPlist.strings
BIN
View File
Binary file not shown.
Assets/Plugins/WebView.bundle/Contents/_CodeSignature/CodeResources
+128
View File
@@ -0,0 +1,128 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>files</key>
<dict>
<key>Resources/InfoPlist.strings</key>
<data>
MiLKDDnrUKr4EmuvhS5VQwxHGK8=
</data>
</dict>
<key>files2</key>
<dict>
<key>Resources/InfoPlist.strings</key>
<dict>
<key>hash2</key>
<data>
Oc8u4Ht7Mz58F50L9NeYpbcq9qTlhPUeZCcDu/pPyCg=
</data>
</dict>
</dict>
<key>rules</key>
<dict>
<key>^Resources/</key>
<true/>
<key>^Resources/.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^Resources/.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Resources/Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^version.plist$</key>
<true/>
</dict>
<key>rules2</key>
<dict>
<key>.*\.dSYM($|/)</key>
<dict>
<key>weight</key>
<real>11</real>
</dict>
<key>^(.*/)?\.DS_Store$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>2000</real>
</dict>
<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^.*</key>
<true/>
<key>^Info\.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^PkgInfo$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^Resources/</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^Resources/.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^Resources/.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Resources/Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^[^/]+$</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^embedded\.provisionprofile$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^version\.plist$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
</dict>
</dict>
</plist>
Assets/Resources/ChillConnectAssets/FGUI/Arrow_game_fui.bytes
BIN
View File
Binary file not shown.
Assets/Resources/ChillConnectAssets/FGUI/ZM_Petty_fui.bytes
BIN
View File
Binary file not shown.
Assets/Resources/ChillConnectAssets/FGUI/bkg_jilu_fui.bytes
BIN
View File
Binary file not shown.
Assets/Resources/ChillConnectAssets/FGUI/tixian_fui.bytes
BIN
View File
Binary file not shown.
Assets/Resources/ChillConnectAssets/TextAsset/I18N/de.xml
+1 -1
View File
@@ -355,7 +355,7 @@ Musik beworben auf https://www.chosic.com/free-music/all/</string>
<string name="e9w4rbkqkbzo4-n5_kbzo" mz="n5">Du kannst Geld auf folgendes PayPal-Konto umtauschen.</string>
<!-- ZM_Petty/com/com_detail.xml -->
<string name="e9w4rbkqkbzob-n3_kbzo" mz="n3">Zahlungsdetails</string>
<string name="e9w4rbkqkbzob-n4_kbzo" mz="text_amount">Zahlungsbetrag: {num=} USD</string>
<string name="e9w4rbkqkbzob-n4_kbzo" mz="text_amount">Zahlungsbetrag: {num=}</string>
<string name="e9w4rbkqkbzob-n5_kbzo" mz="text_data">Zahlungsdatum: {data=}</string>
<string name="e9w4rbkqkbzob-n6_kbzo" mz="text_order">Bestellnummer: {order=}</string>
<string name="e9w4rbkqkbzob-n7_kbzo" mz="text_email">PayPal: [color=#1777ff]{email=}[/color]</string>
Assets/Resources/ChillConnectAssets/TextAsset/I18N/en.xml
+1 -1
View File
@@ -363,7 +363,7 @@ NOW!</string>
following PayPal account.</string>
<!-- ZM_Petty/com/com_detail.xml -->
<string name="e9w4rbkqkbzob-n3_kbzo" mz="n3">Payment Details</string>
<string name="e9w4rbkqkbzob-n4_kbzo" mz="text_amount">Payment Amount: {num=} USD</string>
<string name="e9w4rbkqkbzob-n4_kbzo" mz="text_amount">Payment Amount: {num=}</string>
<string name="e9w4rbkqkbzob-n5_kbzo" mz="text_data">Payment Date: {data=}</string>
<string name="e9w4rbkqkbzob-n6_kbzo" mz="text_order">Order Number: {order=}</string>
<string name="e9w4rbkqkbzob-n7_kbzo" mz="text_email">PayPal: [color=#1777ff]{email=}[/color]</string>
Assets/Resources/ChillConnectAssets/TextAsset/I18N/es.xml
+1 -1
View File
@@ -361,7 +361,7 @@ AHORA!</string>
siguiente cuenta de PayPal.</string>
<!-- ZM_Petty/com/com_detail.xml -->
<string name="e9w4rbkqkbzob-n3_kbzo" mz="n3">Detalles del Pago</string>
<string name="e9w4rbkqkbzob-n4_kbzo" mz="text_amount">Monto del pago: {num=} USD</string>
<string name="e9w4rbkqkbzob-n4_kbzo" mz="text_amount">Monto del pago: {num=}</string>
<string name="e9w4rbkqkbzob-n5_kbzo" mz="text_data">Fecha de pago: {data=}</string>
<string name="e9w4rbkqkbzob-n6_kbzo" mz="text_order">Número de pedido: {order=}</string>
<string name="e9w4rbkqkbzob-n7_kbzo" mz="text_email">PayPal: [color=#1777ff]{email=}[/color]</string>
Assets/Resources/ChillConnectAssets/TextAsset/I18N/fr.xml
+1 -1
View File
@@ -357,7 +357,7 @@ Musique diffusée sur https://www.chosic.com/free-music/all/</string>
<string name="e9w4rbkqkbzo4-n5_kbzo" mz="n5">Vous pouvez échanger de l'argent vers le compte PayPal suivant.</string>
<!-- ZM_Petty/com/com_detail.xml -->
<string name="e9w4rbkqkbzob-n3_kbzo" mz="n3">Détails du paiement</string>
<string name="e9w4rbkqkbzob-n4_kbzo" mz="text_amount">Montant du paiement : {num=} USD</string>
<string name="e9w4rbkqkbzob-n4_kbzo" mz="text_amount">Montant du paiement : {num=}</string>
<string name="e9w4rbkqkbzob-n5_kbzo" mz="text_data">Date du paiement : {data=}</string>
<string name="e9w4rbkqkbzob-n6_kbzo" mz="text_order">Numéro de commande : {order=}</string>
<string name="e9w4rbkqkbzob-n7_kbzo" mz="text_email">PayPal : [color=#1777ff]{email=}[/color]</string>
Assets/Resources/ChillConnectAssets/TextAsset/I18N/id.xml
+421 -421
View File
File diff suppressed because it is too large Load Diff
Assets/Resources/ChillConnectAssets/TextAsset/I18N/ja.xml
+1 -1
View File
@@ -357,7 +357,7 @@ http://creativecommons.org/licenses/by/3.0/
<string name="e9w4rbkqkbzo4-n5_kbzo" mz="n5">以下のPayPalアカウントに現金を交換できます。</string>
<!-- ZM_Petty/com/com_detail.xml -->
<string name="e9w4rbkqkbzob-n3_kbzo" mz="n3">お支払詳細</string>
<string name="e9w4rbkqkbzob-n4_kbzo" mz="text_amount">お支払金額：{num=} USD</string>
<string name="e9w4rbkqkbzob-n4_kbzo" mz="text_amount">お支払金額：{num=}</string>
<string name="e9w4rbkqkbzob-n5_kbzo" mz="text_data">お支払日：{data=}</string>
<string name="e9w4rbkqkbzob-n6_kbzo" mz="text_order">注文番号：{order=}</string>
<string name="e9w4rbkqkbzob-n7_kbzo" mz="text_email">PayPal：[color=#1777ff]{email=}[/color]</string>
Assets/Resources/ChillConnectAssets/TextAsset/I18N/ko.xml
+1 -1
View File
@@ -361,7 +361,7 @@ Music promoted by https://www.chosic.com/free-music/all/</string>
<string name="e9w4rbkqkbzo4-n5_kbzo" mz="n5">아래 PayPal 계정으로 현금을 교환할 수 있습니다.</string>
<!-- ZM_Petty/com/com_detail.xml -->
<string name="e9w4rbkqkbzob-n3_kbzo" mz="n3">결제 상세 내역</string>
<string name="e9w4rbkqkbzob-n4_kbzo" mz="text_amount">결제 금액: {num=} 달러</string>
<string name="e9w4rbkqkbzob-n4_kbzo" mz="text_amount">결제 금액: {num=}</string>
<string name="e9w4rbkqkbzob-n5_kbzo" mz="text_data">결제 일자: {data=}</string>
<string name="e9w4rbkqkbzob-n6_kbzo" mz="text_order">주문 번호: {order=}</string>
<string name="e9w4rbkqkbzob-n7_kbzo" mz="text_email">PayPal: [color=#1777ff]{email=}[/color]</string>
Assets/Resources/ChillConnectAssets/TextAsset/I18N/pt.xml
+1 -1
View File
@@ -358,7 +358,7 @@ Música por https://www.chosic.com/free-music/all/</string>
<string name="e9w4rbkqkbzo4-n5_kbzo" mz="n5">Você pode trocar o valor pela conta PayPal abaixo.</string>
<!-- ZM_Petty/com/com_detail.xml -->
<string name="e9w4rbkqkbzob-n3_kbzo" mz="n3">Detalhes do Pagamento</string>
<string name="e9w4rbkqkbzob-n4_kbzo" mz="text_amount">Valor do Pagamento: {num=} USD</string>
<string name="e9w4rbkqkbzob-n4_kbzo" mz="text_amount">Valor do Pagamento: {num=}</string>
<string name="e9w4rbkqkbzob-n5_kbzo" mz="text_data">Data do Pagamento: {data=}</string>
<string name="e9w4rbkqkbzob-n6_kbzo" mz="text_order">Número do Pedido: {order=}</string>
<string name="e9w4rbkqkbzob-n7_kbzo" mz="text_email">PayPal: [color=#1777ff]{email=}[/color]</string>
Assets/Resources/ChillConnectAssets/TextAsset/I18N/ru.xml
+1 -1
View File
@@ -364,7 +364,7 @@
следующий аккаунт PayPal.</string>
<!-- ZM_Petty/com/com_detail.xml -->
<string name="e9w4rbkqkbzob-n3_kbzo" mz="n3">Детали платежа</string>
<string name="e9w4rbkqkbzob-n4_kbzo" mz="text_amount">Сумма платежа: {num=} USD</string>
<string name="e9w4rbkqkbzob-n4_kbzo" mz="text_amount">Сумма платежа: {num=}</string>
<string name="e9w4rbkqkbzob-n5_kbzo" mz="text_data">Дата платежа: {data=}</string>
<string name="e9w4rbkqkbzob-n6_kbzo" mz="text_order">Номер заказа: {order=}</string>
<string name="e9w4rbkqkbzob-n7_kbzo" mz="text_email">PayPal: [color=#1777ff]{email=}[/color]</string>
Assets/Resources/ChillConnectAssets/TextAsset/localization.json
+27 -9
View File
@@ -23,7 +23,9 @@
"get_card": "GET GIFT CARD",
"saveingpot_get": "You will get the {0} for 90 days",
"saveingpot_claimed": "{0} directly to your gift card",
"use_item": "Use Item"
"use_item": "Use Item",
"congratulations": "congratulations",
"exchange_success": " Successful exchange"
},
"ja": {
"copy_succeed": "コピー完了",
@@ -49,7 +51,9 @@
"get_card": "ギフトカードを取得",
"saveingpot_get": "{0}を90日間獲得できます",
"saveingpot_claimed": "{0}がギフトカードに直接届きます",
"use_item": "アイテムを使用する"
"use_item": "アイテムを使用する",
"congratulations": "おめでとうございます",
"exchange_success": "交換完了"
},
"ko": {
@@ -76,7 +80,9 @@
"get_card": "기프트 카드 받기",
"saveingpot_get": "{0}을 90일간 획득합니다",
"saveingpot_claimed": "{0}이 기프트 카드로 직접 지급됩니다",
"use_item": "아이템 사용하기"
"use_item": "아이템 사용하기",
"congratulations": "축하합니다",
"exchange_success": "교환 성공"
},
"ru": {
"copy_succeed": "Копирование выполнено",
@@ -102,7 +108,9 @@
"get_card": "Получить подарочную карту",
"saveingpot_get": "Вы получите {0} на 90 дней",
"saveingpot_claimed": "{0} сразу поступит на подарочную карту",
"use_item": "Использовать предмет"
"use_item": "Использовать предмет",
"congratulations": "Поздравляем",
"exchange_success": "Успешная обмен"
},
"id": {
"copy_succeed": "कॉपी सफल",
@@ -128,7 +136,9 @@
"get_card": "उपहार कार्ड प्राप्त करें",
"saveingpot_get": "आपको {0} 90 दिनों के लिए मिलेगा",
"saveingpot_claimed": "{0} सीधे आपके उपहार कार्ड पर मिल जाएगा",
"use_item": "वस्तु उपयोग करेंं"
"use_item": "वस्तु उपयोग करेंं",
"congratulations": "बधाई हो",
"exchange_success": "विनिमय सफल"
},
"pt": {
"copy_succeed": "Cópia realizada com sucesso",
@@ -154,7 +164,9 @@
"get_card": "OBTER CARTÃO DE PRESENTE",
"saveingpot_get": "Você receberá {0} por 90 dias",
"saveingpot_claimed": "{0} será enviado diretamente para seu cartão de presente",
"use_item": "Usar item"
"use_item": "Usar item",
"congratulations": "Parabéns",
"exchange_success": "Troca bem-sucedida"
},
"de": {
"copy_succeed": "Kopieren erfolgreich",
@@ -180,7 +192,9 @@
"get_card": "GESCHENKKARTE ERHALTEN",
"saveingpot_get": "Du erhältst {0} für 90 Tage",
"saveingpot_claimed": "{0} wird direkt auf deine Geschenkkarte gutgeschrieben",
"use_item": "Nutzung des Items"
"use_item": "Nutzung des Items",
"congratulations": "Glückwunsch",
"exchange_success": "Erfolgreiche Tausch"
},
"fr": {
"copy_succeed": "Copie réussie",
@@ -206,7 +220,9 @@
"get_card": "OBTENIR LA CARTE CADEAU",
"saveingpot_get": "Vous obtiendrez {0} pendant 90 jours",
"saveingpot_claimed": "{0} sera directement versé sur votre carte cadeau",
"use_item": "Utiliser l'objet"
"use_item": "Utiliser l'objet",
"congratulations": "Félicitations",
"exchange_success": "Échange réussie"
},
"es": {
"copy_succeed": "Copia realizada con éxito",
@@ -232,6 +248,8 @@
"get_card": "OBTENER TARJETA DE REGALO",
"saveingpot_get": "Recibirás {0} durante 90 días",
"saveingpot_claimed": "{0} se enviará directamente a tu tarjeta de regalo",
"use_item": "Usar objeto"
"use_item": "Usar objeto",
"congratulations": "Felicidades",
"exchange_success": "Intercambio exitoso"
}
}
Assets/Scenes/MainScene.unity
+45
View File
@@ -831,6 +831,50 @@ MonoScript:
m_ClassName: TimersEngine
m_Namespace: FairyGUI
m_AssemblyName:
--- !u!1 &1119590979
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1119590981}
- component: {fileID: 1119590980}
m_Layer: 0
m_Name: FreeWebViewManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1119590980
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1119590979}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7478ade71b9349e1a05265bf175b11c9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1119590981
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1119590979}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 10006.365, y: 9987.327, z: -0.016412746}
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!1 &1183762475
GameObject:
m_ObjectHideFlags: 1
@@ -1217,3 +1261,4 @@ SceneRoots:
- {fileID: 1183762477}
- {fileID: 1361344199}
- {fileID: 1356900051}
- {fileID: 1119590981}
Assets/Scripts/FreeWebViewManager.cs
+100 -100
View File
@@ -1,29 +1,63 @@
// using Gree.UnityWebView;
// using UnityEngine;
//
// public class FreeWebViewManager : MonoBehaviour
// {
// public static FreeWebViewManager Instance;
// private GameObject _webObj;
// private WebViewObject1 _webView;
//
// private void Awake()
// {
// if (Instance != null) Destroy(gameObject);
// else
// {
// Instance = this;
// DontDestroyOnLoad(gameObject);
// }
// }
//
// private void Start()
// {
// initView();
// }
//
// public void initView()
// {
using Gree.UnityWebView;
using UnityEngine;
public class FreeWebViewManager : MonoBehaviour
{
public static FreeWebViewManager Instance;
private GameObject _webObj;
private WebViewObject1 _webView;
private void Awake()
{
if (Instance != null) Destroy(gameObject);
else
{
Instance = this;
DontDestroyOnLoad(gameObject);
}
}
private void Start()
{
initView();
}
public void initView()
{
if (_webObj != null) return;
// 创建WebView对象
_webObj = new GameObject("WebViewObject1");
_webView = _webObj.AddComponent<WebViewObject1>();
// 关键：开启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);
}
/// <summary>
/// 打开网页
/// </summary>
public void OpenWeb(string url)
{
// if (_webObj != null) return;
//
// // 创建WebView对象
@@ -48,77 +82,43 @@
// // 禁止下拉回弹（可选）
// _webView.SetScrollBounceEnabled(false);
//
// _webView.LoadURL("about:blank");
// _webView.SetVisibility(false);
//
// }
//
// /// <summary>
// /// 打开网页
// /// </summary>
// public void OpenWeb(string url)
// {
// // if (_webObj != null) return;
// //
// // // 创建WebView对象
// // _webObj = new GameObject("WebViewObject1");
// // _webView = _webObj.AddComponent<WebViewObject1>();
// //
// // // 关键：开启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);
// }
//
// // JS向Unity发消息：window.unity.call("func","参数")
// void OnWebMessage(string msg)
// {
// Debug.Log("收到网页消息：" + msg);
// }
//
// // C#调用网页JS
// public void CallJs(string jsCode)
// {
// if (_webView != null)
// _webView.EvaluateJS(jsCode);
// }
//
// /// <summary>
// /// 关闭网页（必调用，释放原生资源）
// /// </summary>
// public void CloseWeb()
// {
// if (_webObj != null)
// {
// _webView.SetVisibility(false);
// }
// }
//
// private void OnDestroy()
// {
// if (_webObj != null)
// {
// _webView.SetVisibility(false);
// Destroy(_webObj);
// _webObj = null;
// _webView = null;
// }
// }
// }
// 加载网页并显示
_webView.LoadURL(url);
_webView.SetVisibility(true);
}
// JS向Unity发消息：window.unity.call("func","参数")
void OnWebMessage(string msg)
{
Debug.Log("收到网页消息：" + msg);
}
// C#调用网页JS
public void CallJs(string jsCode)
{
if (_webView != null)
_webView.EvaluateJS(jsCode);
}
/// <summary>
/// 关闭网页（必调用，释放原生资源）
/// </summary>
public void CloseWeb()
{
if (_webObj != null)
{
_webView.SetVisibility(false);
}
}
private void OnDestroy()
{
if (_webObj != null)
{
_webView.SetVisibility(false);
Destroy(_webObj);
_webObj = null;
_webView = null;
}
}
}
Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs
+3 -1
View File
@@ -410,6 +410,7 @@ namespace ChillConnect
{
decimal coin = DataMgr.Ticket.Value;
coin *= (decimal)GameHelper.GetExchangeRateVo().Multi;
if (ui.com_money is com_money comMoney) comMoney.text_gold.text = coin.ToString("0.00");
}
@@ -600,7 +601,8 @@ namespace ChillConnect
{
if (ui.com_money is com_money btnMoney)
{
btnMoney.text_gold.text = DataMgr.Ticket.Value.ToString("0.00");
// btnMoney.text_gold.text = DataMgr.Ticket.Value.ToString("0.00");
Set102();
btnMoney.SetClick(PopMakeup);
}
}
Assets/Scripts/ModuleUI/GameResult/GameResultUI.cs
+2 -2
View File
@@ -233,7 +233,7 @@ namespace ChillConnect
}
}
ui.btn_gold.GetChild("text_gold").text = $"{DataMgr.Coin.Value:N0}";
ui.top_money.GetChild("text_gold").text = DataMgr.Ticket.Value.ToString();
ui.top_money.GetChild("text_gold").text = GameHelper.Get102Str(DataMgr.Ticket.Value);
ui.btn_mult.SetClick(() =>
{
if (!GameHelper.GetCloseResult())
@@ -309,7 +309,7 @@ namespace ChillConnect
{
curr_type = 102;
end_ = GameHelper.GetUICenterPosition(ui.top_money, true);
awardNum *= GameHelper.GetExchangeRateVo().Multi;
}
var rewardSingleData = new RewardSingleData(curr_type, (decimal)awardNum, RewardOrigin.Play)
{
Assets/Scripts/ModuleUI/H5/H5UI.cs
+10
View File
@@ -39,6 +39,8 @@ namespace ChillConnect
protected override void OnClose()
{
FreeWebViewManager.Instance.CloseWeb();
GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, true);
GameDispatcher.Instance.Dispatch(GameMsg.showBroadCast);
@@ -55,9 +57,17 @@ namespace ChillConnect
private SDKOpenConfig _config;
protected override void OnOpenBefore(object args)
{
if (args is not SDKOpenConfig openConfig) return;
_config = openConfig;
GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, false);
// Debug.Log($"H5UI OpenBefore url: {_config.url} normal: {_config.normal}");
DOVirtual.DelayedCall(0.1f, () =>
{
FreeWebViewManager.Instance.OpenWeb(_config.url);
});
GameDispatcher.Instance.Dispatch(GameMsg.hideBroadCast);
Assets/Scripts/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs
+7 -7
View File
@@ -1061,13 +1061,13 @@ namespace ChillConnect
ui.btn_contact_us.SetClick(() =>
{
// GameHelper.OpenEmail();
// SDKOpenConfig openConfig = new SDKOpenConfig
// {
// normal = false,
// url = vo.T_ShopURL
// };
//
// CtrlDispatcher.Instance.Dispatch(CtrlMsg.open_wb,openConfig);
SDKOpenConfig openConfig = new SDKOpenConfig
{
normal = false,
url = vo.T_ShopURL
};
CtrlDispatcher.Instance.Dispatch(CtrlMsg.open_wb,openConfig);
CtrlCloseUI();
});
Assets/Scripts/ModuleUI/PettyAward/PettyAwardUI.cs
+2 -2
View File
@@ -256,12 +256,12 @@ namespace ChillConnect
var pettyAmount = SaveData.GetSaveObject().PettyAmount;
if (pettyAmount != 0)
{
ui.com_detail.text_amount.SetVar("num", GameHelper.Get102Str(pettyAmount)).FlushVars();
ui.com_detail.text_amount.SetVar("num", $" {GameHelper.GetExchangeRateVo().Payicon}{GameHelper.Get102Str(pettyAmount)}").FlushVars();
}
else
{
var num = GameHelper.GetCommonModel().SmallReward;
ui.com_detail.text_amount.SetVar("num", GameHelper.Get102Str(num)).FlushVars();
ui.com_detail.text_amount.SetVar("num", $" {GameHelper.GetExchangeRateVo().Payicon}{GameHelper.Get102Str(num)}").FlushVars();
SaveData.GetSaveObject().PettyAmount = num;
}
Assets/Scripts/ModuleUI/RedeemCode/RedeemCodeUI.cs
+8 -8
View File
@@ -64,7 +64,7 @@ namespace ChillConnect
var strings = ConfigSystem.GetConfig<CommonModel>().X_Redeemcode;
ui.lab_code.text = strings;
ui.text_rate.text = GameHelper.GetExchangeRateVo().Payicon + " 1";
ui.btn_copy.SetClick(() =>
{
GameHelper.CopyText(ui.lab_code.text);
@@ -72,13 +72,13 @@ namespace ChillConnect
ui.btn_contact_us.SetClick(() =>
{
// SDKOpenConfig openConfig = new SDKOpenConfig
// {
// normal = false,
// url = ConfigSystem.GetConfig<CommonModel>().X_ShopURL
// };
//
// CtrlDispatcher.Instance.Dispatch(CtrlMsg.open_wb, openConfig);
SDKOpenConfig openConfig = new SDKOpenConfig
{
normal = false,
url = ConfigSystem.GetConfig<CommonModel>().X_ShopURL
};
CtrlDispatcher.Instance.Dispatch(CtrlMsg.open_wb, openConfig);
CtrlCloseUI();
});
Assets/Scripts/ModuleUI/SaveingPot/SaveingPotUI.cs
+30 -22
View File
@@ -158,13 +158,14 @@ namespace ChillConnect
private void InitView()
{
Makeup_2 makeupVo = ConfigSystem.GetConfig<MakeupModel_2>().GetData(makeupTaskData.tableId);
ui.text_ad.text = string.Format(GameHelper.getDesByKey("saving_pot_5"), makeupVo.ADIncrease * GameHelper.GetExchangeRateVo().Multi);
ui.text_ad.text = string.Format(GameHelper.getDesByKey("saving_pot_5"),
SaveingPotHelper.getChNumber(makeupVo.ADIncrease * GameHelper.GetExchangeRateVo().Multi));
string str = string.Format(GameHelper.getDesByKey("saving_pot_2"), makeupVo.PayIncrease);
ui.text_pay.text = str;
initTop();
ske_pot.SetActive(false);
string val = $"{SaveData.GetSaveObject().saveingpot_ch:N}";
string val = $"{SaveingPotHelper.getChNumber(SaveData.GetSaveObject().saveingpot_ch):N}";
ui.text_lose.SetVar("num", val).FlushVars();
// ui.text_lose.text = string.Format(ui.text_lose.text, SaveingPotHelper.getChString(SaveData.GetSaveObject().saveingpot_ch));
if (makeupTaskData.needShowAni)
@@ -194,6 +195,7 @@ namespace ChillConnect
btnWatchad.can_buy.selectedIndex = 1;
btnWatchad.btn_text.text = CommonHelper.TimeFormat(SaveData.GetSaveObject()._watch_ad_cd - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour);
InitView();
HallManager.Instance.UpdateSecondEvent += upLvWatchAdsBtn;
}
});
});
@@ -203,6 +205,7 @@ namespace ChillConnect
btn_watchAd btnWatchad = ui.btn_ch as btn_watchAd;
btnWatchad.enabled = true;
btnWatchad.buy_state.selectedIndex = 1;
btnWatchad.can_buy.selectedIndex = 0;
btnWatchad.title = Language.GetContentParams("get_card");
btnWatchad.SetClick(() => { });
btnWatchad.SetClick(() =>
@@ -211,6 +214,9 @@ namespace ChillConnect
SaveData.saveDataFunc();
InitView();
});
HallManager.Instance.UpdateSecondEvent -= upLvWatchAdsBtn;
DOVirtual.DelayedCall(0.1f, InitView);
}
if (SaveData.GetSaveObject().saveingpot_ch > SaveData.GetSaveObject().last_saveingpot_ch)
{
@@ -323,11 +329,11 @@ namespace ChillConnect
btn_watchAd btn_watchad = ui.btn_ch as btn_watchAd;
btn_watchad.img_saveingpot.visible = false;
if (SaveData.GetSaveObject().saveingpot_ch >= makeupTaskData.amount)
{
InitView();
return;
}
// if (SaveData.GetSaveObject().saveingpot_ch >= makeupTaskData.amount)
// {
// InitView();
// return;
// }
if (GameHelper.GetNowTime() < lastAdTimes)
{
@@ -337,9 +343,11 @@ namespace ChillConnect
}
else
{
HallManager.Instance.UpdateSecondEvent -= upLvWatchAdsBtn;
btn_watchad.enabled = true;
btn_watchad.can_buy.selectedIndex = 0;
if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1) btn_watchad.img_saveingpot.visible = true;
InitView();
}
}
@@ -615,14 +623,14 @@ namespace ChillConnect
{
// GameHelper.OpenEmail();
// SDKOpenConfig openConfig = new SDKOpenConfig
// {
// normal = false,
// url = vo.C_ShopURL
// };
//
//
// CtrlDispatcher.Instance.Dispatch(CtrlMsg.open_wb,openConfig);
SDKOpenConfig openConfig = new SDKOpenConfig
{
normal = false,
url = vo.C_ShopURL
};
CtrlDispatcher.Instance.Dispatch(CtrlMsg.open_wb,openConfig);
CtrlCloseUI();
});
@@ -735,11 +743,11 @@ namespace ChillConnect
}
ui.type.selectedIndex = 4;
ui.com_task.text_task.text = Language.GetContentParams("get_card");
ui.com_task.text_payer.text = Language.GetContentParams("saveingpot_claimed","amt=$0.5");
ui.com_task.text_payer.text = Language.GetContentParams("saveingpot_claimed",makeupTaskData.GetAmountStr());
ui.com_task.text_orderid.text = makeupTaskData.orderID;
ui.com_task.text_task_title.SetVar("ad", vo.ad_need.ToString()).FlushVars();
ui.com_task.text_ads.text = $"{makeupTaskData.videoCount}/{vo.ad_need}";
ui.com_task.text_payer.SetVar("amt", makeupTaskData.GetAmountStr()).FlushVars();
// ui.com_task.text_payer.text = makeupTaskData.GetAmountStr();
if (makeupTaskData.videoCount >= vo.ad_need)
{
@@ -924,7 +932,7 @@ namespace ChillConnect
for (int i = 0; i < btn_list.Count; i++)
{
btn_list[i].text_ch.text = makeup_list[i].item_need + "";
btn_list[i].text_ch.text = makeup_list[i].item_need * GameHelper.GetExchangeRateVo().Multi + "";
btn_list[i].index.selectedIndex = i;
if (i >= saveingpot_history.Count)
{
@@ -998,11 +1006,11 @@ namespace ChillConnect
{
if (GameHelper.isRDExchangeMode())
{
text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]<img src='ui://o9974uc5t9w7c3'/>" + broad_list[i][1] + "[/color]";
text_list[i].text = $"{Language.GetContent("congratulations")},[color=#ad4800][size=36] " + broad_list[i][0] + $" [/size][/color]{Language.GetContent("exchange_success")}[color=#ad4800]<img src='ui://o9974uc5t9w7c3'/>" + broad_list[i][1] + "[/color]";
}
else
{
text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]$" + broad_list[i][1] + "[/color]";
text_list[i].text = $"{Language.GetContent("congratulations")},[color=#ad4800][size=36] " + broad_list[i][0] + $" [/size][/color]{Language.GetContent("exchange_success")}[color=#ad4800]$" + broad_list[i][1] + "[/color]";
}
}
});
@@ -1026,11 +1034,11 @@ namespace ChillConnect
broad_list.Add(new string[2] { config_name_list[name_index], config_money_list[money_index] });
if (GameHelper.isRDExchangeMode())
{
text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]<img src='ui://o9974uc5t9w7c3'/>" + broad_list[i][1] + "[/color]";
text_list[i].text = $"{Language.GetContent("congratulations")},[color=#ad4800][size=36] " + broad_list[i][0] + $" [/size][/color]{Language.GetContent("exchange_success")} [color=#ad4800]<img src='ui://o9974uc5t9w7c3'/>" + broad_list[i][1] + "[/color]";
}
else
{
text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]$" + broad_list[i][1] + "[/color]";
text_list[i].text = $"{Language.GetContent("congratulations")},[color=#ad4800][size=36] " + broad_list[i][0] + $" [/size][/color]{Language.GetContent("exchange_success")}[color=#ad4800]$" + broad_list[i][1] + "[/color]";
}
}
}
Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs
+1
View File
@@ -219,6 +219,7 @@ namespace ChillConnect
{
points = ui.point1;
typeId = vo.item1[i];
rewardNum *= (decimal)GameHelper.GetExchangeRateVo().Multi;
}
else
{
Assets/Scripts/SaveingPotClass.cs
+3 -1
View File
@@ -63,7 +63,9 @@ public class SaveingPotClass
// }
// else
// {
return $"{amount:N}";
var exchangeRateVo = GameHelper.GetExchangeRateVo();
var cash = exchangeRateVo.Multi * amount;
return $"{cash:N}";
//}
}
Assets/Scripts/ToolKit/SDK/MaxADKit.cs
+1 -1
View File
@@ -134,7 +134,7 @@ namespace ChillConnect
{
onVideoAdCompleted = onCompleted;
_placement = placement;
#if UNITY_EDITOR || GAME_RELEASE1
#if UNITY_EDITOR
onVideoAdCompleted?.Invoke(true);
#else
TrackKit.SendEvent(Property.adEvent,Property.watch_ad_people);
Assets/WebGLTemplates.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 396d2c966866e4a8ca47369a69d03109
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/WebGLTemplates/unity-webview-2020.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d9e103622e8c14154a1cd918fb92795e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/WebGLTemplates/unity-webview-2020/index.html
+108
View File
@@ -0,0 +1,108 @@
<!DOCTYPE html>
<html lang="en-us">
<head>
<meta charset="utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Unity WebGL Player | {{{ PRODUCT_NAME }}}</title>
<link rel="shortcut icon" href="TemplateData/favicon.ico">
<link rel="stylesheet" href="TemplateData/style.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
<script src="unity-webview.js"></script>
</head>
<body>
<div id="unity-container" class="unity-desktop">
<canvas id="unity-canvas"></canvas>
<div id="unity-loading-bar">
<div id="unity-logo"></div>
<div id="unity-progress-bar-empty">
<div id="unity-progress-bar-full"></div>
</div>
</div>
<div id="unity-footer">
<div id="unity-webgl-logo"></div>
<div id="unity-fullscreen-button"></div>
<div id="unity-build-title">{{{ PRODUCT_NAME }}}</div>
</div>
</div>
<script>
var buildUrl = "Build";
var loaderUrl = buildUrl + "/{{{ LOADER_FILENAME }}}";
var config = {
dataUrl: buildUrl + "/{{{ DATA_FILENAME }}}",
frameworkUrl: buildUrl + "/{{{ FRAMEWORK_FILENAME }}}",
codeUrl: buildUrl + "/{{{ CODE_FILENAME }}}",
#if MEMORY_FILENAME
memoryUrl: buildUrl + "/{{{ MEMORY_FILENAME }}}",
#endif
#if SYMBOLS_FILENAME
symbolsUrl: buildUrl + "/{{{ SYMBOLS_FILENAME }}}",
#endif
streamingAssetsUrl: "StreamingAssets",
companyName: "{{{ COMPANY_NAME }}}",
productName: "{{{ PRODUCT_NAME }}}",
productVersion: "{{{ PRODUCT_VERSION }}}",
};
var container = document.querySelector("#unity-container");
var canvas = document.querySelector("#unity-canvas");
var loadingBar = document.querySelector("#unity-loading-bar");
var progressBarFull = document.querySelector("#unity-progress-bar-full");
var fullscreenButton = document.querySelector("#unity-fullscreen-button");
var width0 = "{{{ WIDTH }}}px";
var height0 = "{{{ HEIGHT }}}px";
if (/iPhone|iPad|iPod|Android/i.test(navigator.userAgent)) {
container.className = "unity-mobile";
config.devicePixelRatio = 1;
} else {
canvas.style.width = "{{{ WIDTH }}}px";
canvas.style.height = "{{{ HEIGHT }}}px";
}
#if BACKGROUND_FILENAME
canvas.style.background = "url('" + buildUrl + "/{{{ BACKGROUND_FILENAME.replace(/'/g, '%27') }}}') center / cover";
#endif
loadingBar.style.display = "block";
document.addEventListener(
'fullscreenchange',
function() {
var p = document.getElementById('unity-container');
var c = document.getElementById('unity-canvas');
if (document.fullscreenElement) {
width0 = c.style.width;
height0 = c.style.height;
setTimeout(
function() {
c.style.width = getComputedStyle(p).width;
c.style.height = getComputedStyle(p).height;
},
250);
} else {
c.style.width = width0;
c.style.height = height0;
}
});
var script = document.createElement("script");
script.src = loaderUrl;
script.onload = () => {
createUnityInstance(canvas, config, (progress) => {
progressBarFull.style.width = 100 * progress + "%";
}).then((unityInstance) => {
window.unityInstance = unityInstance;
loadingBar.style.display = "none";
fullscreenButton.onclick = () => {
var p = document.getElementById('unity-container');
var c = document.getElementById('unity-canvas');
c.requestFullscreen = () => {
p.requestFullscreen();
};
unityInstance.SetFullscreen(1);
};
}).catch((message) => {
alert(message);
});
};
document.body.appendChild(script);
</script>
</body>
</html>
Assets/WebGLTemplates/unity-webview-2020/index.html.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7be04fa587d934a5c958c8fc02a10c40
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/WebGLTemplates/unity-webview-2020/unity-webview.js
+103
View File
@@ -0,0 +1,103 @@
var unityWebView =
{
loaded: [],
init : function (name) {
$containers = $('.webviewContainer');
if ($containers.length === 0) {
$('<div style="position: absolute; left: 0px; width: 100%; height: 100%; top: 0px; pointer-events: none;"><div class="webviewContainer" style="overflow: hidden; position: relative; width: 100%; height: 100%; z-index: 1;"></div></div>')
.appendTo($('#unity-container'));
}
var $last = $('.webviewContainer:last');
var clonedTop = parseInt($last.css('top')) - 100;
var $clone = $last.clone().insertAfter($last).css('top', clonedTop + '%');
var $iframe =
$('<iframe style="position:relative; width:100%; height100%; border-style:none; display:none; pointer-events:auto;"></iframe>')
.attr('id', 'webview_' + name)
.appendTo($last)
.on('load', function () {
$(this).attr('loaded', 'true');
var contents = $(this).contents();
var w = $(this)[0].contentWindow;
contents.find('a').click(function (e) {
var href = $.trim($(this).attr('href'));
if (href.substr(0, 6) === 'unity:') {
unityInstance.SendMessage(name, "CallFromJS", href.substring(6, href.length));
e.preventDefault();
}
});
contents.find('form').submit(function () {
$this = $(this);
var action = $.trim($this.attr('action'));
if (action.substr(0, 6) === 'unity:') {
var message = action.substring(6, action.length);
if ($this.attr('method').toLowerCase() == 'get') {
message += '?' + $this.serialize();
}
unityInstance.SendMessage(name, "CallFromJS", message);
return false;
}
return true;
});
unityInstance.SendMessage(name, "CallOnLoaded", location.href);
});
},
sendMessage: function (name, message) {
unityInstance.SendMessage(name, "CallFromJS", message);
},
setMargins: function (name, left, top, right, bottom) {
var container = $('#unity-container');
var r = (container.hasClass('unity-desktop')) ? window.devicePixelRatio : 1;
var w0 = container.width() * r;
var h0 = container.height() * r;
var canvas = $('#unity-canvas');
var w1 = canvas.attr('width');
var h1 = canvas.attr('height');
var lp = left / w0 * 100;
var tp = top / h0 * 100;
var wp = (w1 - left - right) / w0 * 100;
var hp = (h1 - top - bottom) / h0 * 100;
this.iframe(name)
.css('left', lp + '%')
.css('top', tp + '%')
.css('width', wp + '%')
.css('height', hp + '%');
},
setVisibility: function (name, visible) {
if (visible)
this.iframe(name).show();
else
this.iframe(name).hide();
},
loadURL: function(name, url) {
this.iframe(name).attr('loaded', 'false')[0].contentWindow.location.replace(url);
},
evaluateJS: function (name, js) {
$iframe = this.iframe(name);
if ($iframe.attr('loaded') === 'true') {
$iframe[0].contentWindow.eval(js);
} else {
$iframe.on('load', function(){
$(this)[0].contentWindow.eval(js);
});
}
},
destroy: function (name) {
this.iframe(name).parent().parent().remove();
},
iframe: function (name) {
return $('#webview_' + name);
},
};
Assets/WebGLTemplates/unity-webview-2020/unity-webview.js.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5b98600d622f440fab913c56685e11bf
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/WebGLTemplates/unity-webview.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 74f24ca1a6cc14b5c8da7e2a8e5de817
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/WebGLTemplates/unity-webview/index.html
+32
View File
@@ -0,0 +1,32 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Unity Web Player</title>
<link rel="shortcut icon" href="TemplateData/favicon.ico">
<link rel="stylesheet" href="TemplateData/style.css">
<script src="TemplateData/UnityProgress.js"></script>
<script src="Build/UnityLoader.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
<script>
var unityInstance = UnityLoader.instantiate("gameContainer", "%UNITY_WEBGL_BUILD_URL%", {onProgress: UnityProgress});
</script>
</head>
<body>
<div class="content">
<div class="webgl-content" id="unityPlayer">
<div id="gameContainer" style="width: 960px; height: 600px"></div>
<div class="footer">
<div class="webgl-logo"></div>
<div class="fullscreen" onclick="document.getElementById('gameContainer').requestFullscreen()"></div>
<div class="title">Title</div>
</div>
</div>
</div>
<!-- unity_webview -->
<script type="text/javascript" src="unity-webview.js"></script>
</body>
</html>
Assets/WebGLTemplates/unity-webview/index.html.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: cd45543727a7e47d88051ca9ab86a6f5
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/WebGLTemplates/unity-webview/unity-webview.js
+100
View File
@@ -0,0 +1,100 @@
var unityWebView =
{
loaded: [],
init : function (name) {
$containers = $('.webviewContainer');
if ($containers.length === 0) {
$('<div style="position: absolute; left: 0px; width: 100%; height: 100%; top: 0px; pointer-events: none;"><div class="webviewContainer" style="overflow: hidden; position: relative; width: 100%; height: 100%; z-index: 1;"></div></div>')
.appendTo($('#gameContainer'));
}
var $last = $('.webviewContainer:last');
var clonedTop = parseInt($last.css('top')) - 100;
var $clone = $last.clone().insertAfter($last).css('top', clonedTop + '%');
var $iframe =
$('<iframe style="position:relative; width:100%; height100%; border-style:none; display:none; pointer-events:auto;"></iframe>')
.attr('id', 'webview_' + name)
.appendTo($last)
.on('load', function () {
$(this).attr('loaded', 'true');
var contents = $(this).contents();
var w = $(this)[0].contentWindow;
contents.find('a').click(function (e) {
var href = $.trim($(this).attr('href'));
if (href.substr(0, 6) === 'unity:') {
unityInstance.SendMessage(name, "CallFromJS", href.substring(6, href.length));
e.preventDefault();
}
});
contents.find('form').submit(function () {
$this = $(this);
var action = $.trim($this.attr('action'));
if (action.substr(0, 6) === 'unity:') {
var message = action.substring(6, action.length);
if ($this.attr('method').toLowerCase() == 'get') {
message += '?' + $this.serialize();
}
unityInstance.SendMessage(name, "CallFromJS", message);
return false;
}
return true;
});
unityInstance.SendMessage(name, "CallOnLoaded", location.href);
});
},
sendMessage: function (name, message) {
unityInstance.SendMessage(name, "CallFromJS", message);
},
setMargins: function (name, left, top, right, bottom) {
var container = $('#gameContainer');
var r = window.devicePixelRatio;
var w0 = container.width() * r;
var h0 = container.height() * r;
var lp = left / w0 * 100;
var tp = top / h0 * 100;
var wp = (w0 - left - right) / w0 * 100;
var hp = (h0 - top - bottom) / h0 * 100;
this.iframe(name)
.css('left', lp + '%')
.css('top', tp + '%')
.css('width', wp + '%')
.css('height', hp + '%');
},
setVisibility: function (name, visible) {
if (visible)
this.iframe(name).show();
else
this.iframe(name).hide();
},
loadURL: function(name, url) {
this.iframe(name).attr('loaded', 'false')[0].contentWindow.location.replace(url);
},
evaluateJS: function (name, js) {
$iframe = this.iframe(name);
if ($iframe.attr('loaded') === 'true') {
$iframe[0].contentWindow.eval(js);
} else {
$iframe.on('load', function(){
$(this)[0].contentWindow.eval(js);
});
}
},
destroy: function (name) {
this.iframe(name).parent().parent().remove();
},
iframe: function (name) {
return $('#webview_' + name);
},
};
Assets/WebGLTemplates/unity-webview/unity-webview.js.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8de1ecd3ea5954800b53548d8c2e2d70
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/WebPlayerTemplates.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1ec4661d3c10c4d0e8b5e54ce1e46aa5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/WebPlayerTemplates/unity-webview.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e76c9a30b7f6447eca50079ce4d595ed
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/WebPlayerTemplates/unity-webview/index.html
+136
View File
@@ -0,0 +1,136 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Unity Web Player | %UNITY_WEB_NAME%</title>
%UNITY_UNITYOBJECT_DEPENDENCIES%
<script type="text/javascript">
<!--
var unityObjectUrl = "%UNITY_UNITYOBJECT_URL%";
if (document.location.protocol == 'https:')
unityObjectUrl = unityObjectUrl.replace("http://", "https://ssl-");
document.write('<script type="text\/javascript" src="' + unityObjectUrl + '"><\/script>');
-->
</script>
<script type="text/javascript">
<!--
var config = {
width: %UNITY_WIDTH%,
height: %UNITY_HEIGHT%,
params: %UNITY_PLAYER_PARAMS%
%UNITY_SET_BASE_DOWNLOAD_URL%
};
var u = new UnityObject2(config);
jQuery(function() {
var $missingScreen = jQuery("#unityPlayer").find(".missing");
var $brokenScreen = jQuery("#unityPlayer").find(".broken");
$missingScreen.hide();
$brokenScreen.hide();
u.observeProgress(function (progress) {
switch(progress.pluginStatus) {
case "broken":
$brokenScreen.find("a").click(function (e) {
e.stopPropagation();
e.preventDefault();
u.installPlugin();
return false;
});
$brokenScreen.show();
break;
case "missing":
$missingScreen.find("a").click(function (e) {
e.stopPropagation();
e.preventDefault();
u.installPlugin();
return false;
});
$missingScreen.show();
break;
case "installed":
$missingScreen.remove();
break;
case "first":
break;
}
});
u.initPlugin(jQuery("#unityPlayer")[0], "%UNITY_WEB_PATH%");
});
-->
</script>
<style type="text/css">
<!--
body {
font-family: Helvetica, Verdana, Arial, sans-serif;
background-color: black;
color: white;
text-align: center;
}
a:link, a:visited {
color: #bfbfbf;
}
a:active, a:hover {
color: #bfbfbf;
}
p.header {
font-size: small;
}
p.header span {
font-weight: bold;
}
p.footer {
font-size: x-small;
}
div.content {
margin: auto;
width: %UNITY_WIDTH%px;
}
div.broken,
div.missing {
margin: auto;
position: relative;
top: 50%;
width: 193px;
}
div.broken a,
div.missing a {
height: 63px;
position: relative;
top: -31px;
}
div.broken img,
div.missing img {
border-width: 0px;
}
div.broken {
display: none;
}
div#unityPlayer {
cursor: default;
height: %UNITY_HEIGHT%px;
width: %UNITY_WIDTH%px;
}
-->
</style>
</head>
<body>
<p class="header"><span>Unity Web Player | </span>%UNITY_WEB_NAME%</p>%UNITY_BETA_WARNING%
<div class="content">
<div id="unityPlayer">
<div class="missing">
<a href="http://unity3d.com/webplayer/" title="Unity Web Player. Install now!">
<img alt="Unity Web Player. Install now!" src="http://webplayer.unity3d.com/installation/getunity.png" width="193" height="63" />
</a>
</div>
</div>
</div>
<p class="footer">&laquo; created with <a href="http://unity3d.com/unity/" title="Go to unity3d.com">Unity</a> &raquo;</p>
<!-- unity_webview -->
<script type="text/javascript" src="unity-webview.js"></script>
</body>
</html>
Assets/WebPlayerTemplates/unity-webview/index.html.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f6333062aa8e346f2abc78ef7a457580
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/WebPlayerTemplates/unity-webview/thumbnail.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

Assets/WebPlayerTemplates/unity-webview/thumbnail.png.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 018355354713f41b2bed252c88e082c7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/WebPlayerTemplates/unity-webview/unity-webview.js
+99
View File
@@ -0,0 +1,99 @@
var unityWebView =
{
loaded: [],
init : function (name) {
$containers = $('.webviewContainer');
if ($containers.length === 0) {
$('<div style="position: absolute; left: 0px; width: 100%; height: 100%;"><div class="webviewContainer" style="overflow:hidden; position:relative; width:100%; height:100%; top:-100%; pointer-events:none; z-index: 1;"></div></div')
.appendTo($('#unityPlayer'));
}
var $last = $('.webviewContainer:last');
var clonedTop = parseInt($last.css('top')) - 100;
var $clone = $last.clone().insertAfter($last).css('top', clonedTop + '%');
var $iframe =
$('<iframe style="position:relative; width:100%; height100%; border-style:none; display:none; pointer-events:auto;"></iframe>')
.attr('id', 'webview_' + name)
.appendTo($last)
.on('load', function () {
$(this).attr('loaded', 'true');
var contents = $(this).contents();
var w = $(this)[0].contentWindow;
contents.find('a').click(function (e) {
var href = $.trim($(this).attr('href'));
if (href.substr(0, 6) === 'unity:') {
u.getUnity().SendMessage(name, "CallFromJS", href.substring(6, href.length));
e.preventDefault();
} else {
w.location.replace(href);
}
});
contents.find('form').submit(function () {
$this = $(this);
var action = $.trim($this.attr('action'));
if (action.substr(0, 6) === 'unity:') {
var message = action.substring(6, action.length);
if ($this.attr('method').toLowerCase() == 'get') {
message += '?' + $this.serialize();
}
u.getUnity().SendMessage(name, "CallFromJS", message);
return false;
}
return true;
});
});
},
sendMessage: function (name, message) {
u.getUnity().SendMessage(name, "CallFromJS", message);
},
setMargins: function (name, left, top, right, bottom) {
var $player = $('#unityPlayer');
var width = $player.width();
var height = $player.height();
var lp = left / width * 100;
var tp = top / height * 100;
var wp = (width - left - right) / width * 100;
var hp = (height - top - bottom) / height * 100;
this.iframe(name)
.css('left', lp + '%')
.css('top', tp + '%')
.css('width', wp + '%')
.css('height', hp + '%');
},
setVisibility: function (name, visible) {
if (visible)
this.iframe(name).show();
else
this.iframe(name).hide();
},
loadURL: function(name, url) {
this.iframe(name).attr('loaded', 'false')[0].contentWindow.location.replace(url);
},
evaluateJS: function (name, js) {
$iframe = this.iframe(name);
if ($iframe.attr('loaded') === 'true') {
$iframe[0].contentWindow.eval(js);
} else {
$iframe.on('load', function(){
$(this)[0].contentWindow.eval(js);
});
}
},
destroy: function (name) {
this.iframe(name).parent().parent().remove();
},
iframe: function (name) {
return $('#webview_' + name);
},
};
Assets/WebPlayerTemplates/unity-webview/unity-webview.js.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7bf88e2aa1e624d64b530ad0c2383b9e
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: