fix:1、添加h5.2、修复bug

This commit is contained in:
2026-06-25 14:22:52 +08:00
parent d2741d39be
commit 6ff428bdf2
18 changed files with 130 additions and 79 deletions
+3
View File
@@ -1,5 +1,6 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AApplication_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F37cc348edc804f4cb176b63962c716e7177200_003F1a_003Fb93f31c4_003FApplication_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ABehaviour_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F37cc348edc804f4cb176b63962c716e7177200_003Fc6_003Fc01cdc46_003FBehaviour_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AColorUtility_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F37cc348edc804f4cb176b63962c716e7177200_003Fc7_003Fbf270f3f_003FColorUtility_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5a41d6b7189842eca409fd0b1c3e3dcf17bf78_003F0b_003F65960d28_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADOTween_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2348fb5ecc9e4e689f37f7d7fadaea9a27a00_003F66_003F2140a9ad_003FDOTween_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -10,8 +11,10 @@
<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_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>
<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_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_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_003AWaitForSeconds_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F37cc348edc804f4cb176b63962c716e7177200_003Fdd_003F64399fa4_003FWaitForSeconds_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
@@ -91,6 +91,7 @@ namespace IgnoreOPS
public int[] WVOffset;
public string X_Redeemcode;
public string X_ShopURL;
public CommonModel(string key) : base(key)
@@ -31,6 +31,8 @@ namespace IgnoreOPS
public int Active_time;
public int Active_time_Down;
public int Active_Limit_times;
public string[] T_Redeemcode;
public string T_ShopURL;
}
public class MakeupModel_2 : ConfigModel<MakeupModel_2, Makeup_2>
@@ -63,5 +65,7 @@ namespace IgnoreOPS
public int Reset_time;
public float ADIncrease;
public int PayIncrease;
public string[] C_Redeemcode;
public string C_ShopURL;
}
}
+24 -19
View File
@@ -1340,7 +1340,7 @@ namespace ChillConnect
{
if (RainPlayUI == null)
{
RainPlayUI = GameObject.Find("(RainPlayUI)sheep_play");
RainPlayUI = GameObject.Find("(ArrowGameUI)com_arrow_game");
}
if (RainPlayUI != null)
@@ -1636,28 +1636,33 @@ namespace ChillConnect
// return true; //zhushi
return SaveData.GetSaveObject().ExchangeModeToggle == 1;
}
private static HashSet<string> generatedKeys = new HashSet<string>();
public static string GenerateUniqueKey()
// private static HashSet<string> generatedKeys = new HashSet<string>();
public static string GenerateUniqueKey(Makeup vo, int index)
{
const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
string key;
do
// 处理数组为空的边界情况
if (vo.T_Redeemcode == null || vo.T_Redeemcode.Length == 0)
{
StringBuilder sb = new StringBuilder();
return string.Empty;
}
sb.Append(GenerateRandomString(chars, 4));
sb.Append("-");
sb.Append(GenerateRandomString(chars, 6));
sb.Append("-");
sb.Append(GenerateRandomString(chars, 4));
key = sb.ToString();
} while (generatedKeys.Contains(key)); // 如果重复就重新生成
generatedKeys.Add(key); // 添加到集合中
return key;
// 如果 index 超出范围,取最后一个元素;否则直接返回对应索引的元素
int validIndex = index >= 0 && index < vo.T_Redeemcode.Length ? index : vo.T_Redeemcode.Length - 1;
return vo.T_Redeemcode[validIndex];
}
public static string GenerateUniqueKey1(Makeup_2 vo, int index)
{
// 处理数组为空的边界情况
if (vo.C_Redeemcode == null || vo.C_Redeemcode.Length == 0)
{
return string.Empty;
}
// 如果 index 超出范围,取最后一个元素;否则直接返回对应索引的元素
int validIndex = index >= 0 && index < vo.C_Redeemcode.Length ? index : vo.C_Redeemcode.Length - 1;
return vo.C_Redeemcode[validIndex];
}
static string GenerateRandomString(string charSet, int length)
{
StringBuilder sb = new StringBuilder();
+39 -1
View File
@@ -1,6 +1,7 @@
using DG.Tweening;
using IgnoreOPS;
using SGModule.Net;
using UNSDK;
namespace ChillConnect
{
@@ -33,7 +34,7 @@ namespace ChillConnect
public int enterHallTimes = 0;
public bool isShowRankView = false;
public event Action UpdateEvent;
private Camera _gameCamera;
// public int countTimes = 0;
@@ -44,6 +45,8 @@ namespace ChillConnect
GameDispatcher.Instance.AddListener(GameMsg.BackMainScene, EnterHall);
AppDispatcher.Instance.AddListener(MainThreadMsg.App_Focus_True, BackToGame);
CtrlDispatcher.Instance.AddListener(CtrlMsg.open_wb, OpenWb);
SetSoundVolume();
InitSystem();
}
@@ -165,6 +168,41 @@ namespace ChillConnect
}
private void OpenWb(object obj) {
if (obj is not SDKOpenConfig openConfig) return;
SdkConfigMgr.Instance.Open(openConfig.normal, openConfig.url);
SetCameraVisible(false);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open, false);
GameDispatcher.Instance.Dispatch(GameMsg.hideBroadCast);
}
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!");
}
GameHelper.ShowSheepPlayUI(visible);
}
#region
public void GetGalleryNet(int imageID, Action<bool> action = null)
+1 -1
View File
@@ -12,6 +12,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fb2c9d85afdd3d34c88a57c51b02fa84, type: 3}
m_Name: SdkConfigMgr
m_EditorClassIdentifier:
secret: KFG8KMWDJ
secret: JMXRDCA6Y
host:
isLog: 1
-47
View File
@@ -1198,52 +1198,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2110239011
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2110239013}
- component: {fileID: 2110239014}
m_Layer: 0
m_Name: WebviewManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2110239013
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2110239011}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
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!114 &2110239014
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2110239011}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7f3b9d6c409a4d71bcc6f0c3720f826d, type: 3}
m_Name:
m_EditorClassIdentifier:
select_glist_y: 0
orthoCamera: {fileID: 0}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
@@ -1261,6 +1215,5 @@ SceneRoots:
- {fileID: 782628377}
- {fileID: 1260515730}
- {fileID: 1183762477}
- {fileID: 2110239013}
- {fileID: 1361344199}
- {fileID: 1356900051}
+3
View File
@@ -4,6 +4,7 @@ using SGModule.MarkdownKit;
using SGModule.Net;
using SGModule.NetKit;
using UnityEngine;
using UNSDK;
public class ChillConnectRoot : MonoBehaviour
@@ -18,6 +19,8 @@ public class ChillConnectRoot : MonoBehaviour
// NetworkKit.Instance.InitData(ConfigManager.GameConfig.packageName, ConfigManager.GameConfig.isRelease);
SdkConfigMgr.Init();
MaxADKit.Init();
OnLauncher();
@@ -8,5 +8,8 @@ namespace ChillConnect
public static readonly uint Login_Succeed = ++Cursor_BASE;
public static readonly uint Game_StartReady = ++Cursor_BASE;
public static readonly uint Game_Start = ++Cursor_BASE;
public static readonly uint open_wb = ++Cursor_BASE;
}
}
@@ -112,7 +112,7 @@ namespace ChillConnect
{
uiInfo.packageName = "Arrow_game";
uiInfo.assetName = "com_arrow_game";
uiInfo.layerType = UILayerType.Popup;
uiInfo.layerType = UILayerType.Bottom;
uiInfo.isNeedOpenAnim = false;
uiInfo.isNeedCloseAnim = false;
uiInfo.isNeedUIMask = true;
+6
View File
@@ -4,6 +4,7 @@
using FGUI.ZM_H5_15;
using IgnoreOPS;
using SGModule.NetKit;
using UNSDK;
namespace ChillConnect
{
@@ -41,6 +42,11 @@ namespace ChillConnect
GameDispatcher.Instance.Dispatch(GameMsg.showBroadCast);
HallManager.Instance.SetCameraVisible(true);
SdkConfigMgr.Instance.Close();
}
protected override void OnBind()
@@ -11,6 +11,7 @@ using Newtonsoft.Json;
using SGModule.Net;
using SGModule.NetKit;
using UnityEngine;
using UNSDK;
using Random = UnityEngine.Random;
namespace ChillConnect
@@ -959,7 +960,7 @@ namespace ChillConnect
for (int j = 0; j < tickets[i]; j++)
{
makeupRdData data = new makeupRdData();
data.code = GameHelper.GenerateUniqueKey();
data.code = GameHelper.GenerateUniqueKey(vo, j);
data.coupon_mount = arr[i];
data.isClaimed = false;
makeupTaskData.rdData.Add(data);
@@ -1048,7 +1049,15 @@ namespace ChillConnect
ui.btn_contact_us.SetClick(() =>
{
GameHelper.OpenEmail();
// GameHelper.OpenEmail();
SDKOpenConfig openConfig = new SDKOpenConfig
{
normal = false,
url = vo.T_ShopURL
};
CtrlDispatcher.Instance.Dispatch(CtrlMsg.open_wb, openConfig);
CtrlCloseUI();
});
}
@@ -1,6 +1,7 @@
using FGUI.tixian;
using IgnoreOPS;
using UNSDK;
namespace ChillConnect
{
@@ -73,6 +74,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);
CtrlCloseUI();
});
ui.btn_close1.SetClick(CtrlCloseUI);
@@ -12,6 +12,7 @@ using SGModule.Net;
using SGModule.NetKit;
using Spine.Unity;
using UnityEngine;
using UNSDK;
using Random = UnityEngine.Random;
namespace ChillConnect
@@ -484,7 +485,7 @@ namespace ChillConnect
for (int j = 0; j < tickets[i]; j++)
{
SaveingPotRdData data = new SaveingPotRdData();
data.code = GameHelper.GenerateUniqueKey();
data.code = GameHelper.GenerateUniqueKey1(vo,i);
data.coupon_mount = arr[i];
data.isClaimed = false;
makeupTaskData.rdData.Add(data);
@@ -575,7 +576,15 @@ namespace ChillConnect
ui.btn_contact_us.SetClick(() =>
{
GameHelper.OpenEmail();
// GameHelper.OpenEmail();
SDKOpenConfig openConfig = new SDKOpenConfig
{
normal = false,
url = vo.C_ShopURL
};
CtrlDispatcher.Instance.Dispatch(CtrlMsg.open_wb, openConfig);
CtrlCloseUI();
});
}
+13 -4
View File
@@ -1,5 +1,6 @@
using System.Collections;
using System.Collections.Generic;
using Newtonsoft.Json;
using Uni2SDK;
using UnityEngine;
using UnityEngine.Serialization;
@@ -30,9 +31,9 @@ namespace UNSDK
public static void Init(string packageName = "")
{
var package = "com.wackyllamagame.chaos";//StringExtensions.IsNullOrWhiteSpace(packageName) ? Application.identifier: packageName;
var package = StringExtensions.IsNullOrWhiteSpace(packageName) ? Application.identifier: packageName;
Uni2SDKManager.Instance.SetPackage(package);
Uni2SDKManager.Instance.SetPackage("com.wackyllamagame.chaos",package);
Uni2SDKManager.Instance.SetLog(Instance.isLog);
@@ -58,13 +59,21 @@ namespace UNSDK
/// 开启有感
/// 开启时:需要将其他游戏界面等隐藏,注意,是隐藏,不是在其界面上再添加一个界面
/// </summary>
public void Open()
public void Open(bool normal = true, string url = "")
{
#if !UNITY_EDITOR
Uni2SDKManager.Instance.Open(0,164,0,0);
Uni2SDKManager.Instance.Open(0,164,0,0,normal,url);
#endif
}
}
public class SDKOpenConfig
{
[JsonProperty("normal")]
public bool normal;
[JsonProperty("url")]
public string url;
}
}
Binary file not shown.