From 3b2a6bb9047cfce9f501593b3669a9c1af6c5df4 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期三, 05 十一月 2025 17:40:23 +0800
Subject: [PATCH] 130 战斗修改回合样式
---
Main/SDK/SDKUtils.cs | 484 ++++++++++++++++++++++++++---------------------------
1 files changed, 235 insertions(+), 249 deletions(-)
diff --git a/Main/SDK/SDKUtils.cs b/Main/SDK/SDKUtils.cs
index 40480ca..5b80525 100644
--- a/Main/SDK/SDKUtils.cs
+++ b/Main/SDK/SDKUtils.cs
@@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.IO;
using System;
-using UnityEngine.Android;
+
public class SDKUtils : SingletonMonobehaviour<SDKUtils>
{
@@ -128,6 +128,7 @@
public void Init()
{
+ ynmbxxjUtil.Instance.Init(); // sdk涓存椂鐢紝鍚庣画鏂板仛SDK鍚庡垹闄�
Device = new DeviceInfo();
string uid = LocalSave.GetString("Device_uniqueID");
//Debug.Log(Math.Abs(System.Environment.TickCount));
@@ -374,7 +375,7 @@
var _result = "default";
switch (Application.platform)
{
- case RuntimePlatform.Android:
+ case RuntimePlatform.Android:
_result = "android";
break;
case RuntimePlatform.IPhonePlayer:
@@ -406,211 +407,200 @@
public void HandleMsgWithSDK(string jsonString)
{
-// Debug.Log("鏀跺埌SDK鍙戞潵鐨勪俊鎭�: " + jsonString);
-// var _json = JsonMapper.ToObject(jsonString);
-// var _code = (int)_json["code"];
-// switch (_code)
-// {
-// case CodeA2U.DeviceInfo:
+ Debug.Log("鏀跺埌SDK鍙戞潵鐨勪俊鎭�: " + jsonString);
+ var _json = JsonMapper.ToObject(jsonString);
+ var _code = (int)_json["code"];
+ switch (_code)
+ {
+ case CodeA2U.DeviceInfo:
-// //Device.uniqueID = _json["unique_id"].ToString();
-// Device.androidID = _json["android_id"].ToString();// ios骞冲彴涓嬩负idfa
-// Device.userAgent = _json["userAgent"].ToString();
-// #if UNITY_ANDROID
-// Device.macAddress = _json["mac"].ToString();
-// if (_json["imei"] != null)
-// {
-// Device.imei = _json["imei"].ToString();
-// }
-// else
-// {
-// Device.imei = Device.uniqueID;
-// }
-// Device.totalMemory = (int)_json["memoryTotal"];
-// #endif
-// if (OnDeviceInfoChanged != null)
-// {
-// OnDeviceInfoChanged(Device);
-// }
+ //Device.uniqueID = _json["unique_id"].ToString();
+ Device.androidID = _json["android_id"].ToString();// ios骞冲彴涓嬩负idfa
+ Device.userAgent = _json["userAgent"].ToString();
+#if UNITY_ANDROID
+ Device.macAddress = _json["mac"].ToString();
+ if (_json["imei"] != null)
+ {
+ Device.imei = _json["imei"].ToString();
+ }
+ else
+ {
+ Device.imei = Device.uniqueID;
+ }
+ Device.totalMemory = (int)_json["memoryTotal"];
+#endif
+ if (OnDeviceInfoChanged != null)
+ {
+ OnDeviceInfoChanged(Device);
+ }
-// break;
-// case CodeA2U.AssetCopyFinished:
-// AssetCopyFinished = true;
-// break;
-// case CodeA2U.BatteryLevel:
+ break;
+ case CodeA2U.AssetCopyFinished:
+ AssetCopyFinished = true;
+ break;
+ case CodeA2U.BatteryLevel:
-// BatteryLevel = (int)_json["level"];
-// if (OnBatteryLevelChanged != null)
-// {
-// OnBatteryLevelChanged(BatteryLevel);
-// }
+ BatteryLevel = (int)_json["level"];
+ if (OnBatteryLevelChanged != null)
+ {
+ OnBatteryLevelChanged(BatteryLevel);
+ }
-// break;
-// case CodeA2U.BatteryCharging:
+ break;
+ case CodeA2U.BatteryCharging:
-// ChargingType = (E_ChargingType)((int)_json["status"]);
-// if (OnChargingTypeChanged != null)
-// {
-// OnChargingTypeChanged(ChargingType);
-// }
+ ChargingType = (E_ChargingType)((int)_json["status"]);
+ if (OnChargingTypeChanged != null)
+ {
+ OnChargingTypeChanged(ChargingType);
+ }
-// break;
-// case CodeA2U.SdkInitComplete:
-// InitFinished = true;
-// var _dict = _json as IDictionary;
-// if (_dict != null && _dict.Contains("channelPlatform"))
-// {
-// var _channelPlatform = _json["channelPlatform"].ToString();
-// if (!string.IsNullOrEmpty(_channelPlatform))
-// {
-// if (_channelPlatform.Equals("hygame"))
-// {
-// ChannelPlatform = E_ChannelPlatform.Hy;
-// }
-// else if (_channelPlatform.Equals("quick"))
-// {
-// ChannelPlatform = E_ChannelPlatform.Quick;
-// }
-// else if (_channelPlatform.Equals("hyyn"))
-// {
-// ChannelPlatform = E_ChannelPlatform.newyn;
-// }
-// else if (_channelPlatform.Equals("hygtgame"))
-// {
-// ChannelPlatform = E_ChannelPlatform.hygt;
-// }
-// else if (_channelPlatform.Equals("hyenglish"))
-// {
-// ChannelPlatform = E_ChannelPlatform.en;
-// }
-// }
-// }
+ break;
+ case CodeA2U.SdkInitComplete:
+ InitFinished = true;
+ var _dict = _json as IDictionary;
+ if (_dict != null && _dict.Contains("channelPlatform"))
+ {
+ var _channelPlatform = _json["channelPlatform"].ToString();
+ if (!string.IsNullOrEmpty(_channelPlatform))
+ {
+ if (_channelPlatform.Equals("hygame"))
+ {
+ ChannelPlatform = E_ChannelPlatform.Hy;
+ }
+ else if (_channelPlatform.Equals("quick"))
+ {
+ ChannelPlatform = E_ChannelPlatform.Quick;
+ }
+
+ }
+ }
-// //Sdk 鍙兘浼氫慨鏀规笭閬撲俊鎭紝鎵�浠ラ渶瑕侀噸鏂拌幏鍙�
-// if (_dict.Contains("yj_appid"))
-// {
-// Yj_AppID = _json["yj_appid"].ToString();
-// }
+ //Sdk 鍙兘浼氫慨鏀规笭閬撲俊鎭紝鎵�浠ラ渶瑕侀噸鏂拌幏鍙�
+ if (_dict.Contains("yj_appid"))
+ {
+ Yj_AppID = _json["yj_appid"].ToString();
+ }
-// if (_dict.Contains("yj_spid"))
-// {
-// Yj_SpID = _json["yj_spid"].ToString();
-// }
+ if (_dict.Contains("yj_spid"))
+ {
+ Yj_SpID = _json["yj_spid"].ToString();
+ }
-// if (_dict.Contains("banhao"))
-// {
-// Yj_BanHao = _json["banhao"].ToString();
-// }
+ if (_dict.Contains("banhao"))
+ {
+ Yj_BanHao = _json["banhao"].ToString();
+ }
-// break;
-// case CodeA2U.PushClientID:
-// RegistrationID = _json["clientID"].ToString();
-// break;
-// case CodeA2U.ExternalStorage:
-// DeviceRootPath = _json["path"].ToString();
-// break;
-// case CodeA2U.PermissionCallBack:
-// {
-// var state = (int)_json["state"];
-// var permission = (string)_json["permission"];
-// onPermissionCallBack?.Invoke(permission, state);
-// onPermissionCallBack = null;
-// break;
-// }
-// case CodeA2U.FreePlatformInitOk:
+ break;
+ case CodeA2U.PushClientID:
+ RegistrationID = _json["clientID"].ToString();
+ break;
+ case CodeA2U.ExternalStorage:
+ DeviceRootPath = _json["path"].ToString();
+ break;
+ case CodeA2U.PermissionCallBack:
+ {
+ var state = (int)_json["state"];
+ var permission = (string)_json["permission"];
+ onPermissionCallBack?.Invoke(permission, state);
+ onPermissionCallBack = null;
+ break;
+ }
+ case CodeA2U.FreePlatformInitOk:
-// if (onFreePlatformInitOk != null)
-// {
-// onFreePlatformInitOk();
-// }
+ if (onFreePlatformInitOk != null)
+ {
+ onFreePlatformInitOk();
+ }
-// break;
-// case CodeA2U.FreePlatformInitFail:
-// if (onFreePlatformInitFail != null)
-// {
-// onFreePlatformInitFail();
-// }
-// break;
-// case CodeA2U.FreePlatformRegisterOk:
-// // HandleFreePlatformRegisteOk(_json);
-// OperationLogCollect.Instance.RecordEvent(5);
-// var values = new JsonData();
-// if (_json.Keys.Contains("reg_type"))
-// values["af_registration_method"] = _json["reg_type"];
-// break;
-// case CodeA2U.FreePlatformLoginOk:
-// HandleFreePlatformLoginOk(_json["info"]);
-// OperationLogCollect.Instance.RecordEvent(6);
-// break;
-// case CodeA2U.FreePlatformLoginFail:
-// if (onFreePlatformLoginFail != null)
-// {
-// onFreePlatformLoginFail();
-// }
-// break;
-// case CodeA2U.FreePlatformLogoutOk:
-// if (onFreePlatformLogoutOk != null)
-// {
-// onFreePlatformLogoutOk();
-// }
-// FreePlatformInfo = null;
-// break;
-// case CodeA2U.FreePlatformSwitchAccountOk:
-// BuildFreePlatformInfo(_json["info"]);
-// if (onFreePlatformLogoutOk != null)
-// {
-// onFreePlatformLogoutOk();
-// }
-// FreePlatformInfo = null;
-// break;
-// case CodeA2U.FreePlatformLogoutFail:
-// if (onFreePlatformLogoutFail != null)
-// {
-// onFreePlatformLogoutFail();
-// }
-// break;
-// case CodeA2U.FreePlatformPayOk:
-// if (onFreePlatformPayOk != null)
-// {
-// onFreePlatformPayOk();
-// }
-// //SnxxzGame.Instance.StartCoroutine(DelayQueryRecharge());
-// break;
-// case CodeA2U.FreePlatformPayFail:
-// if (onFreePlatformPayFail != null)
-// {
-// onFreePlatformPayFail();
-// }
-// break;
-// case CodeA2U.FreePlatformPayCancel:
-// if (onFreePlatformPayCancel != null)
-// {
-// onFreePlatformPayCancel();
-// }
-// break;
-// case CodeA2U.ShareCallBack:
-// {
-// var state = int.Parse(_json["state"].ToString());
-// if (state == CallBackState.Success)
-// LocalSave.SetInt("ShareToFBDay" + PlayerDatas.Instance.baseData.PlayerID, TimeUtility.ServerNow.DayOfYear);
+ break;
+ case CodeA2U.FreePlatformInitFail:
+ if (onFreePlatformInitFail != null)
+ {
+ onFreePlatformInitFail();
+ }
+ break;
+ case CodeA2U.FreePlatformRegisterOk:
+ // HandleFreePlatformRegisteOk(_json);
+ // OperationLogCollect.Instance.RecordEvent(5);
+ var values = new JsonData();
+ if (_json.Keys.Contains("reg_type"))
+ values["af_registration_method"] = _json["reg_type"];
+ break;
+ case CodeA2U.FreePlatformLoginOk:
+ HandleFreePlatformLoginOk(_json["info"]);
+ // OperationLogCollect.Instance.RecordEvent(6);
+ break;
+ case CodeA2U.FreePlatformLoginFail:
+ if (onFreePlatformLoginFail != null)
+ {
+ onFreePlatformLoginFail();
+ }
+ break;
+ case CodeA2U.FreePlatformLogoutOk:
+ if (onFreePlatformLogoutOk != null)
+ {
+ onFreePlatformLogoutOk();
+ }
+ FreePlatformInfo = null;
+ break;
+ case CodeA2U.FreePlatformSwitchAccountOk:
+ BuildFreePlatformInfo(_json["info"]);
+ if (onFreePlatformLogoutOk != null)
+ {
+ onFreePlatformLogoutOk();
+ }
+ FreePlatformInfo = null;
+ break;
+ case CodeA2U.FreePlatformLogoutFail:
+ if (onFreePlatformLogoutFail != null)
+ {
+ onFreePlatformLogoutFail();
+ }
+ break;
+ case CodeA2U.FreePlatformPayOk:
+ if (onFreePlatformPayOk != null)
+ {
+ onFreePlatformPayOk();
+ }
+ //SnxxzGame.Instance.StartCoroutine(DelayQueryRecharge());
+ break;
+ case CodeA2U.FreePlatformPayFail:
+ if (onFreePlatformPayFail != null)
+ {
+ onFreePlatformPayFail();
+ }
+ break;
+ case CodeA2U.FreePlatformPayCancel:
+ if (onFreePlatformPayCancel != null)
+ {
+ onFreePlatformPayCancel();
+ }
+ break;
+ case CodeA2U.ShareCallBack:
+ {
+ var state = int.Parse(_json["state"].ToString());
+ if (state == CallBackState.Success)
+ LocalSave.SetInt("ShareToFBDay" + PlayerDatas.Instance.baseData.PlayerID, TimeUtility.ServerNow.DayOfYear);
-// onShareFBResult?.Invoke();
-// break;
-// }
-// case CodeA2U.ExitGame:
-// if (ChannelPlatform == E_ChannelPlatform.Free)
-// {
-// vnxbqy.UI.WindowCenter.Instance.Open<vnxbqy.UI.ExitGameWin>();
-// }
-// else
-// {
-// //榛樿閮芥槸閫�鍑烘父鎴�
-// Application.Quit();
-// }
-// break;
-// }
-// onSdkMsg?.Invoke(_code, _json);
+ onShareFBResult?.Invoke();
+ break;
+ }
+ case CodeA2U.ExitGame:
+ if (ChannelPlatform == E_ChannelPlatform.Free)
+ {
+ // WindowCenter.Instance.Open<ExitGameWin>();
+ }
+ else
+ {
+ //榛樿閮芥槸閫�鍑烘父鎴�
+ Application.Quit();
+ }
+ break;
+ }
+ onSdkMsg?.Invoke(_code, _json);
}
#endregion
@@ -910,10 +900,7 @@
m_Json.Clear();
m_Json["code"] = CodeU2A.FreePlatformLogout;
SendMessageToSDK(m_Json);
- if (ChannelPlatform == E_ChannelPlatform.Yl)
- {
- FreePlatformLogin();
- }
+ // FreePlatformLogin();
#endif
}
public void ShowAccountView()
@@ -922,10 +909,9 @@
m_Json.Clear();
m_Json["code"] = CodeU2A.ShowAccountView;
SendMessageToSDK(m_Json);
- if (ChannelPlatform == E_ChannelPlatform.Yl)
- {
- FreePlatformLogin();
- }
+
+ // FreePlatformLogin();
+
#endif
}
public void FreePlatformSwitchAccount()
@@ -955,53 +941,53 @@
public void FreePlatformPay(string title, float money, string cpInfo)
{
// 鎻愮ず鏄惁浣跨敤浠ｉ噾鍒�
- // var gameCash = UIHelper.GetAllVourcher();
+ var gameCash = UIHelper.GetAllVourcher();
- // bool isBuyGameCash = false; //浠ｉ噾鍒告湰韬殑鍏呭�间笉鑳界敤浠ｉ噾鍒歌喘涔� 閫犳垚寰幆
- // int ctgID = ModelCenter.Instance.GetModel<VipModel>().orderInfoToCTGID[cpInfo];
- // if (ctgID != 0)
- // {
- // isBuyGameCash = CTGConfig.Get(ctgID).PayType == 17;
- // }
+ bool isBuyGameCash = false; //浠ｉ噾鍒告湰韬殑鍏呭�间笉鑳界敤浠ｉ噾鍒歌喘涔� 閫犳垚寰幆
+ int ctgID = RechargeManager.Instance.orderInfoToCTGID[cpInfo];
+ if (ctgID != 0)
+ {
+ isBuyGameCash = CTGConfig.Get(ctgID).PayType == 17;
+ }
- // if (!isBuyGameCash && gameCash >= money * 100 && !LoginAwardModel.rechargeLimit.Contains(ctgID))
- // {
+ if (!isBuyGameCash && gameCash >= money * 100)
+ {
- // WindowCenter.Instance.Close<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.ToggleConfirmCancel(Language.Get("Mail101"), Language.Get("GameCashRule1", money), Language.Get("TodayNoNotify"), (bool isOk, bool isToggle) =>
- // {
- // if (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 (isToggle)
- // {
- // DayRemind.Instance.SetDayRemind(DayRemind.DJQTip, true);
- // }
- // });
- // }
- // }
- // else
- // {
- // FreePlatformPayEx(title, money, cpInfo);
- // }
+ 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.ToggleConfirmCancel(Language.Get("Mail101"), Language.Get("GameCashRule1", money), Language.Get("TodayNoNotify"), (bool isOk, bool isToggle) =>
+ {
+ if (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 (isToggle)
+ {
+ DayRemind.Instance.SetDayRemind(DayRemind.DJQTip, true);
+ }
+ });
+ }
+ }
+ else
+ {
+ FreePlatformPayEx(title, money, cpInfo);
+ }
}
public void FreePlatformPayEx(string title, float money, string cpInfo)
@@ -1054,7 +1040,7 @@
// 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.FightPoint.ToString();
+// m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
// #if UNITY_IOS
// m_Json["identifier"] = VersionConfig.Get().bundleIdentifier;
@@ -1252,7 +1238,7 @@
// 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.FightPoint.ToString();
+ // m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
// SendMessageToSDK(m_Json);
}
@@ -1289,7 +1275,7 @@
// 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.FightPoint.ToString();
+ // m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
// SendMessageToSDK(m_Json);
}
@@ -1311,7 +1297,7 @@
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.FightPoint.ToString();
+ m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
SendMessageToSDK(m_Json);
}
@@ -1340,7 +1326,7 @@
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.FightPoint.ToString();
+ m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
SendMessageToSDK(m_Json);
}
--
Gitblit v1.8.0