From 1ab047b5fdd933c38ba0519ec2e83a44512ea8d7 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 17:46:11 +0800
Subject: [PATCH] webgl代码合并 1
---
Main/SDK/SDKUtils.cs | 303 ++++++++++++++++++++++++++++----------------------
1 files changed, 169 insertions(+), 134 deletions(-)
diff --git a/Main/SDK/SDKUtils.cs b/Main/SDK/SDKUtils.cs
index 8ba419a..533ee09 100644
--- a/Main/SDK/SDKUtils.cs
+++ b/Main/SDK/SDKUtils.cs
@@ -5,6 +5,7 @@
using System.Collections.Generic;
using System.IO;
using System;
+using Cysharp.Threading.Tasks;
public class SDKUtils : SingletonMonobehaviour<SDKUtils>
@@ -165,7 +166,7 @@
}
else
{
- builtinAssetCopyFinished = VersionConfig.Get().version == builtinAssetsCopyFinishVersion;
+ builtinAssetCopyFinished = VersionConfig.config.version == builtinAssetsCopyFinishVersion;
}
#endif
#if UNITY_IOS || UNITY_STANDALONE
@@ -176,7 +177,7 @@
}
else
{
- builtinAssetCopyFinished = VersionConfig.Get().version == builtinAssetsCopyFinishVersion;
+ builtinAssetCopyFinished = VersionConfig.config.version == builtinAssetsCopyFinishVersion;
}
var assetsCopyFinishVersion = LocalSave.GetString("AssetCopyCompleted_IOSorStandalone");
@@ -186,19 +187,27 @@
}
else
{
- AssetCopyFinished = VersionConfig.Get().version == assetsCopyFinishVersion;
+ AssetCopyFinished = VersionConfig.config.version == assetsCopyFinishVersion;
}
#elif UNITY_ANDROID
SyncClientPackageID();
#endif
- InitFinished = false;
- m_Json.Clear();
- m_Json["code"] = CodeU2A.Init;
- m_Json["appID"] = VersionConfig.Get().appId;
- m_Json["gameID"] = VersionConfig.Get().gameId;
- SendMessageToSDK(m_Json);
+ if (Application.platform == RuntimePlatform.WebGLPlayer)
+ {
+ // WebGL 鏃犲師鐢� SDK 鍥炶皟锛岀洿鎺ユ爣璁板畬鎴�
+ InitFinished = true;
+ }
+ else
+ {
+ InitFinished = false;
+ m_Json.Clear();
+ m_Json["code"] = CodeU2A.Init;
+ m_Json["appID"] = VersionConfig.config.appId;
+ m_Json["gameID"] = VersionConfig.config.gameId;
+ SendMessageToSDK(m_Json);
+ }
#endif
StartCoroutine("ProcessNetworkStatus");
}
@@ -320,10 +329,13 @@
public void SyncClientPackageID()
{
#if UNITY_ANDROID
- m_Json.Clear();
- m_Json["code"] = CodeU2A.ClientPackage;
- m_Json["clientPkgID"] = VersionConfig.Get().clientPackageFlag;
- SendMessageToSDK(m_Json);
+ VersionConfig.GetAsync().ContinueWith(config =>
+ {
+ m_Json.Clear();
+ m_Json["code"] = CodeU2A.ClientPackage;
+ m_Json["clientPkgID"] = config.clientPackageFlag;
+ SendMessageToSDK(m_Json);
+ }).Forget();
#endif
}
@@ -968,38 +980,44 @@
}
+
if (!isBuyGameCash && gameCash >= money * 100)
{
+ VersionConfig.GetAsync().ContinueWith(config =>
+ {
+ UIManager.Instance.CloseWindow<GotoChargeWin>();
- UIManager.Instance.CloseWindow<GotoChargeWin>();
- if (DayRemind.Instance.GetDayRemind(DayRemind.DJQTip))
- {
- var pack = new CA125_tagCMCoinBuyOrderInfo();
- pack.AppID = VersionConfig.Get().appId;
- pack.AppIDLen = (byte)pack.AppID.Length;
- pack.OrderInfo = cpInfo;
- pack.OrderInfoLen = (byte)pack.OrderInfo.Length;
- GameNetSystem.Instance.SendInfo(pack);
- }
- else
- {
- ConfirmCancel.ShowPopConfirm(
- Language.Get("Mail101"),
- Language.Get("GameCashRule1", money, title),
- (bool isOk) =>
- {
- if (isOk)
+
+ if (DayRemind.Instance.GetDayRemind(DayRemind.DJQTip))
+ {
+ var pack = new CA125_tagCMCoinBuyOrderInfo();
+ pack.AppID = config.appId;
+ pack.AppIDLen = (byte)pack.AppID.Length;
+ pack.OrderInfo = cpInfo;
+ pack.OrderInfoLen = (byte)pack.OrderInfo.Length;
+ GameNetSystem.Instance.SendInfo(pack);
+ }
+ else
+ {
+ ConfirmCancel.ShowPopConfirm(
+ Language.Get("Mail101"),
+ Language.Get("GameCashRule1", money, title),
+ (bool isOk) =>
{
- var pack = new CA125_tagCMCoinBuyOrderInfo();
- pack.AppID = VersionConfig.Get().appId;
- pack.AppIDLen = (byte)pack.AppID.Length;
- pack.OrderInfo = cpInfo;
- pack.OrderInfoLen = (byte)pack.OrderInfo.Length;
- GameNetSystem.Instance.SendInfo(pack);
- }
+ if (isOk)
+ {
+ var pack = new CA125_tagCMCoinBuyOrderInfo();
+ pack.AppID = config.appId;
+ pack.AppIDLen = (byte)pack.AppID.Length;
+ pack.OrderInfo = cpInfo;
+ pack.OrderInfoLen = (byte)pack.OrderInfo.Length;
+ GameNetSystem.Instance.SendInfo(pack);
+ }
- });
- }
+ });
+ }
+ }).Forget();
+
}
else
{
@@ -1033,36 +1051,41 @@
// string storeOrderInfo = orderInfo.StoreOrderInfo2;
//#endif
-#if UNITY_EDITOR
- Debug.LogFormat("鍏呭��: {0}-{1}-{2}", title, money, cpInfo);
- return;
-#endif
+ VersionConfig.GetAsync().ContinueWith(config =>
+ {
+ #if UNITY_EDITOR
+ Debug.LogFormat("鍏呭��: {0}-{1}-{2}", title, money, cpInfo);
+ return;
+ #endif
- m_Json.Clear();
- m_Json["code"] = CodeU2A.FreePlatformPay;
- m_Json["orderId"] = DateTime.Now.ToString("yyyyMMddHHmmss") + UnityEngine.Random.Range(100000, 999999).ToString();
- m_Json["mount"] = money.ToString();
- m_Json["cpInfo"] = cpInfo;
- //m_Json["storeOrderInfo"] = storeOrderInfo;
- m_Json["title"] = title;
- m_Json["roleID"] = PlayerDatas.Instance.baseData.PlayerID;
- m_Json["roleName"] = PlayerDatas.Instance.baseData.PlayerName;
- m_Json["level"] = PlayerDatas.Instance.baseData.LV.ToString();
- m_Json["sid"] = ServerListCenter.Instance.currentServer.region_flag;
- m_Json["serverName"] = ServerListCenter.Instance.currentServer.name;
- m_Json["familyName"] = PlayerDatas.Instance.baseData.FamilyName;
- m_Json["job"] = PlayerDatas.Instance.baseData.Job.ToString();
- m_Json["money"] = PlayerDatas.Instance.baseData.diamond.ToString();
- m_Json["gameName"] = VersionConfig.Get().productName;
- m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
- m_Json["createTime"] = TimeUtility.CreateSeconds.ToString();
- m_Json["familyID"] = PlayerDatas.Instance.baseData.FamilyId.ToString();
- m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
+ m_Json.Clear();
+ m_Json["code"] = CodeU2A.FreePlatformPay;
+ m_Json["orderId"] = DateTime.Now.ToString("yyyyMMddHHmmss") + UnityEngine.Random.Range(100000, 999999).ToString();
+ m_Json["mount"] = money.ToString();
+ m_Json["cpInfo"] = cpInfo;
+ //m_Json["storeOrderInfo"] = storeOrderInfo;
+ m_Json["title"] = title;
+ m_Json["roleID"] = PlayerDatas.Instance.baseData.PlayerID;
+ m_Json["roleName"] = PlayerDatas.Instance.baseData.PlayerName;
+ m_Json["level"] = PlayerDatas.Instance.baseData.LV.ToString();
+ m_Json["sid"] = ServerListCenter.Instance.currentServer.region_flag;
+ m_Json["serverName"] = ServerListCenter.Instance.currentServer.name;
+ m_Json["familyName"] = PlayerDatas.Instance.baseData.FamilyName;
+ m_Json["job"] = PlayerDatas.Instance.baseData.Job.ToString();
+ m_Json["money"] = PlayerDatas.Instance.baseData.diamond.ToString();
+ m_Json["gameName"] = config.productName;
+ m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
+ m_Json["createTime"] = TimeUtility.CreateSeconds.ToString();
+ m_Json["familyID"] = PlayerDatas.Instance.baseData.FamilyId.ToString();
+ m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
-#if UNITY_IOS
- m_Json["identifier"] = VersionConfig.Get().bundleIdentifier;
-#endif
- SendMessageToSDK(m_Json);
+ #if UNITY_IOS
+ m_Json["identifier"] = config.bundleIdentifier;
+ #endif
+ SendMessageToSDK(m_Json);
+ }).Forget();
+
+
}
@@ -1240,23 +1263,26 @@
public void CreateRoleOk(string roleID, string roleName, string time)
{
- m_Json.Clear();
- m_Json["code"] = CodeU2A.CreateRole;
+ VersionConfig.GetAsync().ContinueWith(config =>
+ {
+ m_Json.Clear();
+ m_Json["code"] = CodeU2A.CreateRole;
- m_Json["roleID"] = roleID;
- m_Json["roleName"] = roleName;
- m_Json["sid"] = ServerListCenter.Instance.currentServer.region_flag;
- m_Json["serverName"] = ServerListCenter.Instance.currentServer.name;
- m_Json["familyName"] = PlayerDatas.Instance.baseData.FamilyName;
- m_Json["level"] = "1";
- m_Json["job"] = PlayerDatas.Instance.baseData.Job.ToString();
- m_Json["money"] = PlayerDatas.Instance.baseData.diamond.ToString();
- m_Json["gameName"] = VersionConfig.Get().productName;
- m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
- m_Json["createTime"] = time;
- m_Json["familyID"] = PlayerDatas.Instance.baseData.FamilyId.ToString();
- m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
- SendMessageToSDK(m_Json);
+ m_Json["roleID"] = roleID;
+ m_Json["roleName"] = roleName;
+ m_Json["sid"] = ServerListCenter.Instance.currentServer.region_flag;
+ m_Json["serverName"] = ServerListCenter.Instance.currentServer.name;
+ m_Json["familyName"] = PlayerDatas.Instance.baseData.FamilyName;
+ m_Json["level"] = "1";
+ m_Json["job"] = PlayerDatas.Instance.baseData.Job.ToString();
+ m_Json["money"] = PlayerDatas.Instance.baseData.diamond.ToString();
+ m_Json["gameName"] = config.productName;
+ m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
+ m_Json["createTime"] = time;
+ m_Json["familyID"] = PlayerDatas.Instance.baseData.FamilyId.ToString();
+ m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
+ SendMessageToSDK(m_Json);
+ }).Forget();
}
public void DownloadStart()
@@ -1277,45 +1303,51 @@
public void RoleLogin()
{
- m_Json.Clear();
- m_Json["code"] = CodeU2A.RoleLogin;
+ VersionConfig.GetAsync().ContinueWith(config =>
+ {
+ m_Json.Clear();
+ m_Json["code"] = CodeU2A.RoleLogin;
- m_Json["roleID"] = PlayerDatas.Instance.baseData.PlayerID.ToString();
- m_Json["roleName"] = PlayerDatas.Instance.baseData.PlayerName;
- m_Json["sid"] = ServerListCenter.Instance.currentServer.region_flag;
- m_Json["serverName"] = ServerListCenter.Instance.currentServer.name;
- m_Json["familyName"] = PlayerDatas.Instance.baseData.FamilyName;
- m_Json["level"] = PlayerDatas.Instance.baseData.LV;
- m_Json["job"] = PlayerDatas.Instance.baseData.Job.ToString();
- m_Json["money"] = PlayerDatas.Instance.baseData.diamond.ToString();
- m_Json["gameName"] = VersionConfig.Get().productName;
- m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
- m_Json["createTime"] = TimeUtility.CreateSeconds.ToString();
- m_Json["familyID"] = PlayerDatas.Instance.baseData.FamilyId.ToString();
- m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
- SendMessageToSDK(m_Json);
+ m_Json["roleID"] = PlayerDatas.Instance.baseData.PlayerID.ToString();
+ m_Json["roleName"] = PlayerDatas.Instance.baseData.PlayerName;
+ m_Json["sid"] = ServerListCenter.Instance.currentServer.region_flag;
+ m_Json["serverName"] = ServerListCenter.Instance.currentServer.name;
+ m_Json["familyName"] = PlayerDatas.Instance.baseData.FamilyName;
+ m_Json["level"] = PlayerDatas.Instance.baseData.LV;
+ m_Json["job"] = PlayerDatas.Instance.baseData.Job.ToString();
+ m_Json["money"] = PlayerDatas.Instance.baseData.diamond.ToString();
+ m_Json["gameName"] = config.productName;
+ m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
+ m_Json["createTime"] = TimeUtility.CreateSeconds.ToString();
+ m_Json["familyID"] = PlayerDatas.Instance.baseData.FamilyId.ToString();
+ m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
+ SendMessageToSDK(m_Json);
+ }).Forget();
}
public void RoleLevelUp()
{
- m_Json.Clear();
- m_Json["code"] = CodeU2A.RoleLevelUp;
+ VersionConfig.GetAsync().ContinueWith(config =>
+ {
+ m_Json.Clear();
+ m_Json["code"] = CodeU2A.RoleLevelUp;
- m_Json["roleID"] = PlayerDatas.Instance.PlayerId.ToString();
- m_Json["roleName"] = PlayerDatas.Instance.baseData.PlayerName;
- m_Json["sid"] = ServerListCenter.Instance.currentServer.region_flag;
- m_Json["serverName"] = ServerListCenter.Instance.currentServer.name;
- m_Json["familyName"] = PlayerDatas.Instance.baseData.FamilyName;
- m_Json["level"] = PlayerDatas.Instance.baseData.LV;
- m_Json["job"] = PlayerDatas.Instance.baseData.Job.ToString();
- m_Json["money"] = PlayerDatas.Instance.baseData.diamond.ToString();
- m_Json["gameName"] = VersionConfig.Get().productName;
- m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
- m_Json["levelUpTime"] = TimeUtility.AllSeconds.ToString();
- m_Json["createTime"] = TimeUtility.CreateSeconds.ToString();
- m_Json["familyID"] = PlayerDatas.Instance.baseData.FamilyId.ToString();
- m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
- SendMessageToSDK(m_Json);
+ m_Json["roleID"] = PlayerDatas.Instance.PlayerId.ToString();
+ m_Json["roleName"] = PlayerDatas.Instance.baseData.PlayerName;
+ m_Json["sid"] = ServerListCenter.Instance.currentServer.region_flag;
+ m_Json["serverName"] = ServerListCenter.Instance.currentServer.name;
+ m_Json["familyName"] = PlayerDatas.Instance.baseData.FamilyName;
+ m_Json["level"] = PlayerDatas.Instance.baseData.LV;
+ m_Json["job"] = PlayerDatas.Instance.baseData.Job.ToString();
+ m_Json["money"] = PlayerDatas.Instance.baseData.diamond.ToString();
+ m_Json["gameName"] = config.productName;
+ m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
+ m_Json["levelUpTime"] = TimeUtility.AllSeconds.ToString();
+ m_Json["createTime"] = TimeUtility.CreateSeconds.ToString();
+ m_Json["familyID"] = PlayerDatas.Instance.baseData.FamilyId.ToString();
+ m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
+ SendMessageToSDK(m_Json);
+ }).Forget();
}
@@ -1327,24 +1359,27 @@
if (!DTC0403_tagPlayerLoginLoadOK.finishedLogin)
return;
- m_Json.Clear();
- m_Json["code"] = CodeU2A.RoleLoginOut;
+ VersionConfig.GetAsync().ContinueWith(config =>
+ {
+ m_Json.Clear();
+ m_Json["code"] = CodeU2A.RoleLoginOut;
- m_Json["roleID"] = PlayerDatas.Instance.PlayerId.ToString();
- m_Json["roleName"] = PlayerDatas.Instance.baseData.PlayerName;
- m_Json["sid"] = ServerListCenter.Instance.currentServer.region_flag;
- m_Json["serverName"] = ServerListCenter.Instance.currentServer.name;
- m_Json["familyName"] = PlayerDatas.Instance.baseData.FamilyName;
- m_Json["level"] = PlayerDatas.Instance.baseData.LV;
- m_Json["job"] = PlayerDatas.Instance.baseData.Job.ToString();
- m_Json["money"] = PlayerDatas.Instance.baseData.diamond.ToString();
- m_Json["gameName"] = VersionConfig.Get().productName;
- m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
- m_Json["levelUpTime"] = TimeUtility.AllSeconds.ToString();
- m_Json["createTime"] = TimeUtility.CreateSeconds.ToString();
- m_Json["familyID"] = PlayerDatas.Instance.baseData.FamilyId.ToString();
- m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
- SendMessageToSDK(m_Json);
+ m_Json["roleID"] = PlayerDatas.Instance.PlayerId.ToString();
+ m_Json["roleName"] = PlayerDatas.Instance.baseData.PlayerName;
+ m_Json["sid"] = ServerListCenter.Instance.currentServer.region_flag;
+ m_Json["serverName"] = ServerListCenter.Instance.currentServer.name;
+ m_Json["familyName"] = PlayerDatas.Instance.baseData.FamilyName;
+ m_Json["level"] = PlayerDatas.Instance.baseData.LV;
+ m_Json["job"] = PlayerDatas.Instance.baseData.Job.ToString();
+ m_Json["money"] = PlayerDatas.Instance.baseData.diamond.ToString();
+ m_Json["gameName"] = config.productName;
+ m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
+ m_Json["levelUpTime"] = TimeUtility.AllSeconds.ToString();
+ m_Json["createTime"] = TimeUtility.CreateSeconds.ToString();
+ m_Json["familyID"] = PlayerDatas.Instance.baseData.FamilyId.ToString();
+ m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
+ SendMessageToSDK(m_Json);
+ }).Forget();
}
public void GotoFansHouse()
--
Gitblit v1.8.0