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-02 11:46:24 +08:00
parent af7617c352
commit 63b530f245
22 changed files with 92 additions and 1102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ArrowBeatTap-Gp.sln.DotSettings.user
+2
View File
@@ -14,6 +14,8 @@
<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_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> <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>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1071a2cb0cb3433aae80a793c277a04846ac00_003Fb8_003Fdebf208b_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1071a2cb0cb3433aae80a793c277a04846ac00_003Fb8_003Fdebf208b_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUni2SDKAutoRefresh_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F79472e60dafb4701a62b3edca7f7c89928a00_003F5c_003Fd7ca2e25_003FUni2SDKAutoRefresh_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUni2SDKManager_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F79472e60dafb4701a62b3edca7f7c89928a00_003F13_003Fbb0c88a6_003FUni2SDKManager_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUni2SDKManager_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F8d4b727702d44da88ac054d09f951a8528a00_003F44_003F2fc63fee_003FUni2SDKManager_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUni2SDKManager_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F8d4b727702d44da88ac054d09f951a8528a00_003F44_003F2fc63fee_003FUni2SDKManager_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUni2SDKManager_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc31250e3609445af9cad08a98d73c5c656e00_003F0d_003Fe157c7c6_003FUni2SDKManager_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUni2SDKManager_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc31250e3609445af9cad08a98d73c5c656e00_003F0d_003Fe157c7c6_003FUni2SDKManager_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AVector2_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F37cc348edc804f4cb176b63962c716e7177200_003Fab_003F9e3ea355_003FVector2_002Ecs/@EntryIndexedValue">ForceIncluded</s:String> <s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AVector2_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F37cc348edc804f4cb176b63962c716e7177200_003Fab_003F9e3ea355_003FVector2_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
Assets/AddressableAssetsData/link.xml
+14
View File
@@ -0,0 +1,14 @@
<linker>
<assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
</assembly>
<assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
</assembly>
<assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.TextAsset" preserve="all" />
</assembly>
</linker>
Assets/AddressableAssetsData/link.xml.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f350ea4eef759664d89ace7135894073
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/ChillConnect/Helper/GameHelper.cs
+1 -1
View File
@@ -611,7 +611,7 @@ namespace ChillConnect
var url = $"mailto:{email}?subject={subject}&body={body}"; var url = $"mailto:{email}?subject={subject}&body={body}";
var uri = new Uri(url); var uri = new Uri(url);
OpenBrowser.OpenURL(uri.AbsoluteUri); Application.OpenURL(uri.AbsoluteUri);
GameHelper.ShowTips("Trying to call send mail..."); GameHelper.ShowTips("Trying to call send mail...");
} }
Assets/ChillConnect/Manager/HallManager.cs
+3 -1
View File
@@ -1,6 +1,7 @@
using DG.Tweening; using DG.Tweening;
using IgnoreOPS; using IgnoreOPS;
using SGModule.Net; using SGModule.Net;
using UNSDK;
namespace ChillConnect namespace ChillConnect
{ {
@@ -171,7 +172,8 @@ namespace ChillConnect
if (obj is not SDKOpenConfig openConfig) return; if (obj is not SDKOpenConfig openConfig) return;
// SdkConfigMgr.Instance.Open(openConfig.normal, openConfig.url); Debug.Log($"open wb normal==={openConfig.normal} url==={openConfig.url}");
SdkConfigMgr.Instance.Open(openConfig.normal, openConfig.url);
SetCameraVisible(false); SetCameraVisible(false);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open, openConfig); UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open, openConfig);
Assets/Resources/GameConfig.asset
+1 -1
View File
@@ -12,5 +12,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c836612725633cc4093d7ac06e7d9ef1, type: 3} m_Script: {fileID: 11500000, guid: c836612725633cc4093d7ac06e7d9ef1, type: 3}
m_Name: GameConfig m_Name: GameConfig
m_EditorClassIdentifier: m_EditorClassIdentifier:
packageName: com.candydoggame.arrowgamebeattap packageName: com.candydoggamegp.arrowgamebeattap
hardwareAcceleration: 1 hardwareAcceleration: 1
Assets/Scripts/BrigdeIOS.cs
-67
View File
@@ -1,67 +0,0 @@
using System.Runtime.InteropServices;
public class BrigdeIOS
{
[DllImport("__Internal")]
public static extern void copyText(string text);
// [DllImport("__Internal")]
// public static extern void SaveVideoWithCustomDate(string videoPath);
// [DllImport("__Internal")]
// public static extern void SaveImageWithCustomDate(string imagePath);
[DllImport("__Internal")]
public static extern void TrackProduct(string eventName, string dictionaryJson);
[DllImport("__Internal")]
public static extern void OpenWebview(string url);
[DllImport("__Internal")]
public static extern void CloseWebview();
[DllImport("__Internal")]
public static extern void showDarkWebview();
[DllImport("__Internal")]
public static extern void SetFullScreen();
[DllImport("__Internal")]
public static extern void addH5Field(int field1, int field2, int field3, int field4, int field5, string field6, string field7, string dark_url, string light_url, bool is_gift, string web_through_str, string click_add_time);
// [DllImport("__Internal")]
// public static extern void SetTouchWebview(bool flag, bool force = false);
// [DllImport("__Internal")]
// public static extern void ScrollWebview(float dx, float dy);
[DllImport("__Internal")]
public static extern void SetPadding(float left, float top, float right, float bottom);
[DllImport("__Internal")]
public static extern void SetDarkThough(bool though);
[DllImport("__Internal")]
public static extern void SetBtn(int left, int top, int right, int bottom);
[DllImport("__Internal")]
public static extern void SetCTEnable(bool flag);
[DllImport("__Internal")]
public static extern void ShowH5View(bool flag);
[DllImport("__Internal")]
public static extern void SetIconProgress(float val);
[DllImport("__Internal")]
public static extern void SetClickView();
[DllImport("__Internal")]
public static extern void ShowFlyBtn(bool flag);
[DllImport("__Internal")]
public static extern void setInH5View(bool flag);
[DllImport("__Internal")]
public static extern void upDataH5times(string weblink, int times, bool is_dark);
[DllImport("__Internal")]
public static extern void setFlyBtnTag(bool flag);
[DllImport("__Internal")]
public static extern void setRewardBtnTag(bool flag);
[DllImport("__Internal")]
public static extern void SetOffset(int offset_y ,int offset_y2);
}
Assets/Scripts/BrigdeIOS.cs.meta
-11
View File
@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 24a1626c4e4c020408af7acbcdff0798
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/ChillConnectRoot.cs
+2 -1
View File
@@ -6,6 +6,7 @@ using SGModule.MarkdownKit;
using SGModule.Net; using SGModule.Net;
using SGModule.NetKit; using SGModule.NetKit;
using UnityEngine; using UnityEngine;
using UNSDK;
public class ChillConnectRoot : MonoBehaviour public class ChillConnectRoot : MonoBehaviour
@@ -16,10 +17,10 @@ public class ChillConnectRoot : MonoBehaviour
GameObject ingameDebugConsole = GameObject.Find("IngameDebugConsole"); GameObject ingameDebugConsole = GameObject.Find("IngameDebugConsole");
if (ingameDebugConsole != null) ingameDebugConsole.SetActive(false); if (ingameDebugConsole != null) ingameDebugConsole.SetActive(false);
#endif #endif
// if (ingameDebugConsole != null) ingameDebugConsole.SetActive(false);
// NetworkKit.Instance.InitData(ConfigManager.GameConfig.packageName, ConfigManager.GameConfig.isRelease); // NetworkKit.Instance.InitData(ConfigManager.GameConfig.packageName, ConfigManager.GameConfig.isRelease);
SdkConfigMgr.Init();
MaxADKit.Init(); MaxADKit.Init();
Assets/Scripts/MainScene.cs
+30 -30
View File
@@ -76,10 +76,10 @@ namespace ChillConnect
{ {
AppDispatcher.Instance.Dispatch(AppMsg.AppManagerRegister); AppDispatcher.Instance.Dispatch(AppMsg.AppManagerRegister);
AppDispatcher.Instance.Dispatch(AppMsg.InitUIMgr); AppDispatcher.Instance.Dispatch(AppMsg.InitUIMgr);
// NetworkDispatcher.Instance.Dispatch(NetworkMsg.Login);
#if UNITY_EDITOR
NetworkDispatcher.Instance.Dispatch(NetworkMsg.Login); NetworkDispatcher.Instance.Dispatch(NetworkMsg.Login);
#endif // #if UNITY_EDITOR
// NetworkDispatcher.Instance.Dispatch(NetworkMsg.Login);
// #endif
AppDispatcher.Instance.AddListener(AppMsg.LoginInit, OnLoadingComplete); AppDispatcher.Instance.AddListener(AppMsg.LoginInit, OnLoadingComplete);
// DataMgr.InitPreferences(); // DataMgr.InitPreferences();
@@ -99,33 +99,33 @@ namespace ChillConnect
SaveingPotHelper.CheckSaveingPot(); SaveingPotHelper.CheckSaveingPot();
SaveingPotHelper.TestingClearTime(); SaveingPotHelper.TestingClearTime();
if (GameHelper.IsGiftSwitch()) // if (GameHelper.IsGiftSwitch())
{ // {
WebviewManager.Instance.SetFullScreen(); // WebviewManager.Instance.SetFullScreen();
int flyswitch = ConfigSystem.GetConfig<CommonModel>().flyswitch; // int flyswitch = ConfigSystem.GetConfig<CommonModel>().flyswitch;
int propswitch = ConfigSystem.GetConfig<CommonModel>().propswitch; // int propswitch = ConfigSystem.GetConfig<CommonModel>().propswitch;
//
int offset_y = ConfigSystem.GetConfig<CommonModel>().WVOffset[0]; // int offset_y = ConfigSystem.GetConfig<CommonModel>().WVOffset[0];
int offset_y1 = ConfigSystem.GetConfig<CommonModel>().WVOffset[1]; // int offset_y1 = ConfigSystem.GetConfig<CommonModel>().WVOffset[1];
Debug.Log("barry offset_y: " + offset_y + " offset_y1: " + offset_y1); // Debug.Log("barry offset_y: " + offset_y + " offset_y1: " + offset_y1);
float top_offset = 0;//fgui中的顶部信息的高度 // float top_offset = 0;//fgui中的顶部信息的高度
float buttom_offset = 165; // float buttom_offset = 165;
if (Screen.safeArea.y != 0) // if (Screen.safeArea.y != 0)
{//刘海屏 // {//刘海屏
top_offset += Screen.safeArea.y; // top_offset += Screen.safeArea.y;
} // }
WebviewManager.Instance.SetOffset(offset_y, offset_y1); // WebviewManager.Instance.SetOffset(offset_y, offset_y1);
WebviewManager.Instance.SetPadding(0, top_offset / GRoot.inst.height, 0, buttom_offset / GRoot.inst.height); // WebviewManager.Instance.SetPadding(0, top_offset / GRoot.inst.height, 0, buttom_offset / GRoot.inst.height);
//
WebviewManager.Instance.RefreshUrl(); // WebviewManager.Instance.RefreshUrl();
// Debug.Log($"flyswitch==1 ------ {flyswitch == 1}"); // // Debug.Log($"flyswitch==1 ------ {flyswitch == 1}");
// Debug.Log($"propswitch==1 ------ {propswitch == 1}"); // // Debug.Log($"propswitch==1 ------ {propswitch == 1}");
WebviewManager.Instance.setFlyBtnTag(flyswitch == 1); // WebviewManager.Instance.setFlyBtnTag(flyswitch == 1);
WebviewManager.Instance.setRewardBtnTag(propswitch == 1); // WebviewManager.Instance.setRewardBtnTag(propswitch == 1);
WebviewManager.Instance.SetDarkThough(true); // WebviewManager.Instance.SetDarkThough(true);
WebviewManager.Instance.ShowH5View(false); // WebviewManager.Instance.ShowH5View(false);
WebviewManager.Instance.SetBtn(ConfigSystem.GetConfig<CommonModel>().propCoord[0], ConfigSystem.GetConfig<CommonModel>().propCoord[1], 60, 60); // WebviewManager.Instance.SetBtn(ConfigSystem.GetConfig<CommonModel>().propCoord[0], ConfigSystem.GetConfig<CommonModel>().propCoord[1], 60, 60);
} // }
}); });
} }
Assets/Scripts/MaxPayManager.cs
+1 -1
View File
@@ -133,7 +133,7 @@ public class MaxPayManager
paydata.status = 1; paydata.status = 1;
SavePayData(response.Data.order_id, paydata); SavePayData(response.Data.order_id, paydata);
isPay = true; isPay = true;
OpenBrowser.OpenURL(response.Data.pay_url); Application.OpenURL(response.Data.pay_url);
} }
}); });
Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs
+3 -2
View File
@@ -1481,6 +1481,7 @@ namespace ChillConnect
} }
else else
{ {
ReleaseArrowOccupied(clickArrow);
MoveToDisappear(clickArrow); MoveToDisappear(clickArrow);
} }
} }
@@ -1865,7 +1866,7 @@ namespace ChillConnect
if (CheckIsOutOfBounds(tailPos, arrow.finalMoveDir)) if (CheckIsOutOfBounds(tailPos, arrow.finalMoveDir))
{ {
// ========== 以下销毁逻辑和原代码保持一致 ========== // ========== 以下销毁逻辑和原代码保持一致 ==========
ReleaseArrowOccupied(arrow); // ReleaseArrowOccupied(arrow);
foreach (var line in arrow.lineUnits) foreach (var line in arrow.lineUnits)
{ {
@@ -1974,7 +1975,7 @@ namespace ChillConnect
/// </summary> /// </summary>
private void DisappearLineGetReward() private void DisappearLineGetReward()
{ {
return;
if (!GameHelper.IsGiftSwitch()) return; if (!GameHelper.IsGiftSwitch()) return;
bool isGet = false; bool isGet = false;
Assets/Scripts/ModuleUI/H5/H5UI.cs
+4 -4
View File
@@ -47,8 +47,8 @@ namespace ChillConnect
if (_config.normal) if (_config.normal)
{ {
WebviewManager.Instance.setInH5View(false); // WebviewManager.Instance.setInH5View(false);
WebviewManager.Instance.ShowH5View(false); // WebviewManager.Instance.ShowH5View(false);
} }
else else
{ {
@@ -73,8 +73,8 @@ namespace ChillConnect
// Debug.Log($"H5UI OpenBefore url: {_config.url} normal: {_config.normal}"); // Debug.Log($"H5UI OpenBefore url: {_config.url} normal: {_config.normal}");
if (_config.normal) if (_config.normal)
{ {
WebviewManager.Instance.setInH5View(true); // WebviewManager.Instance.setInH5View(true);
WebviewManager.Instance.ShowH5View(true); // WebviewManager.Instance.ShowH5View(true);
} }
else else
{ {
Assets/Scripts/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs
+2 -2
View File
@@ -58,7 +58,7 @@ namespace ChillConnect
GameHelper.showGameUI = true; GameHelper.showGameUI = true;
// WebviewManager.ShezhiACT(true); // WebviewManager.ShezhiACT(true);
WebviewManager.Instance.SetDarkThough(true); // WebviewManager.Instance.SetDarkThough(true);
gameDispatcher.Dispatch(GameMsg.MakeUpConfirmUIClosed); gameDispatcher.Dispatch(GameMsg.MakeUpConfirmUIClosed);
@@ -95,7 +95,7 @@ namespace ChillConnect
// DataMgr.Ticket.Value = 999999999; //zhushi // DataMgr.Ticket.Value = 999999999; //zhushi
// WebviewManager.ShezhiACT(false); // WebviewManager.ShezhiACT(false);
WebviewManager.Instance.SetDarkThough(false); // WebviewManager.Instance.SetDarkThough(false);
makeupTaskData = args as MakeupTaskData; makeupTaskData = args as MakeupTaskData;
ch_index = makeupTaskData.tableId - 1; ch_index = makeupTaskData.tableId - 1;
ui.btn_earn.title = GameHelper.getDesByKey("ch_out_1"); ui.btn_earn.title = GameHelper.getDesByKey("ch_out_1");
Assets/Scripts/ModuleUI/PersonView/PersonViewUI.cs
+1 -1
View File
@@ -121,7 +121,7 @@ namespace ChillConnect
ui.btn_privacy.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PrivacyUI_Open, 0); }); ui.btn_privacy.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PrivacyUI_Open, 0); });
ui.btn_terms.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PrivacyUI_Open, 1); }); ui.btn_terms.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PrivacyUI_Open, 1); });
ui.btn_official.SetClick(() => { OpenBrowser.OpenURL("http://captainsroll.com/"); }); ui.btn_official.SetClick(() => { Application.OpenURL("http://captainsroll.com/"); });
ui.btn_us.SetClick(() => { GameHelper.OpenEmail(); }); ui.btn_us.SetClick(() => { GameHelper.OpenEmail(); });
Assets/Scripts/ModuleUI/SaveingPot/SaveingPotUI.cs
+2 -2
View File
@@ -58,7 +58,7 @@ namespace ChillConnect
HallManager.Instance.UpdateSecondEvent -= upLvWatchAdsBtn; HallManager.Instance.UpdateSecondEvent -= upLvWatchAdsBtn;
closeCallback?.Invoke(); closeCallback?.Invoke();
// WebviewManager.ShezhiACT(true); // WebviewManager.ShezhiACT(true);
WebviewManager.Instance.SetDarkThough(true); // WebviewManager.Instance.SetDarkThough(true);
GameDispatcher.Instance.Dispatch(GameMsg.RefreshSaveingPot); GameDispatcher.Instance.Dispatch(GameMsg.RefreshSaveingPot);
@@ -83,7 +83,7 @@ namespace ChillConnect
} }
// WebviewManager.ShezhiACT(false); // WebviewManager.ShezhiACT(false);
WebviewManager.Instance.SetDarkThough(false); // WebviewManager.Instance.SetDarkThough(false);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuygoldUI_Close); UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuygoldUI_Close);
Assets/Scripts/OpenBrowser.cs
-22
View File
@@ -1,22 +0,0 @@
using System.Runtime.InteropServices;
using UnityEngine;
public class OpenBrowser
{
[DllImport("__Internal")]
public static extern void _openURL(string url);
public static void OpenURL(string url)
{
// 调用iOS原生方法打开URL
if (Application.platform == RuntimePlatform.IPhonePlayer)
{
_openURL(url);
}
else
{
// 在非iOS平台上，你可以使用Unity的Application.OpenURL方法
Application.OpenURL(url);
}
}
}
Assets/Scripts/OpenBrowser.cs.meta
-11
View File
@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: dc89f3dbe2daac84a89a18c441e5d9b4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/ToolKit/SDK/MaxADKit.cs
+16 -16
View File
@@ -34,21 +34,21 @@ namespace ChillConnect
public static void Init() public static void Init()
{ {
#if !UNITY_EDITOR #if !UNITY_EDITOR
// 注册 ab事件，0或1，0为自然量版本，1为激励版本 // // 注册 ab事件，0或1，0为自然量版本，1为激励版本
NCWWA6A0SDK_Manager.Instance.RegistIosParam(i => // NCWWA6A0SDK_Manager.Instance.RegistIosParam(i =>
{ // {
SuperApplication.Instance.attribution = i == 0 ? "organic" : "non_organic"; // SuperApplication.Instance.attribution = i == 0 ? "organic" : "non_organic";
Debug.Log($"ios ab param : {i} attribution=== {SuperApplication.Instance.attribution}"); // Debug.Log($"ios ab param : {i} attribution=== {SuperApplication.Instance.attribution}");
NetworkDispatcher.Instance.Dispatch(NetworkMsg.Login); // NetworkDispatcher.Instance.Dispatch(NetworkMsg.Login);
//
}); // });
//
void GameConfig(bool result, string config) // void GameConfig(bool result, string config)
{ // {
Debug.Log($"************* game config result : {result}, config : {config}"); // Debug.Log($"************* game config result : {result}, config : {config}");
} // }
// SDK初始化方法 // // SDK初始化方法
NCWWA6A0SDK_Manager.Instance.Init(null, null, GameConfig); // NCWWA6A0SDK_Manager.Instance.Init(null, null, GameConfig);
#endif #endif
} }
@@ -132,7 +132,7 @@ namespace ChillConnect
{ {
onVideoAdCompleted = onCompleted; onVideoAdCompleted = onCompleted;
_placement = placement; _placement = placement;
#if UNITY_EDITOR #if UNITY_EDITOR || !GAME_RELEASE
onVideoAdCompleted?.Invoke(true); onVideoAdCompleted?.Invoke(true);
#else #else
TrackKit.SendEvent(Property.adEvent,Property.watch_ad_people); TrackKit.SendEvent(Property.adEvent,Property.watch_ad_people);
Assets/Scripts/WebviewManager.cs
-915
View File
@@ -1,915 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using ChillConnect;
using FairyGUI;
using UnityEngine;
using UnityEngine.EventSystems;
using DG.Tweening;
using IgnoreOPS;
using SGModule.NetKit;
namespace IgnoreOPS
{
public class WebviewManager : MonoBehaviour
{
// Vector2 startPos;
// float lastTouchTime = 0f;
// float touchInterval = 0.3f;
// void Update()
// {
// #if UNITY_IOS && !UNITY_EDITOR
// if(Input.touchCount > 0)
// {
// Touch touch_ = Input.GetTouch(0);
//
// if(touch_.phase == TouchPhase.Began)
// {
// startPos = touch_.position;
// lastTouchTime = Time.time;
// }
// if(touch_.phase == TouchPhase.Ended)
// {
// if ((Time.time - lastTouchTime) < touchInterval){
// // if (WebViewMgr.Instance.WebUIType == WebUIType.H5 && EventSystem.current.currentSelectedGameObject == null){
// // BrigdeIOS.SetTouchWebview(true, true);
// // }else{
// // BrigdeIOS.SetTouchWebview(true);
// // }
// BrigdeIOS.SetClickView();
// }
// }
// // if(touch_.phase == TouchPhase.Moved){
// // Vector2 delta = touch_.position - startPos;
// // // Debug.Log("delta Y: " + delta.y);
// // BrigdeIOS.ScrollWebview(delta.x, delta.y);
// // startPos = touch_.position;
// // }
// }
// #endif
// }
public static WebviewManager Instance;
public WebviewManager()
{
Instance = this;
}
public void OpenWebView(string url)
{
//Debug.Log("[WebviewManager] OpenWebView");
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.OpenWebview(url);
#endif
}
public void showDarkWebview()
{
//Debug.Log("[WebviewManager] OpenWebView");
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.showDarkWebview();
#endif
}
public void CloseWebview()
{
//Debug.Log("[WebviewManager] CloseWebview");
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.CloseWebview();
#endif
}
public void SetOffset(int offset_y, int offset_y1)
{
// Debug.Log($"barry [WebviewManager] SetOffset:{offset_y}, {offset_y1}");
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.SetOffset(offset_y, offset_y1);
#endif
}
public void SetPadding(float left, float top, float right, float bottom)
{
// Debug.Log("[WebviewManager] SetPadding");
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.SetPadding(left, top, right, bottom);
#endif
}
public void SetDarkThough(bool though)
{
if (!GameHelper.IsGiftSwitch()) return;
// if (though)
// {
// if (UI.Instance.IsExistUI(UIConst.LevelSuccessUI) || UI.Instance.IsExistUI(UIConst.MakeupConfirmUI) ||
// UI.Instance.IsExistUI(UIConst.NewTaskUI) || UI.Instance.IsExistUI(UIConst.PackrewardUI) || UI.Instance.IsExistUI(UIConst.SaveingPotUI)
// )
// {
// return;
// }
// }
// Debug.Log("[WebviewManager] SetPadding");
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.SetDarkThough(though);
#endif
}
public void SetBtn(int left, int top, int right, int bottom)
{
// Debug.Log("[WebviewManager] SetBtn");
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.SetBtn(left, top, right, bottom);
#endif
}
public void SetCTEnable(bool flag)
{
// Debug.Log("[WebviewManager] SetCTEnable");
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.SetCTEnable(flag);
#endif
}
public void SetFullScreen()
{
// Debug.Log("[WebviewManager] SetFullScreen");
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.SetFullScreen();
#endif
}
public void addH5Field(int field1, int field2, int field3, int field4, int field5, string field6, string field7, string dark_url, string light_url, bool is_gift, string web_through_str, string click_add_time)
{
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.addH5Field(field1,field2,field3,field4,field5,field6,field7,dark_url,light_url,is_gift,web_through_str,click_add_time);
#endif
}
public void ShowH5View(bool flag)
{
// Debug.Log("[WebviewManager] SetCTEnable");
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.ShowH5View(flag);
#endif
}
public void SetIconProgress(float val)
{
// Debug.Log("[WebviewManager] SetCTEnable");
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.SetIconProgress(val);
#endif
}
public void setInH5View(bool flag)
{
// Debug.Log("[WebviewManager] SetCTEnable");
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.setInH5View(flag);
#endif
}
public void upDataH5times(string weblink, int times, bool is_dark)
{
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.upDataH5times( weblink, times,is_dark);
#endif
}
public void ShowFlyBtn(bool flag)
{
// Debug.Log("[WebviewManager] SetCTEnable");
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.ShowFlyBtn(flag);
#endif
}
public void setFlyBtnTag(bool flag)
{
// Debug.Log($"[WebviewManager] setFlyBtnTag ---{flag}");
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.setFlyBtnTag(flag);
#endif
}
public void setRewardBtnTag(bool flag)
{
// Debug.Log($"[WebviewManager] setRewardBtnTag--- {flag}");
#if UNITY_IOS && !UNITY_EDITOR
BrigdeIOS.setRewardBtnTag(flag);
#endif
}
public void ObjC_TouchClick(string name)
{
// Debug.Log("Touch click: " + name);
GameDispatcher.Instance.Dispatch(GameMsg.H5ViewClickBtn, name);
}
public void H5AutoRefresh(string times)
{
if (times == "") return;
DateTime newDate = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
newDate = newDate.AddSeconds(GameHelper.GetNowTime(true));
var newDays = newDate.Day;
if (times == "Dailyrefreshtimes")
{
var last_time = PlayerPrefs.GetInt("Dayreftimes", 0);
if (last_time == newDays)
{
var numbers = PlayerPrefs.GetInt("Dailyrefreshnum", 0);
numbers++;
PlayerPrefs.SetInt("Dailyrefreshnum", numbers);
}
else
{
PlayerPrefs.SetInt("Dailyrefreshnum", 1);
PlayerPrefs.SetInt("Dayreftimes", newDays);
string darkWVRefreshtime_str = "";
string darkWVDailyrefreshtimes_str = "";
// for (int i = 0; i < ConfigSystem.GetConfig<CommonModel>().darkWVRefreshtime.Length; i++)
// {
// if (i != 0) darkWVRefreshtime_str += "|";
// darkWVRefreshtime_str += ConfigSystem.GetConfig<CommonModel>().darkWVRefreshtime[i].ToString();
// }
// for (int i = 0; i < ConfigSystem.GetConfig<CommonModel>().darkWVRefreshtime2.Length; i++)
// {
// darkWVRefreshtime_str += "|";
// darkWVRefreshtime_str += ConfigSystem.GetConfig<CommonModel>().darkWVRefreshtime2[i].ToString();
// }
int dark_type = -1;
for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++)
{
if (dark_type != ConfigSystem.dark_weblist[i].wvType)
{
if (i != 0) darkWVRefreshtime_str += "|";
darkWVRefreshtime_str += ConfigSystem.dark_weblist[i].darkWVRefreshtime[0];
darkWVRefreshtime_str += "|";
darkWVRefreshtime_str += ConfigSystem.dark_weblist[i].darkWVRefreshtime[1];
dark_type = ConfigSystem.dark_weblist[i].wvType;
}
}
// for (int i = 0; i < ConfigSystem.GetConfig<CommonModel>().darkWVDailyrefreshtimes.Length; i++)
// {
// if (i != 0) darkWVDailyrefreshtimes_str += "|";
// darkWVDailyrefreshtimes_str += ConfigSystem.GetConfig<CommonModel>().darkWVDailyrefreshtimes[i].ToString();
// }
dark_type = -1;
for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++)
{
if (dark_type != ConfigSystem.dark_weblist[i].wvType)
{
if (i != 0) darkWVDailyrefreshtimes_str += "|";
darkWVDailyrefreshtimes_str += ConfigSystem.dark_weblist[i].darkWVDailyrefreshtimes;
dark_type = ConfigSystem.dark_weblist[i].wvType;
}
}
WebviewManager.Instance.addH5Field(ConfigSystem.GetConfig<CommonModel>().flyCtRate, ConfigSystem.GetConfig<CommonModel>().otherH5switch,
ConfigSystem.GetConfig<CommonModel>().H5Refreshtime, ConfigSystem.GetConfig<CommonModel>().Dailyrefreshtimes, ConfigSystem.GetConfig<CommonModel>().darkThoughProbability, darkWVRefreshtime_str,
darkWVDailyrefreshtimes_str, "", "", GameHelper.IsGiftSwitch(), "", "");
}
}
else if (times.Contains("dark_Dailyrefreshtimes"))
{
var last_time = PlayerPrefs.GetInt("dark_refreshDay", 0);
if (last_time == newDays)
{
// var numbers = PlayerPrefs.GetInt("dark_Dayref", 0);
// numbers++;
// PlayerPrefs.SetInt("dark_Dayref", numbers);
string[] temp_arr = times.Split("|");
if (temp_arr.Length >= 2)
{
SaveData.GetSaveObject().dark_Dayref[Int32.Parse(temp_arr[1])]++;
SaveData.saveDataFunc();
}
}
else
{
// PlayerPrefs.SetInt("dark_Dayref", 1);
string[] temp_arr = times.Split("|");
if (temp_arr.Length >= 2)
{
SaveData.GetSaveObject().dark_Dayref[Int32.Parse(temp_arr[1])] = 1;
SaveData.saveDataFunc();
}
PlayerPrefs.SetInt("dark_refreshDay", newDays);
string darkWVRefreshtime_str = "";
string darkWVDailyrefreshtimes_str = "";
// for (int i = 0; i < ConfigSystem.GetConfig<CommonModel>().darkWVRefreshtime.Length; i++)
// {
// if (i != 0) darkWVRefreshtime_str += "|";
// darkWVRefreshtime_str += ConfigSystem.GetConfig<CommonModel>().darkWVRefreshtime[i].ToString();
// }
// for (int i = 0; i < ConfigSystem.GetConfig<CommonModel>().darkWVRefreshtime2.Length; i++)
// {
// darkWVRefreshtime_str += "|";
// darkWVRefreshtime_str += ConfigSystem.GetConfig<CommonModel>().darkWVRefreshtime2[i].ToString();
// }
int dark_type = -1;
for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++)
{
if (dark_type != ConfigSystem.dark_weblist[i].wvType)
{
if (i != 0) darkWVRefreshtime_str += "|";
darkWVRefreshtime_str += ConfigSystem.dark_weblist[i].darkWVRefreshtime[0];
darkWVRefreshtime_str += "|";
darkWVRefreshtime_str += ConfigSystem.dark_weblist[i].darkWVRefreshtime[1];
dark_type = ConfigSystem.dark_weblist[i].wvType;
}
}
// for (int i = 0; i < ConfigSystem.GetConfig<CommonModel>().darkWVDailyrefreshtimes.Length; i++)
// {
// if (i != 0) darkWVDailyrefreshtimes_str += "|";
// darkWVDailyrefreshtimes_str += ConfigSystem.GetConfig<CommonModel>().darkWVDailyrefreshtimes[i].ToString();
// }
dark_type = -1;
for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++)
{
if (dark_type != ConfigSystem.dark_weblist[i].wvType)
{
if (i != 0) darkWVDailyrefreshtimes_str += "|";
darkWVDailyrefreshtimes_str += ConfigSystem.dark_weblist[i].darkWVDailyrefreshtimes;
dark_type = ConfigSystem.dark_weblist[i].wvType;
}
}
WebviewManager.Instance.addH5Field(ConfigSystem.GetConfig<CommonModel>().flyCtRate, ConfigSystem.GetConfig<CommonModel>().otherH5switch,
ConfigSystem.GetConfig<CommonModel>().H5Refreshtime, ConfigSystem.GetConfig<CommonModel>().Dailyrefreshtimes, ConfigSystem.GetConfig<CommonModel>().darkThoughProbability, darkWVRefreshtime_str,
darkWVDailyrefreshtimes_str, "", "", GameHelper.IsGiftSwitch(), "", "");
}
}
else
{
string[] temp_array = times.Split("|");
if (temp_array.Length >= 2 && temp_array[0] != null && temp_array[0] != "")
{
if (temp_array[1] == "h5")
{
H5sendClass info = new H5sendClass() { link = temp_array[0], type = "h5" };
NetApi.H5RefreshTimes<H5refreshTimes>(temp_array[0], "h5", (isSuccess, obj) =>
{
if (isSuccess)
{
int numbers = 0;
for (int i = 0; i < ConfigSystem.light_weblist.Count; i++)
{
if (ConfigSystem.light_weblist[i].webLink == temp_array[0])
{
// Debug.Log("uuuuuuuuuuuuuuuuu明穿透" + temp_array[0] + "已经刷新了" + obj.times + "次" + "上限是" + ConfigSystem.light_weblist[i].refreshMax + "次");
numbers = ConfigSystem.light_weblist[i].refreshMax - obj.times;
break;
}
}
if (numbers < 0) numbers = 0;
upDataH5times(temp_array[0], numbers, false);
}
});
}
else
{
H5sendClass info = new H5sendClass() { link = temp_array[0], type = "h6" };
NetApi.H5RefreshTimes<H5refreshTimes>(temp_array[0], "h6", (isSuccess, obj) =>
{
if (isSuccess)
{
int numbers = 0;
for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++)
{
if (ConfigSystem.dark_weblist[i].webLink == temp_array[0])
{
// Debug.Log("uuuuuuuuuuuuuuuuu暗穿透" + temp_array[0] + "已经刷新了" + obj.times + "次" + "上限是" + ConfigSystem.dark_weblist[i].refreshMax + "次");
numbers = ConfigSystem.dark_weblist[i].refreshMax - obj.times;
break;
}
}
if (numbers < 0) numbers = 0;
upDataH5times(temp_array[0], numbers, true);
}
});
}
}
}
}
private GList select_glist;
private float select_glist_y;
public void TouchClickPoint(string name)
{
Debug.Log("TouchClickPoint" + name);
if (name == null) return;
if (name == "flyBtn")
{
// NetworkKit.BuriedPoint(BuriedPointEvent.Hall_behavior, BuriedPointEvent.fly_ct_number, 1);
//NetworkKit.BuriedPoint(BuriedPointEvent.Hall_behavior,BuriedPointEvent.fly_ct_people,1);
TrackKit.SendEvent(Property.Event, Property.FlyCtNumber);
}
if (name == "rewardBtn")
{
// NetworkKit.BuriedPoint(BuriedPointEvent.Hall_behavior, BuriedPointEvent.annular_ct_number, 1);
//NetworkKit.BuriedPoint(BuriedPointEvent.Hall_behavior,BuriedPointEvent.annular_ct_people,1);
TrackKit.SendEvent(Property.Event, Property.AnnularCtNumber);
}
if (name == "finish")
{
// NetworkKit.BuriedPoint(BuriedPointEvent.Hall_behavior, BuriedPointEvent.annular_finish_number, 1);
TrackKit.SendEvent(Property.Event, Property.AnnularFinishNumber);
}
else
{
string[] a = name.Split("|");
if (a.Length < 2) return;
if (!float.TryParse(a[0], out float x) || !float.TryParse(a[1], out float y))
{
Debug.LogError("Invalid format for coordinates: " + name);
return;
}
Vector2 fguiScreenPos = new(x * GRoot.inst.width, y * GRoot.inst.height);
// Debug.Log("mmmmmmmmmmmmmmmmmm" + a[0]);
// Debug.Log("mmmmmmmmmmmmmmmmmm" + a[1]);
// if (AppConst.DeviceLangue == "pt")
// {
// fguiScreenPos = new Vector2((float.Parse(a[0]) * GRoot.inst.width) / 1000000.0f,
// float.Parse(a[1]) * GRoot.inst.height / 1000000.0f);
// }
// else
// {
//}
GButton objUnderPoint = null;
var child_array = GRoot.inst.GetChildren().Reverse();
bool click_card = true;
foreach (GComponent child in child_array) //normal
{
if (child.GetChildren().Length > 0)
{
var com_array = child.GetChildren().Reverse();
foreach (GComponent com_child in com_array) //com_层面
{
if (child.name == "Popup" || child.name == "Highest")
{
click_card = false;/* */
}
var btn_array = com_child.GetChildren();
for (int i = btn_array.Length - 1; i >= 0; i--) //btn_层面
{
// if (btn_array[i] .name=="btn_collect")
// {
// Debug.Log(btn_array[i].x);
// Debug.Log(btn_array[i].y);
// Debug.Log(fguiScreenPos.x);
// Debug.Log(fguiScreenPos.y);
// Debug.Log(btn_array[i].position.x <= fguiScreenPos.x &&
// fguiScreenPos.x <= btn_array[i].position.x + btn_array[i].width);
// Debug.Log( btn_array[i].position.y <= fguiScreenPos.y &&
// fguiScreenPos.y <= btn_array[i].position.y + btn_array[i].height);
// }
if (btn_array[i] is GButton)
{
GButton temp = btn_array[i] as GButton;
if (temp.onStage && temp.visible && temp.position.x <= fguiScreenPos.x &&
fguiScreenPos.x <= temp.position.x + temp.width &&
temp.position.y <= fguiScreenPos.y &&
fguiScreenPos.y <= temp.position.y + temp.height)
{
objUnderPoint = btn_array[i] as GButton;
if (objUnderPoint.enabled)
{
objUnderPoint.FireClick(true, true);
}
else objUnderPoint.FireClick(true, false);
goto EndLoop;
}
}
else if (btn_array[i] is GTextInput)
{
GTextInput temp = btn_array[i] as GTextInput;
if (temp.onStage && temp.visible && temp.position.x <= fguiScreenPos.x &&
fguiScreenPos.x <= temp.position.x + temp.width &&
temp.position.y <= fguiScreenPos.y &&
fguiScreenPos.y <= temp.position.y + temp.height)
{
temp.RequestFocus();
goto EndLoop;
}
}
else if (btn_array[i] is GList)
{
GList temp = btn_array[i] as GList;
if (temp.onStage && temp.visible && temp.position.x <= fguiScreenPos.x &&
fguiScreenPos.x <= temp.position.x + temp.width &&
temp.position.y <= fguiScreenPos.y &&
fguiScreenPos.y <= temp.position.y + temp.height)
{
if (select_glist == null)
{
select_glist_y = fguiScreenPos.y;
select_glist = btn_array[i] as GList;
}
else
{
select_glist.scrollPane.posY -= (fguiScreenPos.y - select_glist_y);
select_glist_y = fguiScreenPos.y;
}
goto EndLoop;
}
}
// else if (btn_array[i] is GImage)
// {
// GImage temp = btn_array[i] as GImage;
// if (temp.onStage && temp.visible && temp.position.x <= fguiScreenPos.x &&
// fguiScreenPos.x <= temp.position.x + temp.width &&
// temp.position.y <= fguiScreenPos.y &&
// fguiScreenPos.y <= temp.position.y + temp.height)
// {
// if (temp.onClick != null)
// {
// // 触发图片的点击事件
// Debug.Log("TouchClickPoint 点击了图片: " + temp.name);
// temp.DispatchEvent("click");
// goto EndLoop;
// }
//
// }
// }
else if (btn_array[i] is GComponent)
{
GComponent com = btn_array[i] as GComponent;
// 如果是 view_container_parent，专门处理它的子节点
if (com.name == "view_container_parent")
{
Debug.Log($"TouchClickPoint 点击了组件 com.name: {com.name}");
var children = com.GetChildren();
Debug.Log($"TouchClickPoint 子组件数量: {children.Length}");
for (int k = children.Length - 1; k >= 0; k--)
{
if (children[k] is GComponent childCom)
{
// 检测子组件是否为箭头
Debug.Log($"TouchClickPoint childCom.name: {childCom.name}");
var childrens = childCom.GetChildren();
Debug.Log($"TouchClickPoint 子子组件数量: {childrens.Length}");
for (int l = childrens.Length - 1; l >= 0; l--)
{
if (childrens[l] is GComponent childComs)
{
if (childComs.name.StartsWith("Arrow_") &&
childComs.onStage && childComs.visible)
{
// 在检测逻辑中添加调试日志
Debug.Log($"箭头名称: {childComs.name}");
Debug.Log($"箭头局部坐标: {childComs.position}");
Debug.Log($"点击屏幕坐标: {fguiScreenPos}");
Debug.Log($"箭头尺寸: {childComs.width} x {childComs.height}");
Debug.Log($"TouchClickPoint childComs.name: {childComs.name}");
// 将箭头的局部坐标转换为屏幕坐标（考虑容器拖动和缩放）
Vector2 arrowScreenPos = childComs.LocalToGlobal(Vector2.zero);
Debug.Log($"箭头屏幕坐标: {arrowScreenPos}");
// 考虑缩放后的实际尺寸
float actualWidth = childComs.width * childComs.scaleX;
float actualHeight = childComs.height * childComs.scaleY;
// 中心点锚点的位置检测
if ((arrowScreenPos.x - actualWidth/2) <= fguiScreenPos.x &&
fguiScreenPos.x <= (arrowScreenPos.x + actualWidth/2) &&
(arrowScreenPos.y - actualHeight/2) <= fguiScreenPos.y &&
fguiScreenPos.y <= (arrowScreenPos.y + actualHeight/2)) {
Debug.Log("TouchClickPoint 点击了箭头: " + childComs.name);
childComs.DispatchEvent("OnClick");
goto EndLoop;
}
}
}
}
}
}
}
var child_btn_array = btn_array[i].asCom.GetChildren(); //嵌套的com
for (int j = child_btn_array.Length - 1; j >= 0; j--)
{
if (child_btn_array[j] is GButton)
{
Vector2 local_pos = new Vector2(btn_array[i].x + child_btn_array[j].x,
btn_array[i].y + child_btn_array[j].y);
if (child_btn_array[j].visible && child_btn_array[j].onStage && child_btn_array[j].visible && local_pos.x <= fguiScreenPos.x &&
fguiScreenPos.x <= local_pos.x + child_btn_array[j].width &&
local_pos.y <= fguiScreenPos.y && fguiScreenPos.y <=
local_pos.y + child_btn_array[j].height)
{
objUnderPoint = child_btn_array[j] as GButton;
if (objUnderPoint.enabled) objUnderPoint.FireClick(true, true);
else objUnderPoint.FireClick(true, false);
goto EndLoop;
}
}
}
}
}
}
if (child.name == "Popup" || child.name == "Highest")
{
goto EndLoop;
}
}
}
EndLoop: Debug.Log("");
if (click_card)
{
Debug.Log("TouchClickPoint === click_card");
if (orthoCamera == null) orthoCamera = GameObject.Find("GameCamera").GetComponent<Camera>();
Ray ray = orthoCamera.ScreenPointToRay(new Vector2(float.Parse(a[0]) * Screen.width, (1 - float.Parse(a[1])) * Screen.height));
RaycastHit hit;
int layerMask = 1 << 6;
if (Physics.Raycast(ray, out hit, Mathf.Infinity, layerMask))
{
GameDispatcher.Instance.Dispatch(GameMsg.card_click, hit.collider.gameObject.name);
}
}
}
}
public Camera orthoCamera;
public static Dictionary<string, string> adCallbackInfo = new Dictionary<string, string>();
public void SendH5Event(string numbers)
{
// adCallbackInfo.Clear();
// adCallbackInfo.Add("h5_revenue",ConfigSystem.GetConfig<CommonModel>().h5_refreshRevenue.ToString());
// //Debug.Log("sssssssssssssssssss"+JsonConvert.SerializeObject(adCallbackInfo));
// AppsFlyer.sendEvent("Growing_Total_01_002",adCallbackInfo);
}
public void RefreshUrl()
{
// if (gameUrlInfo == null) return;
//TODO: show invisible h5
var Dailyrefresh_reamain = 0;
var last_time = PlayerPrefs.GetInt("Dayreftimes", 0);
DateTime newDate = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
newDate = newDate.AddSeconds(GameHelper.GetNowTime());
var newDays = newDate.Day;
if (last_time == newDays)
{
Dailyrefresh_reamain = ConfigSystem.GetConfig<CommonModel>().Dailyrefreshtimes -
PlayerPrefs.GetInt("Dailyrefreshnum", 0);
}
else
{
PlayerPrefs.SetInt("Dailyrefreshnum", 0);
Dailyrefresh_reamain = ConfigSystem.GetConfig<CommonModel>().Dailyrefreshtimes;
PlayerPrefs.SetInt("Dayreftimes", newDays);
}
int dark_last_time = PlayerPrefs.GetInt("dark_refreshDay", 0);
DateTime dark_newDate = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
dark_newDate = dark_newDate.AddSeconds(GameHelper.GetNowTime());
var dark_newDays = dark_newDate.Day;
string darkWVDailyrefreshtimes_str = "";
if (SaveData.GetSaveObject().dark_Dayref == null)
{
SaveData.GetSaveObject().dark_Dayref = new List<int>() { 0, 0, 0, 0, 0, 0, 0, 0, 0 ,0,0};
}
if (dark_last_time == dark_newDays)
{
// dark_Dailyrefresh_reamain = ConfigSystem.GetConfig<CommonModel>().darkWVDailyrefreshtimes[Int32.Parse(webview_index) - 1] -
// PlayerPrefs.GetInt("dark_Dayref", 0);
// for (int i = 0; i < ConfigSystem.GetConfig<CommonModel>().darkWVDailyrefreshtimes.Length; i++)
// {
// if (i != 0) darkWVDailyrefreshtimes_str += "|";
// darkWVDailyrefreshtimes_str += ConfigSystem.GetConfig<CommonModel>().darkWVDailyrefreshtimes[i] - SaveData.GetSaveObject().dark_Dayref[i];
// }
int dark_type_ = -1;
for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++)
{
if (dark_type_ != ConfigSystem.dark_weblist[i].wvType)
{
dark_type_ = ConfigSystem.dark_weblist[i].wvType;
if (i != 0) darkWVDailyrefreshtimes_str += "|";
Debug.Log(dark_type_);
darkWVDailyrefreshtimes_str += ConfigSystem.dark_weblist[i].darkWVDailyrefreshtimes - SaveData.GetSaveObject().dark_Dayref[dark_type_ - 1];
}
}
}
else
{
// PlayerPrefs.SetInt("dark_Dayref", 0);
for (int i = 0; i < SaveData.GetSaveObject().dark_Dayref.Count; i++)
{
SaveData.GetSaveObject().dark_Dayref[i] = 0;
}
SaveData.saveDataFunc();
// dark_Dailyrefresh_reamain = ConfigSystem.GetConfig<CommonModel>().darkWVDailyrefreshtimes[Int32.Parse(webview_index)];
// for (int i = 0; i < ConfigSystem.GetConfig<CommonModel>().darkWVDailyrefreshtimes.Length; i++)
// {
// if (i != 0) darkWVDailyrefreshtimes_str += "|";
// darkWVDailyrefreshtimes_str += ConfigSystem.GetConfig<CommonModel>().darkWVDailyrefreshtimes[i];
// }
int dark_type_ = -1;
for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++)
{
if (dark_type_ != ConfigSystem.dark_weblist[i].wvType)
{
dark_type_ = ConfigSystem.dark_weblist[i].wvType;
if (i != 0) darkWVDailyrefreshtimes_str += "|";
darkWVDailyrefreshtimes_str += ConfigSystem.dark_weblist[i].darkWVDailyrefreshtimes;
}
}
PlayerPrefs.SetInt("dark_refreshDay", dark_newDays);
}
// var last_login_time = PlayerPrefs.GetInt("last_login_time", 0);//获取上次登录日期
// PlayerPrefs.SetInt("last_login_time", newDays);
string light_str = "";
string dark_str = "";
for (int i = 0; i < ConfigSystem.light_weblist.Count; i++)
{
int can_refresh_numbners = 0;
// if (last_login_time==newDays)
// {
// can_refresh_numbners=ConfigSystem.light_weblist[i].refreshMax- PlayerPrefs.GetInt(ConfigSystem.light_weblist[i].webLink, 0);
// if (can_refresh_numbners < 0) can_refresh_numbners = 0;
// }
// else
// {
can_refresh_numbners = ConfigSystem.light_weblist[i].refreshMax;
//if (can_refresh_numbners < 0) can_refresh_numbners = 9999999;
// PlayerPrefs.SetInt(ConfigSystem.light_weblist[i].webLink, 0);
// }
if (i != 0)
{
light_str += "|";
}
light_str += ConfigSystem.light_weblist[i].webLink + "#" + ConfigSystem.light_weblist[i].probability + "#" + can_refresh_numbners + "#" + ConfigSystem.light_weblist[i].darkWebTimesCT; ;
}
for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++)
{
int can_refresh_numbners = 0;
// if (last_login_time==newDays)
// {
// can_refresh_numbners=ConfigSystem.dark_weblist[i].refreshMax- PlayerPrefs.GetInt(ConfigSystem.dark_weblist[i].webLink, 0);
// if (can_refresh_numbners < 0) can_refresh_numbners = 0;
// }
// else
// {
can_refresh_numbners = ConfigSystem.dark_weblist[i].refreshMax;
//if (can_refresh_numbners < 0) can_refresh_numbners = 9999999;
// PlayerPrefs.SetInt(ConfigSystem.dark_weblist[i].webLink, 0);
// }
if (i != 0)
{
dark_str += "|";
}
dark_str += ConfigSystem.dark_weblist[i].webLink + "#" + ConfigSystem.dark_weblist[i].probability + "#" + can_refresh_numbners + "#" + ConfigSystem.dark_weblist[i].darkWebTimesCT + "#" + ConfigSystem.dark_weblist[i].wvType + "#" + ConfigSystem.dark_weblist[i].WVOffset ;
}
string darkWVRefreshtime_str = "";
// for (int i = 0; i < ConfigSystem.GetConfig<CommonModel>().darkWVRefreshtime.Length; i++)
// {
// if (i != 0) darkWVRefreshtime_str += "|";
// darkWVRefreshtime_str += ConfigSystem.GetConfig<CommonModel>().darkWVRefreshtime[i].ToString();
// }
// for (int i = 0; i < ConfigSystem.GetConfig<CommonModel>().darkWVRefreshtime2.Length; i++)
// {
// darkWVRefreshtime_str += "|";
// darkWVRefreshtime_str += ConfigSystem.GetConfig<CommonModel>().darkWVRefreshtime2[i].ToString();
// }
int dark_type = -1;
string add_time = "";
for (int i = 0; i < ConfigSystem.dark_weblist.Count; i++)
{
if (dark_type != ConfigSystem.dark_weblist[i].wvType)
{
if (i != 0)
{
darkWVRefreshtime_str += "|";
add_time += "|";
}
darkWVRefreshtime_str += ConfigSystem.dark_weblist[i].darkWVRefreshtime[0];
darkWVRefreshtime_str += "|";
darkWVRefreshtime_str += ConfigSystem.dark_weblist[i].darkWVRefreshtime[1];
dark_type = ConfigSystem.dark_weblist[i].wvType;
add_time += ConfigSystem.dark_weblist[i].WVClickAddTime;
}
}
Debug.Log("--------------------------------");
// add_time+= ConfigSystem.GetConfig<CommonModel>().WVClickAddTime[0] + "|" + ConfigSystem.GetConfig<CommonModel>().WVClickAddTime[1];
Debug.Log(add_time);
Debug.Log(darkWVRefreshtime_str);
Debug.Log(darkWVDailyrefreshtimes_str);
Debug.Log(dark_str);
Debug.Log(ConfigSystem.web_through_str);
WebviewManager.Instance.addH5Field(ConfigSystem.GetConfig<CommonModel>().flyCtRate, ConfigSystem.GetConfig<CommonModel>().otherH5switch,
ConfigSystem.GetConfig<CommonModel>().H5Refreshtime, Dailyrefresh_reamain, ConfigSystem.GetConfig<CommonModel>().darkThoughProbability
, darkWVRefreshtime_str, darkWVDailyrefreshtimes_str, dark_str, light_str, GameHelper.IsGiftSwitch(), ConfigSystem.web_through_str, add_time);
// WebviewManager.Instance.OpenWebView(gameUrlInfo.webLink);
//WebviewManager.Instance.setFlyCtRate(ConfigSystem.GetConfig<CommonModel>().flyCtRate);
// RefreshDataCT(isTop, gameUrlInfo);
}
public void ClickAdEvent(string ad_msg)
{
string[] temp_array = ad_msg.Split("|");
if (temp_array.Length >= 2 && temp_array[0] != null && temp_array[0] != "")
{
H5sendClass info = new H5sendClass() { link = temp_array[0], type = temp_array[1] };
// NetApi.SetClickAdEvent<object>(temp_array[0], temp_array[1], (isSuccess, obj) =>
// {
// // if (isSuccess)
// // {
// // Debug.Log("dadianchenggong" + temp_array[0]);
// // }
// });
}
}
public static bool haveSimCard = false;
public void diaoyongtest(string have)
{
if (have == "TRUE") haveSimCard = true;
}
}
public class H5refreshTimes
{
public string link;
public int times;
}
public class H5sendClass
{
public string link;
public string type;
}
}
Assets/Scripts/WebviewManager.cs.meta
-11
View File
@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: a70e3d36bc7e411458b991b090e147d5
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
ProjectSettings/ProjectSettings.asset
+1 -1
View File
@@ -163,7 +163,7 @@ PlayerSettings:
androidSupportedAspectRatio: 1 androidSupportedAspectRatio: 1
androidMaxAspectRatio: 2.1 androidMaxAspectRatio: 2.1
applicationIdentifier: applicationIdentifier:
Android: com.candydoggame.arrowgamebeattap Android: com.candydoggamegp.arrowgamebeattap
iPhone: com.matchgame.captaindicedubloons iPhone: com.matchgame.captaindicedubloons
buildNumber: buildNumber:
Standalone: 0 Standalone: 0