tron_wz/RedHotRoast-ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：1、删除部分不用的资源代码。2、a面修复bug

Browse Source
This commit is contained in:
barry
2026-04-28 18:42:00 +08:00
parent 70d45d4705
commit cc12dffbaa
417 changed files with 36736 additions and 40575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/ModuleUI/Hall/HallUI.cs
+18 -18
View File
@@ -12,7 +12,7 @@ using SGModule.Common.Extensions;
using SGModule.Common.Helper;
using FGUI.ZM_Lobby_03;
using System.Net;
using SGModule.ApplePay;
// using SGModule.ApplePay;
using SGModule.Net;
using System.IO;
using System.Linq;
@@ -406,7 +406,7 @@ namespace RedHotRoast
}
}
}
checkThreeGift();
// checkThreeGift();
var head = ui.btn_head as btn_head;
if (head != null)
{
@@ -594,22 +594,22 @@ namespace RedHotRoast
ui.btn_task.SetClick(() => { OnClickTask(false); });
ui.btn_restore.SetClick(() =>
{
ApplePayManager.Instance.AppleRestore((success, message) =>
{
Debug.Log($"[barry] restore success message: {message}---- {JsonConvert.SerializeObject(message)}");
if (success)
{
Debug.Log("[barry] restore success: " + success);
GameHelper.ShowTips("Restore_pur", true);
SaveData.GetSaveObject().have_slot = success;
DataMgr.VipLevel.Value = 3;
DataMgr.VipExpirationTime.Value = ServerClock.GetCurrentServerTime() + 7 * 24 * 60 * 60;
}
else
{
GameHelper.ShowTips("recoverable_tips", true);
}
});
// ApplePayManager.Instance.AppleRestore((success, message) =>
// {
// Debug.Log($"[barry] restore success message: {message}---- {JsonConvert.SerializeObject(message)}");
// if (success)
// {
// Debug.Log("[barry] restore success: " + success);
// GameHelper.ShowTips("Restore_pur", true);
// SaveData.GetSaveObject().have_slot = success;
// DataMgr.VipLevel.Value = 3;
// DataMgr.VipExpirationTime.Value = ServerClock.GetCurrentServerTime() + 7 * 24 * 60 * 60;
// }
// else
// {
// GameHelper.ShowTips("recoverable_tips", true);
// }
// });
});
Debug.Log(JsonConvert.SerializeObject(ConfigSystem.GetConfig<ApplePay>()));
Assets/Scripts/ModuleUI/Menu/MenuUI.cs
+19 -19
View File
@@ -1,6 +1,6 @@
using FGUI.ZM_Common_01;
using FGUI.ZM_Setting_07;
using SGModule.ApplePay;
// using SGModule.ApplePay;
using SGModule.Common.Extensions;
using SGModule.Net;
@@ -65,7 +65,7 @@ namespace RedHotRoast
ui.com_gold.y += Screen.safeArea.y;
}
ui.gift_switch.selectedIndex = GameHelper.IsGiftSwitch() ? 1 : 0;
ui.gift_switch.selectedIndex = 1;
total_item = 8;
selectIndex = DataMgr.PlayerAvatarId.Value;
@@ -138,26 +138,26 @@ namespace RedHotRoast
// ui.btn_credits.menus.selectedIndex = btn_menu.Menus_credits;
ui.btn_privacy.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PrivacyUI_Open, 0); });
ui.btn_terms.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PrivacyUI_Open, 1); });
ui.btn_official.SetClick(() => { OpenBrowser.OpenURL("https://www.frozenarena.top/"); });
ui.btn_official.SetClick(() => { OpenBrowser.OpenURL("https://reddhotcompangost.com/"); });
ui.btn_us.SetClick(() => { GameHelper.OpenEmail(); });
// ui.btn_credits.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PrivacyUI_Open, 2); });
ui.btn_restore.SetClick(() =>
{
ApplePayManager.Instance.AppleRestore((success, message) =>
{
if (success)
{
Debug.Log("[barry] restore success: " + success);
GameHelper.ShowTips("Restore_pur", true);
SaveData.GetSaveObject().have_slot = success;
DataMgr.VipLevel.Value = 3;
DataMgr.VipExpirationTime.Value = ServerClock.GetCurrentServerTime() + 7 * 24 * 60 * 60;
}
else
{
GameHelper.ShowTips("recoverable_tips", true);
}
});
// ApplePayManager.Instance.AppleRestore((success, message) =>
// {
// if (success)
// {
// Debug.Log("[barry] restore success: " + success);
// GameHelper.ShowTips("Restore_pur", true);
// SaveData.GetSaveObject().have_slot = success;
// DataMgr.VipLevel.Value = 3;
// DataMgr.VipExpirationTime.Value = ServerClock.GetCurrentServerTime() + 7 * 24 * 60 * 60;
// }
// else
// {
// GameHelper.ShowTips("recoverable_tips", true);
// }
// });
});
ui.btn_language.SetClick(() => {
@@ -177,7 +177,7 @@ namespace RedHotRoast
if (!SaveData.GetSaveObject().is_get_removead && random_ < GameHelper.GetCommonModel().HomeInterstitialAd)
{
//GameHelper.ShowInterstitial("BackHall");
uiCtrlDispatcher.Dispatch(UICtrlMsg.AdcomingUI_Open);
// uiCtrlDispatcher.Dispatch(UICtrlMsg.AdcomingUI_Open);
}
}
Assets/Scripts/ModuleUI/OpenBg/OpenBgUI.cs
+5
View File
@@ -1,6 +1,7 @@
using System;
using FairyGUI;
using Spine.Unity;
using UnityEngine;
namespace RedHotRoast
@@ -61,6 +62,10 @@ namespace RedHotRoast
protected override void OnOpenBefore(object args)
{
if (Screen.safeArea.y != 0)
{
ui.img_icon.y += Screen.safeArea.y;
}
var sk = FXManager.Instance.SetFx<SkeletonAnimation>(ui.bg_parent, Fx_Type.fx_login, ref closeCallback);
sk.state.SetAnimation(0, "animation", true);
}
Assets/Scripts/ModuleUI/OpenGame/OpenGameUI.cs
+1 -1
View File
@@ -105,7 +105,7 @@ namespace RedHotRoast
ui.text_level.text = stage;
DOVirtual.DelayedCall(0.7f, () =>
DOVirtual.DelayedCall(1.5f, () =>
{
// ui.tips_node1.visible = true;
// var open_bg = FXManager.Instance.SetFx<SkeletonAnimation>(ui.tips_node1, Fx_Type.fx_open_bg, ref closeCallback);
Assets/Scripts/ModuleUI/Play/RainPlayUI.cs
+1 -1
View File
@@ -263,7 +263,7 @@ namespace RedHotRoast
if (!SaveData.GetSaveObject().is_get_removead && random_ < GameHelper.GetCommonModel().HomeInterstitialAd)
{
//GameHelper.ShowInterstitial("BackHall");
uiCtrlDispatcher.Dispatch(UICtrlMsg.AdcomingUI_Open);
// uiCtrlDispatcher.Dispatch(UICtrlMsg.AdcomingUI_Open);
}
}
Assets/Scripts/ModuleUI/Privacy/PrivacyUI.cs
+30 -30
View File
@@ -77,37 +77,37 @@ namespace RedHotRoast
ui.title.text = isTerm == 2 ? "View Credits" : title;
var color = new Color(172 / 255f, 131 / 255f, 113 / 255f, 1f);
MarkdownKit.Instance.ShowAsRichText(ui.text_list, BisTerm ? "user" : "privacy", color, (success, state) => {
if (success) {
Debug.Log("内容加载成功！当前状态：" + state);
}
else {
Debug.LogError("内容加载失败！当前状态：" + state);
}
}, 44);
// LoadKit.Instance.LoadAsset<TextAsset>("TextAsset", BisTerm ? "Term" : "Privacy", (txt) =>
// {
// content = txt.text;
//
// var str = getstr(content, 16327);
//
// foreach (var t in str)
// {
// var aRichTextField = new GRichTextField();
// aRichTextField.SetSize(GRoot.inst.width, 100);
// aRichTextField.color = new Color(0.64f, 0.36f, 0.12f, 1f);
// // aRichTextField.strokeColor = Color.black;
// // aRichTextField.stroke = 1;
// aRichTextField.textFormat.size = 44;
// aRichTextField.autoSize = AutoSizeType.Height;
// aRichTextField.AddRelation(GRoot.inst, RelationType.Width);
// aRichTextField.text = t;
// ui.text_list.AddChild(aRichTextField);
// MarkdownKit.Instance.ShowAsRichText(ui.text_list, BisTerm ? "user" : "privacy", color, (success, state) => {
// if (success) {
// Debug.Log("内容加载成功！当前状态：" + state);
// }
//
// ui.text_list.EnsureBoundsCorrect();
// });
// else {
// Debug.LogError("内容加载失败！当前状态：" + state);
// }
// }, 44);
LoadKit.Instance.LoadAsset<TextAsset>("TextAsset", BisTerm ? "Term" : "Privacy", (txt) =>
{
content = txt.text;
var str = getstr(content, 16327);
foreach (var t in str)
{
var aRichTextField = new GRichTextField();
aRichTextField.SetSize(GRoot.inst.width, 100);
aRichTextField.color = new Color(172 / 255f, 131 / 255f, 113 / 255f, 1f);
// aRichTextField.strokeColor = Color.black;
// aRichTextField.stroke = 1;
aRichTextField.textFormat.size = 42;
aRichTextField.autoSize = AutoSizeType.Height;
aRichTextField.AddRelation(GRoot.inst, RelationType.Width);
aRichTextField.text = t;
ui.text_list.AddChild(aRichTextField);
}
ui.text_list.EnsureBoundsCorrect();
});
ui.btn_close.SetClick(CtrlCloseUI);
}
Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs
+3 -1
View File
@@ -151,7 +151,7 @@ namespace RedHotRoast
isToday = GameHelper.InToday(DataMgr.SignState.Value[signDays - 1], 0, true);
// ui.btn_collect.state.selectedIndex = index == signDays && !(signDays > 0 && isToday)? 0 : 1;
ui.btn_collect.state.selectedIndex = 1;
if (index < signDays)
{
@@ -159,6 +159,7 @@ namespace RedHotRoast
}
else if (index == signDays)
{
ui.btn_collect.state.selectedIndex = 1;
if (signDays > 0 && isToday)
{
@@ -168,6 +169,7 @@ namespace RedHotRoast
{
btnSign.state.selectedIndex = 1;
ui.btn_collect.state.selectedIndex = 0;
btnSign.isCloseClickAnim = true;
// btnSign.status.selectedIndex = btn_sign.State_today;
Assets/Scripts/ModuleUI/VipClubView/VipClubViewUI.cs
+19 -19
View File
@@ -7,7 +7,7 @@ using SGModule.Common.Helper;
using SGModule.NetKit;
using SGModule.MarkdownKit;
using Newtonsoft.Json;
using SGModule.ApplePay;
// using SGModule.ApplePay;
using SGModule.Net;
using System.Linq;
using SGModule.Common.Extensions;
@@ -221,24 +221,24 @@ namespace RedHotRoast
ui.btn_restore.visible = !GameHelper.IsGiftSwitch();
ui.btn_restore.SetClick(() =>
{
ApplePayManager.Instance.AppleRestore((success, message) =>
{
Debug.Log($"[barry] restore success message: {message}---- {JsonConvert.SerializeObject(message)}");
if (success)
{
Debug.Log("[barry] restore success: " + success);
GameHelper.ShowTips("Restore_pur", true);
SaveData.GetSaveObject().have_slot = success;
DataMgr.VipLevel.Value = 3;
DataMgr.VipExpirationTime.Value = ServerClock.GetCurrentServerTime() + 7 * 24 * 60 * 60;
InitView();
}
else
{
GameHelper.ShowTips("recoverable_tips", true);
}
});
// ApplePayManager.Instance.AppleRestore((success, message) =>
// {
// Debug.Log($"[barry] restore success message: {message}---- {JsonConvert.SerializeObject(message)}");
// if (success)
// {
// Debug.Log("[barry] restore success: " + success);
// GameHelper.ShowTips("Restore_pur", true);
// SaveData.GetSaveObject().have_slot = success;
// DataMgr.VipLevel.Value = 3;
// DataMgr.VipExpirationTime.Value = ServerClock.GetCurrentServerTime() + 7 * 24 * 60 * 60;
//
// InitView();
// }
// else
// {
// GameHelper.ShowTips("recoverable_tips", true);
// }
// });
});
SetSubBtnState(_level, (int)VipDay.Year);