From 685f7f07f885daf0dae6ffa382039a0a97b179f1 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 03 十二月 2025 18:10:44 +0800
Subject: [PATCH] 0312 sdk恢复逻辑
---
Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs | 14 ++
Main/System/Setting/QuickSetting.cs | 2
Main/SDK/SDKUtils.cs | 279 +++++++++++++++++++++++++++----------------------------
3 files changed, 152 insertions(+), 143 deletions(-)
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs
index e4a2ded..d0b878b 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs
@@ -42,6 +42,19 @@
//}
GetCreateRoleAward();
+
+
+ if (QuickSetting.Instance.GetQuickSettingValue<int>(QuickSettingType.CreateRole, 0) == 0)
+ {
+ QuickSetting.Instance.SetQuickSetting(QuickSettingType.CreateRole, 1);
+ QuickSetting.Instance.SendPackage();
+ SDKUtils.Instance.CreateRoleOk(PlayerDatas.Instance.PlayerId.ToString(),
+ PlayerDatas.Instance.baseData.PlayerName.Trim().Replace("\0", ""),
+ TimeUtility.CreateSeconds.ToString());
+ }
+
+ SDKUtils.Instance.RoleLogin();
+
}
void GetCreateRoleAward()
@@ -52,6 +65,7 @@
pack.RewardType = 32;
GameNetSystem.Instance.SendInfo(pack);
}
+
}
}
diff --git a/Main/SDK/SDKUtils.cs b/Main/SDK/SDKUtils.cs
index cc798b7..ad07492 100644
--- a/Main/SDK/SDKUtils.cs
+++ b/Main/SDK/SDKUtils.cs
@@ -581,7 +581,6 @@
{
onFreePlatformPayOk();
}
- //SnxxzGame.Instance.StartCoroutine(DelayQueryRecharge());
break;
case CodeA2U.FreePlatformPayFail:
if (onFreePlatformPayFail != null)
@@ -605,11 +604,11 @@
break;
}
case CodeA2U.ExitGame:
- if (ChannelPlatform == E_ChannelPlatform.Free)
- {
- // WindowCenter.Instance.Open<ExitGameWin>();
- }
- else
+ // if (ChannelPlatform == E_ChannelPlatform.Free)
+ // {
+ // // WindowCenter.Instance.Open<ExitGameWin>();
+ // }
+ // else
{
//榛樿閮芥槸閫�鍑烘父鎴�
Application.Quit();
@@ -948,13 +947,7 @@
private Dictionary<string, string> m_PaymentTable = new Dictionary<string, string>();
private string m_EncodeKey = "03sujm7gerywdvyd5vkkk772rs4by230";
- //private IEnumerator DelayQueryRecharge()
- //{
- // yield return WaitingForSecondConst.WaitMS3000;
- // var _package = new CA806_tagCMQueryRecharge();
- // GameNetSystem.Instance.SendInfo(_package);
- //}
/// <summary>
/// 鑷敱SDK鏀粯 fixed sdk 鏀粯閫昏緫淇敼
@@ -1014,60 +1007,60 @@
public void FreePlatformPayEx(string title, float money, string cpInfo)
{
-// OrderInfoConfig orderInfo = null;
-// VipModel vipModel = ModelCenter.Instance.GetModel<VipModel>();
-// if (vipModel.orderInfoToCTGID.ContainsKey(cpInfo) && vipModel.orderInfoToCTGID[cpInfo] != 0)
-// {
-// vipModel.TryGetOrderInfo(vipModel.orderInfoToCTGID[cpInfo], out orderInfo);
-// }
-// else
-// {
-// var keys = OrderInfoConfig.GetKeys();
-// for (int i = 0; i < keys.Count; i++)
-// {
-// orderInfo = OrderInfoConfig.Get(keys[i]);
-// if (orderInfo != null && orderInfo.OrderInfo == cpInfo)
-// {
-// break;
-// }
-// }
-// }
-// //#if !(UNITY_IOS || UNITY_IPHONE)
-// // string storeOrderInfo = orderInfo.StoreOrderInfo;
-// //#else
-// // string storeOrderInfo = orderInfo.StoreOrderInfo2;
-// //#endif
+ OrderInfoConfig orderInfo = null;
+ var vipModel = RechargeManager.Instance;
+ if (vipModel.orderInfoToCTGID.ContainsKey(cpInfo) && vipModel.orderInfoToCTGID[cpInfo] != 0)
+ {
+ vipModel.TryGetOrderInfo(vipModel.orderInfoToCTGID[cpInfo], out orderInfo);
+ }
+ else
+ {
+ var keys = OrderInfoConfig.GetKeys();
+ for (int i = 0; i < keys.Count; i++)
+ {
+ orderInfo = OrderInfoConfig.Get(keys[i]);
+ if (orderInfo != null && orderInfo.OrderInfo == cpInfo)
+ {
+ break;
+ }
+ }
+ }
+//#if !(UNITY_IOS || UNITY_IPHONE)
+// string storeOrderInfo = orderInfo.StoreOrderInfo;
+//#else
+// string storeOrderInfo = orderInfo.StoreOrderInfo2;
+//#endif
-// #if UNITY_EDITOR
-// Debug.LogFormat("鍏呭��: {0}-{1}-{2}", title, money, cpInfo);
-// return;
-// #endif
+#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"] = 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();
-// #if UNITY_IOS
-// m_Json["identifier"] = VersionConfig.Get().bundleIdentifier;
-// #endif
-// SendMessageToSDK(m_Json);
+#if UNITY_IOS
+ m_Json["identifier"] = VersionConfig.Get().bundleIdentifier;
+#endif
+ SendMessageToSDK(m_Json);
}
@@ -1122,54 +1115,54 @@
private void BuildFreePlatformInfo(JsonData json)
{
- // if (FreePlatformInfo == null)
- // {
- // FreePlatformInfo = new FP_LoginOk();
- // }
+ if (FreePlatformInfo == null)
+ {
+ FreePlatformInfo = new FP_LoginOk();
+ }
- // IDictionary _iDict = json as IDictionary;
+ IDictionary _iDict = json as IDictionary;
- // if (_iDict.Contains("token"))
- // {
- // FreePlatformInfo.token = json["token"].ToString();
- // }
- // if (_iDict.Contains("token_expire"))
- // {
- // FreePlatformInfo.tokenExpire = json["token_expire"].ToString();
- // }
- // else
- // {
- // FreePlatformInfo.tokenExpire = "";
- // }
- // if (_iDict.Contains("account"))
- // {
- // FreePlatformInfo.account = json["account"].ToString();
- // }
+ if (_iDict.Contains("token"))
+ {
+ FreePlatformInfo.token = json["token"].ToString();
+ }
+ if (_iDict.Contains("token_expire"))
+ {
+ FreePlatformInfo.tokenExpire = json["token_expire"].ToString();
+ }
+ else
+ {
+ FreePlatformInfo.tokenExpire = "";
+ }
+ if (_iDict.Contains("account"))
+ {
+ FreePlatformInfo.account = json["account"].ToString();
+ }
- // if (_iDict.Contains("account_id"))
- // {
- // int.TryParse(json["account_id"].ToString(), out FreePlatformInfo.accountID);
- // }
+ if (_iDict.Contains("account_id"))
+ {
+ int.TryParse(json["account_id"].ToString(), out FreePlatformInfo.accountID);
+ }
- // if (_iDict.Contains("session_id"))
- // {
- // FreePlatformInfo.sessionID = (string)json["session_id"];
- // }
+ if (_iDict.Contains("session_id"))
+ {
+ FreePlatformInfo.sessionID = (string)json["session_id"];
+ }
- // if (_iDict.Contains("game_id"))
- // {
- // FreePlatformInfo.gameId = (string)json["game_id"];
- // }
+ if (_iDict.Contains("game_id"))
+ {
+ FreePlatformInfo.gameId = (string)json["game_id"];
+ }
- // if (_iDict.Contains("timeStamp"))
- // {
- // FreePlatformInfo.timeStamp = (string)json["timeStamp"];
- // }
- // if (_iDict.Contains("userName"))
- // {
- // FreePlatformInfo.qkUserName = json["userName"].ToString();
- // }
- // FreePlatformInfo.phone = 0;
+ if (_iDict.Contains("timeStamp"))
+ {
+ FreePlatformInfo.timeStamp = (string)json["timeStamp"];
+ }
+ if (_iDict.Contains("userName"))
+ {
+ FreePlatformInfo.qkUserName = json["userName"].ToString();
+ }
+ FreePlatformInfo.phone = 0;
}
private void HandleFreePlatformRegisteOk(JsonData json)
@@ -1179,13 +1172,13 @@
private void HandleFreePlatformLoginOk(JsonData data)
{
- // BuildFreePlatformInfo(data);
+ BuildFreePlatformInfo(data);
- // Debug.LogFormat("sdk鐧诲綍鎴愬姛锛歿0}", data.ToJson());
- // if (onFreePlatformLoginOk != null)
- // {
- // onFreePlatformLoginOk(FreePlatformInfo);
- // }
+ Debug.LogFormat("sdk鐧诲綍鎴愬姛锛歿0}", data.ToJson());
+ if (onFreePlatformLoginOk != null)
+ {
+ onFreePlatformLoginOk(FreePlatformInfo);
+ }
}
@@ -1245,23 +1238,23 @@
public void CreateRoleOk(string roleID, string roleName, string time)
{
- // m_Json.Clear();
- // m_Json["code"] = CodeU2A.CreateRole;
+ 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"] = 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);
}
public void DownloadStart()
@@ -1282,23 +1275,23 @@
public void RoleLogin()
{
- // m_Json.Clear();
- // m_Json["code"] = CodeU2A.RoleLogin;
+ 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"] = 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);
}
public void RoleLevelUp()
diff --git a/Main/System/Setting/QuickSetting.cs b/Main/System/Setting/QuickSetting.cs
index 12dd103..e5031fe 100644
--- a/Main/System/Setting/QuickSetting.cs
+++ b/Main/System/Setting/QuickSetting.cs
@@ -20,6 +20,7 @@
quickSettingDic.Add(QuickSettingType.AutoGoldRush, new QuickSettingRange(QuickSettingType.AutoGoldRush, 4, 10, 1)); //鑷姩娣橀噾锛�9涓墿鍝佸�硷紝1涓嚜鍔ㄥ埛鏂板紑鍏�
quickSettingDic.Add(QuickSettingType.BattleSpeed, new QuickSettingRange(QuickSettingType.BattleSpeed, 14, 1));
quickSettingDic.Add(QuickSettingType.HeroCountLock, new QuickSettingRange(QuickSettingType.HeroCountLock, 15, 2));
+ quickSettingDic.Add(QuickSettingType.CreateRole, new QuickSettingRange(QuickSettingType.CreateRole, 17, 1));
setting = new string(UCharacter, 100);
DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += BeforePlayerDataInitializeEvent;
@@ -165,6 +166,7 @@
AutoGoldRush, //鑷姩娣橀噾
BattleSpeed, //鎴樻枟閫熷害绱㈠紩 闈炰富绾块儴鍒�
HeroCountLock, //涓婇樀浜烘暟鏉′欢閿佸畾
+ CreateRole, //鍒涘缓瑙掕壊鎴愬姛
}
public class QuickSettingRange
--
Gitblit v1.8.0