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

fix:1、修复bug

Browse Source
This commit is contained in:
barry
2026-07-09 16:10:06 +08:00
parent 8277a8e614
commit c2ad44d755
37 changed files with 66884 additions and 70585 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ArrowBeatTap-Gp.sln.DotSettings.user
+1
View File
@@ -12,6 +12,7 @@
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F84fcf9255ea045aab003a751cdb5a2f6573620_003F98_003Fe66e51af_003FList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AObject_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F37cc348edc804f4cb176b63962c716e7177200_003F25_003Fe0bd2277_003FObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AScriptableObject_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F37cc348edc804f4cb176b63962c716e7177200_003F45_003F06fae3db_003FScriptableObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASetupCoroutine_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F37cc348edc804f4cb176b63962c716e7177200_003F9a_003Fa0a972f9_003FSetupCoroutine_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AShortcutExtensions_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2348fb5ecc9e4e689f37f7d7fadaea9a27a00_003F77_003F364dbea6_003FShortcutExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AStringExtensions_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F79472e60dafb4701a62b3edca7f7c89928a00_003Fbc_003F2e2380bf_003FStringExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASystem_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FSourcesCache_003F3ea01e77be99618395f448b16bd7cc2bd4248bd9e5d8474964b2d97f39c5d74_003FSystem_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
Assets/AddressableAssetsData/AddressableAssetSettings.asset
+34 -34
View File
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 468a46d0ae32c3544b7d98094e6448a9, type: 3}
m_Name: AddressableAssetSettings
m_EditorClassIdentifier:
m_DefaultGroup: 44ddb8303f246d3429b89e77b6db6c3e
m_DefaultGroup: 80d1bb444b8712f4bb8893b055417853
m_currentHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
@@ -53,7 +53,6 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 11400000, guid: a19edbf36d6d44e098c63387983d4d97, type: 2}
- {fileID: 0}
- {fileID: 0}
@@ -66,6 +65,18 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 11400000, guid: 53e1a4ed3a577411b9f5956caced999e, type: 2}
- {fileID: 0}
- {fileID: 0}
@@ -78,17 +89,6 @@ MonoBehaviour:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_BuildSettings:
m_CompileScriptsInVirtualMode: 0
m_CleanupStreamingAssetsAfterBuilds: 1
@@ -97,34 +97,34 @@ MonoBehaviour:
m_ProfileSettings:
m_Profiles:
- m_InheritedParent:
m_Id: 27fff528d45a4bb44bfc8779970da25b
m_Id: dc7d5b4bb5ab5f644bedc5db0fde11d3
m_ProfileName: Default
m_Values:
- m_Id: 2f3d3257274d78e4dae6b08ef4e893e6
m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
- m_Id: 37d8baeddf6454e49a85d1f2e661f95c
m_Value: ServerData/[BuildTarget]
- m_Id: 5ddf744270953584796a990b528904a7
m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
- m_Id: 94915a7238c2d13408e235e46d828b68
m_Value: http://[PrivateIpAddress]:[HostingServicePort]
- m_Id: fbab78dd25f36a0469f3745cbc32cc3e
- m_Id: 2f621c32b367379419769361f4c52a25
m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
- m_Id: 3b1071280ad0ada46a26c2d62c6327d7
m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
- m_Id: 4a33d4dfdfacccb4ab0e48872e47f5c3
m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
- m_Id: 7c73122a2202d0545833970695b81bd0
m_Value: ServerData/[BuildTarget]
- m_Id: ce440bcafeaad1b488c2590622c7d0d4
m_Value: http://[PrivateIpAddress]:[HostingServicePort]
m_ProfileEntryNames:
- m_Id: 2f3d3257274d78e4dae6b08ef4e893e6
m_Name: Local.BuildPath
- m_Id: 2f621c32b367379419769361f4c52a25
m_Name: BuildTarget
m_InlineUsage: 0
- m_Id: 37d8baeddf6454e49a85d1f2e661f95c
m_Name: Remote.BuildPath
m_InlineUsage: 0
- m_Id: 5ddf744270953584796a990b528904a7
- m_Id: 3b1071280ad0ada46a26c2d62c6327d7
m_Name: Local.LoadPath
m_InlineUsage: 0
- m_Id: 94915a7238c2d13408e235e46d828b68
m_Name: Remote.LoadPath
- m_Id: 4a33d4dfdfacccb4ab0e48872e47f5c3
m_Name: Local.BuildPath
m_InlineUsage: 0
- m_Id: fbab78dd25f36a0469f3745cbc32cc3e
m_Name: BuildTarget
- m_Id: 7c73122a2202d0545833970695b81bd0
m_Name: Remote.BuildPath
m_InlineUsage: 0
- m_Id: ce440bcafeaad1b488c2590622c7d0d4
m_Name: Remote.LoadPath
m_InlineUsage: 0
m_ProfileVersion: 1
m_LabelTable:
@@ -144,7 +144,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: e625ff636d3a140b583859158f40bdff, type: 2}
- {fileID: 11400000, guid: f7c4cd7de5dd8409e8441863d0a3a38c, type: 2}
- {fileID: 11400000, guid: 34a1c74baf66c4989bc4af43c2515318, type: 2}
m_ActiveProfileId: 27fff528d45a4bb44bfc8779970da25b
m_ActiveProfileId: dc7d5b4bb5ab5f644bedc5db0fde11d3
m_HostingServicesManager:
m_HostingServiceInfos: []
m_Settings: {fileID: 11400000}
Assets/AddressableAssetsData/Android/addressables_content_state.bin
BIN
View File
Binary file not shown.
Assets/AddressableAssetsData/AssetGroups/Built In Data.asset
+1 -1
View File
@@ -15,7 +15,7 @@ MonoBehaviour:
m_GroupName: Built In Data
m_Data:
m_SerializedData: []
m_GUID: 3bd30133260a9f9488fd1f731ba077ea
m_GUID: 4c0e2c7f88d113b4082c04d9db421aca
m_SerializeEntries: []
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: b11a43be6977b47db88d15f90200f479, type: 2}
Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
+1 -1
View File
@@ -15,7 +15,7 @@ MonoBehaviour:
m_GroupName: Default Local Group
m_Data:
m_SerializedData: []
m_GUID: 6e9fc6d49cf83e84fa5d93c874d50b9c
m_GUID: dc67a87acc34f1a4da04a66e225f415f
m_SerializeEntries:
- m_GUID: c525a342ca76e4534bcb3202a822b3a6
m_Address: Assets/Configs
Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset
+2 -2
View File
@@ -34,9 +34,9 @@ MonoBehaviour:
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: 2f3d3257274d78e4dae6b08ef4e893e6
m_Id: 4a33d4dfdfacccb4ab0e48872e47f5c3
m_LoadPath:
m_Id: 5ddf744270953584796a990b528904a7
m_Id: 3b1071280ad0ada46a26c2d62c6327d7
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
Assets/ChillConnect/Manager/HallManager.cs
+4
View File
@@ -1,6 +1,7 @@
using DG.Tweening;
using IgnoreOPS;
using SGModule.Net;
// using UNSDK;
namespace ChillConnect
{
@@ -127,6 +128,9 @@ namespace ChillConnect
Debug.Log($"open wb normal==={openConfig.normal} url==={openConfig.url}");
// SdkConfigMgr.Instance.Open(openConfig.normal, openConfig.url);
SetCameraVisible(false);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open, openConfig);
Assets/Configs/public_conf_1783075415.json
-1
View File
File diff suppressed because one or more lines are too long
Assets/Configs/public_conf_1783506162.json
+1
View File
File diff suppressed because one or more lines are too long
Assets/Configs/public_conf_1783075415.json.meta → Assets/Configs/public_conf_1783506162.json.meta
+1 -1
View File
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: fac8fa45cc6559a4ebde3dc38d17090f
guid: 1076170ee0ec1df4682b29cd99f144b5
TextScriptImporter:
externalObjects: {}
userData:
Assets/GoogleMobileAds/Resources/GoogleMobileAdsSettings.asset
+1 -1
View File
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a187246822bbb47529482707f3e0eff8, type: 3}
m_Name: GoogleMobileAdsSettings
m_EditorClassIdentifier:
adMobAndroidAppId: ca-app-pub-3940256099942544~3347511713
adMobAndroidAppId: ca-app-pub-8182098075176784~8469064257
adMobIOSAppId: ca-app-pub-3940256099942544~1458002511
enableKotlinXCoroutinesPackagingOption: 1
enableGradleBuildPreProcessor: 1
Assets/MaxSdk/Mediation/GoogleAdManager.meta
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: f75dec80f49c44ee68edd909bd32747a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/MaxSdk/Mediation/GoogleAdManager/Editor.meta
-11
View File
@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 3e1635bfb5b164c389d38eb1e5e6e909
labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/GoogleAdManager/Editor
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/MaxSdk/Mediation/GoogleAdManager/Editor/Dependencies.xml
-10
View File
@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<dependencies>
<androidPackages>
<!-- Ensure that Resolver doesn't inadvertently pull the latest Play Services Ads' SDK that we haven't certified against. -->
<androidPackage spec="com.applovin.mediation:google-ad-manager-adapter:[25.3.0.0]" />
</androidPackages>
<iosPods>
<iosPod name="AppLovinMediationGoogleAdManagerAdapter" version="13.4.0.0" />
</iosPods>
</dependencies>
Assets/MaxSdk/Mediation/GoogleAdManager/Editor/Dependencies.xml.meta
-10
View File
@@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: aebbf5e9af66e431fa6078021b2f762f
labels:
- al_max
- al_max_export_path-MaxSdk/Mediation/GoogleAdManager/Editor/Dependencies.xml
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/MaxSdk/Resources/AppLovinSettings.asset
+1 -1
View File
@@ -16,5 +16,5 @@ MonoBehaviour:
sdkKey: mmVXU9O_ESeur52h0VwzCGfbI4wB8LxeBfydReplRMm2JmN8eNMVgSuiKy2bmTJ00m4DHSKFxhaH1pnpEME5bB
customGradleVersionUrl:
customGradleToolsVersion:
adMobAndroidAppId: ca-app-pub-3940256099942544~3347511713
adMobAndroidAppId: ca-app-pub-8182098075176784~8469064257
adMobIosAppId: ca-app-pub-3940256099942544~1458002511
Assets/OPS/Obfuscator/Log/Android.txt
+66767 -70444
View File
File diff suppressed because it is too large Load Diff
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">d0e301db-272e-40c4-b5dc-39b57b534421</string></resources>
<?xml version="1.0" encoding="utf-8"?><resources><string name="com.crashlytics.android.build_id" translatable="false">a3b8638f-c8ff-4e13-89ae-85cb2b148835</string></resources>
Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/AndroidManifest.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<uses-permission android:name="android.permission.INTERNET" />
<application>
<uses-library android:required="false" android:name="org.apache.http.legacy" />
<meta-data android:name="com.google.android.gms.ads.APPLICATION_ID" android:value="ca-app-pub-3940256099942544~3347511713" />
<meta-data android:name="com.google.android.gms.ads.APPLICATION_ID" android:value="ca-app-pub-8182098075176784~8469064257" />
<meta-data android:name="com.google.unity.ads.UNITY_VERSION" android:value="2022.3.62f2" />
</application>
</manifest>
Assets/Plugins/Android/mainTemplate.gradle
-1
View File
@@ -44,7 +44,6 @@ dependencies {
implementation 'com.applovin.mediation:facebook-adapter:[6.21.0.0]' // Assets/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml:8
implementation 'com.applovin.mediation:fyber-adapter:8.4.5.0' // Assets/MaxSdk/Mediation/Fyber/Editor/Dependencies.xml:4
implementation 'com.applovin.mediation:google-adapter:[25.3.0.0]' // Assets/MaxSdk/Mediation/Google/Editor/Dependencies.xml:5
implementation 'com.applovin.mediation:google-ad-manager-adapter:[25.3.0.0]' // Assets/MaxSdk/Mediation/GoogleAdManager/Editor/Dependencies.xml:5
implementation 'com.applovin.mediation:inmobi-adapter:11.3.0.0' // Assets/MaxSdk/Mediation/InMobi/Editor/Dependencies.xml:4
implementation 'com.applovin.mediation:ironsource-adapter:9.4.3.0.0' // Assets/MaxSdk/Mediation/IronSource/Editor/Dependencies.xml:4
implementation 'com.applovin.mediation:mintegral-adapter:17.1.61.0' // Assets/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml:8
Assets/Resources/ChillConnectAssets/FGUI/bkg_jilu_fui.bytes
BIN
View File
Binary file not shown.
Assets/Resources/SDKConfig.asset
+2 -2
View File
@@ -41,6 +41,6 @@ MonoBehaviour:
admobVideoUnitId:
admobInterUnitId:
admobSplashUnitId:
isDebug: 1
isPrintLog: 1
isDebug: 0
isPrintLog: 0
isUseAdmobSplash: 0
Assets/Resources/SdkConfigMgr.asset
-17
View File
@@ -1,17 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fb2c9d85afdd3d34c88a57c51b02fa84, type: 3}
m_Name: SdkConfigMgr
m_EditorClassIdentifier:
secret: JMXRDCA6Y
host:
isLog: 1
Assets/Resources/SdkConfigMgr.asset.meta
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 44d97a630bac8f44abf06383a16d4bb5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/SGModule/ConfigLoader/SGModule/Scripts/ConfigLoader/ConfigLoader.cs
+2
View File
@@ -172,6 +172,8 @@ namespace SGModule.ConfigLoader
/// </summary>
private void DownloadConfig(UnityAction<ConfigLoaderState> callback)
{
// var urls = $"{_cdnUrl}/config/{_cdnConfigFileName}";
// Debug.Log($"urls=========={urls}");
FileNetworkManager.Instance.ReadData($"{_cdnUrl}/config/{_cdnConfigFileName}", result =>
{
if (!string.IsNullOrEmpty(result))
Assets/Scenes/MainScene.unity
+13 -13
View File
@@ -840,7 +840,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1119590981}
- component: {fileID: 1119590980}
- component: {fileID: 1119590982}
m_Layer: 0
m_Name: FreeWebViewManager
m_TagString: Untagged
@@ -848,18 +848,6 @@ GameObject:
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
@@ -875,6 +863,18 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1119590982
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!1 &1183762475
GameObject:
m_ObjectHideFlags: 1
Assets/Scripts/ChillConnectRoot.cs
+5 -4
View File
@@ -6,13 +6,14 @@ using SGModule.MarkdownKit;
using SGModule.Net;
using SGModule.NetKit;
using UnityEngine;
// using UNSDK;
public class ChillConnectRoot : MonoBehaviour
{
public void Awake()
{
#if UNITY_EDITOR || GAME_RELEASE
#if UNITY_EDITOR || GAME_RELEASE || GAME_RELEASE1
GameObject ingameDebugConsole = GameObject.Find("IngameDebugConsole");
if (ingameDebugConsole != null) ingameDebugConsole.SetActive(false);
#endif
@@ -81,11 +82,11 @@ public class ChillConnectRoot : MonoBehaviour
}));
GMTool.Instance.AddItem(new GMToolItem(GUIType.Button,
() => "广告ID信息打印",
() => "打开 跳过广告",
s =>
{
// adInfoLabel += $"Max token: {MaxADKit.SDKKey} \n 激励广告Id: {MaxADKit.rewardedADUnitID} \n 插屏广告Id: {MaxADKit.interstitialADUnitID} \n";
adInfoLabel += "跳过广告开关已打开----";
MaxADKit.IsOpenAd = true;
}));
GMTool.Instance.AddItem(new GMToolItem(GUIType.Button, () => "关卡+1",
s =>
Assets/Scripts/LevelManager.cs
+21
View File
@@ -1,3 +1,4 @@
using System;
using UnityEngine;
using System.Collections.Generic;
using ChillConnect;
@@ -100,4 +101,24 @@ public class LevelManager : MonoBehaviour
CurrentLevel = JsonUtility.FromJson<LevelConfig>(jsonFile.text);
return CurrentLevel != null;
}
private float lastBackPressTime;
private void Update()
{
#if UNITY_ANDROID && !UNITY_EDITOR
if (!Input.GetKeyDown(KeyCode.Escape)) return;
if (Time.time - lastBackPressTime < 2f)
{
if (!UIManager.Instance.IsExistUI(UIConst.H5UI)) return;
Debug.Log($"gamelogin ui is exist ");
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Close);
}
else
{
lastBackPressTime = Time.time;
}
#endif
}
}
Assets/Scripts/ModuleUI/H5/H5UI.cs
+8 -4
View File
@@ -6,6 +6,7 @@ using FGUI.ZM_H5_15;
using IgnoreOPS;
using SGModule.NetKit;
using UnityEngine;
// using UNSDK;
namespace ChillConnect
{
@@ -41,6 +42,7 @@ namespace ChillConnect
{
FreeWebViewManager.Instance.CloseWeb();
// SdkConfigMgr.Instance.Close();
GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, true);
GameDispatcher.Instance.Dispatch(GameMsg.showBroadCast);
@@ -64,10 +66,7 @@ namespace ChillConnect
// Debug.Log($"H5UI OpenBefore url: {_config.url} normal: {_config.normal}");
DOVirtual.DelayedCall(0.1f, () =>
{
FreeWebViewManager.Instance.OpenWeb(_config.url);
});
GameDispatcher.Instance.Dispatch(GameMsg.hideBroadCast);
@@ -76,8 +75,13 @@ namespace ChillConnect
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Close);
});
InitView();
DOVirtual.DelayedCall(0.35f, () =>
{
FreeWebViewManager.Instance.OpenWeb(_config.url);
});
}
protected override void OnOpen(object args)
Assets/Scripts/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs
+1 -1
View File
@@ -1042,7 +1042,7 @@ namespace ChillConnect
}
var vo = ConfigSystem.GetConfig<MakeupModel>().GetData(makeupTaskData.tableId);
ui.lab_mn2.text = GameHelper.Get101Str(vo.item_need - value);
ui.lab_mn2.text = GameHelper.Get102Str(vo.item_need - value);
ui.lab_ticket.text = GameHelper.GetPriceInt(makeupTaskData.lastRdData.coupon_mount);
ui.lab_code.text = makeupTaskData.lastRdData.code;
Assets/Scripts/ModuleUI/Reward/RewardUI.cs
+3 -2
View File
@@ -100,15 +100,16 @@ namespace ChillConnect
}
var value = GetRewardValue();
ui.text_num.text = GameHelper.Get101Str(value);
if (GameHelper.IsGiftSwitch())
{
ui.text_num.text = GameHelper.Get102Str(value);
ui.text_num.text = GameHelper.Get102Str(value / (decimal)GameHelper.GetExchangeRateVo().Multi);
ui.btn_collect.title = "" + GameHelper.getChString((decimal)value);
}
else
{
ui.text_num.text = GameHelper.Get101Str(value);
ui.btn_collect.title ="Claim(<img src='ui://o9974uc5npswda'/>" + GameHelper.Get101Str((decimal)value) + ")";
}
DOVirtual.DelayedCall(0.2f, () =>
Assets/Scripts/ModuleUI/SaveingPot/SaveingPotUI.cs
+1 -1
View File
@@ -159,7 +159,7 @@ namespace ChillConnect
{
Makeup_2 makeupVo = ConfigSystem.GetConfig<MakeupModel_2>().GetData(makeupTaskData.tableId);
ui.text_ad.text = string.Format(GameHelper.getDesByKey("saving_pot_5"),
SaveingPotHelper.getChNumber(makeupVo.ADIncrease * GameHelper.GetExchangeRateVo().Multi));
SaveingPotHelper.getChNumber(makeupVo.ADIncrease));
string str = string.Format(GameHelper.getDesByKey("saving_pot_2"), makeupVo.PayIncrease);
ui.text_pay.text = str;
initTop();
Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs
+1 -1
View File
@@ -138,7 +138,7 @@ namespace ChillConnect
if (index == 6 && reward.quantity.Length > 1)
{
btnSign.day.selectedIndex = 1;
btnSign.reward_num1.text = GameHelper.Get101Str(reward.quantity[1]);
btnSign.reward_num1.text = GameHelper.Get102Str(reward.quantity[1]);
setItemUrl(btnSign.loader_icon0, reward.rewards_type[1]);
btnSign.x = 300;
}
Assets/Scripts/ToolKit/Language.cs
+1 -1
View File
@@ -57,7 +57,7 @@ public static class Language
lang = "ru";
}
// }
lang = "de";
// lang = "de";
setCurrentLanguage(lang);
}
Assets/Scripts/ToolKit/SDK/MaxADKit.cs
+8
View File
@@ -31,6 +31,7 @@ namespace ChillConnect
private const float RevenueThreshold = 0.1f;
public static Dictionary<string, string> adCallbackInfo;
public static bool IsOpenAd = false;
public static void Init()
{
@@ -134,6 +135,13 @@ namespace ChillConnect
{
onVideoAdCompleted = onCompleted;
_placement = placement;
if (IsOpenAd)
{
onVideoAdCompleted?.Invoke(true);
return;
}
#if UNITY_EDITOR
onVideoAdCompleted?.Invoke(true);
#else
ProjectSettings/AndroidResolverDependencies.xml
-1
View File
@@ -22,7 +22,6 @@
<package>com.applovin.mediation:facebook-adapter:[6.21.0.0]</package>
<package>com.applovin.mediation:fyber-adapter:8.4.5.0</package>
<package>com.applovin.mediation:google-adapter:[25.3.0.0]</package>
<package>com.applovin.mediation:google-ad-manager-adapter:[25.3.0.0]</package>
<package>com.applovin.mediation:inmobi-adapter:11.3.0.0</package>
<package>com.applovin.mediation:ironsource-adapter:9.4.3.0.0</package>
<package>com.applovin.mediation:mintegral-adapter:17.1.61.0</package>
ProjectSettings/ProjectSettings.asset
+1 -1
View File
@@ -849,7 +849,7 @@ PlayerSettings:
webGLMemoryGeometricGrowthCap: 96
webGLPowerPreference: 2
scriptingDefineSymbols:
Android: UNITY_VISUAL_SCRIPTING;ES3_TMPRO;ES3_UGUI;USE_ADDRESSABLES;GAME_RELEASE1
Android: UNITY_VISUAL_SCRIPTING;ES3_TMPRO;ES3_UGUI;USE_ADDRESSABLES;GAME_RELEASE
EmbeddedLinux: UNITY_VISUAL_SCRIPTING;ES3_TMPRO;ES3_UGUI
LinuxHeadlessSimulation: UNITY_VISUAL_SCRIPTING;ES3_TMPRO;ES3_UGUI
Nintendo Switch: UNITY_VISUAL_SCRIPTING;ES3_TMPRO;ES3_UGUI