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

fix：1、修复bug。2、添加音效

Browse Source
This commit is contained in:
barry
2026-07-15 14:42:52 +08:00
parent 5ba85e6778
commit 2934687ce0
16 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/RedHotRoast/FGUI/package/ZM_Common_01/com_broadcast_text1.cs
+3 -3
View File
@@ -23,9 +23,9 @@ namespace FGUI.ZM_Common_01
base.ConstructFromXML(xml); base.ConstructFromXML(xml);
bg_panel = (GGraph)GetChildAt(0); bg_panel = (GGraph)GetChildAt(0);
cast_text = (GRichTextField)GetChildAt(1); cast_text = (GRichTextField)GetChildAt(2);
hide_text = (GRichTextField)GetChildAt(2); hide_text = (GRichTextField)GetChildAt(3);
btn_broad = (GButton)GetChildAt(3); btn_broad = (GButton)GetChildAt(4);
} }
} }
} }
Assets/RedHotRoast/Helper/GameHelper.cs
+5 -4
View File
@@ -1219,7 +1219,7 @@ namespace RedHotRoast
if (IsGiftSwitch()) if (IsGiftSwitch())
{ {
DataMgr.GetFirstReaward.Value = true; DataMgr.GetFirstReaward.Value = true;
var awardNum = ConfigSystem.GetCommonConf().InitialNum; var awardNum = ConfigSystem.GetCommonConf().InitialNum * GetExchangeRateMulti();
addMoney(awardNum); addMoney(awardNum);
GameDispatcher.Instance.Dispatch(GameMsg.Update102); GameDispatcher.Instance.Dispatch(GameMsg.Update102);
@@ -1854,16 +1854,17 @@ namespace RedHotRoast
public static string getChString(decimal ch) public static string getChString(decimal ch)
{ {
var exchangeRateVo = GetExchangeRateVo();
ch = (decimal)exchangeRateVo.Multi * ch;
if (isRDExchangeMode() && IsGiftSwitch()) if (isRDExchangeMode() && IsGiftSwitch())
{ {
var exchangeRateVo = GetExchangeRateVo();
ch = (decimal)exchangeRateVo.Multi * ch;
string str = "<img src='ui://o9974uc5m39de3q'/>"; string str = "<img src='ui://o9974uc5m39de3q'/>";
return str + $"{exchangeRateVo.Payicon}{ch:N}"; return str + $"{exchangeRateVo.Payicon}{ch:N}";
} }
else else
{ {
return $"{exchangeRateVo.Currency}{ch:N}"; return $"{ch:N}";
} }
} }
public static string getTrackEvenName() public static string getTrackEvenName()
Assets/Resources/RedHotRoastAssets/FGUI/LG_Common_fui.bytes
BIN
View File
Binary file not shown.
Assets/Resources/RedHotRoastAssets/FGUI/ZM_Common_01_atlas0.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 MiB

After

Width:  |  Height:  |  Size: 1.5 MiB

Assets/Resources/RedHotRoastAssets/FGUI/ZM_Common_01_fui.bytes
BIN
View File
Binary file not shown.
Assets/Resources/RedHotRoastAssets/FGUI/ZM_Petty_fui.bytes
BIN
View File
Binary file not shown.
Assets/Resources/RedHotRoastAssets/FGUI/ZM_Privacy_24_fui.bytes
BIN
View File
Binary file not shown.
Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs
+2
View File
@@ -1474,6 +1474,8 @@ namespace RedHotRoast
Debug.Log($"[arrow] {clickArrow.id}正在移动，请勿点击其他箭头"); Debug.Log($"[arrow] {clickArrow.id}正在移动，请勿点击其他箭头");
return; return;
} }
AudioManager.Instance.PlayDynamicEffect(AudioConst.UIButtonDefault);
TriggerVibration(true); TriggerVibration(true);
Assets/Scripts/ModuleUI/Hall/HallUI.cs
+2 -2
View File
@@ -542,13 +542,13 @@ namespace RedHotRoast
} }
else else
{ {
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open); // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
} }
} }
} }
else else
{ {
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open); // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
} }
}); });
Assets/Scripts/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs
+3 -3
View File
@@ -216,7 +216,7 @@ namespace RedHotRoast
Debug.Log(ConfigSystem.GetCommonConf().ExpiryUnlock); Debug.Log(ConfigSystem.GetCommonConf().ExpiryUnlock);
str = $"{makeupTaskData.LvVideoCount}/{ConfigSystem.GetCommonConf().ExpiryUnlock}"; str = $"{makeupTaskData.LvVideoCount}/{ConfigSystem.GetCommonConf().ExpiryUnlock}";
ui.lab_ads.text = Language.GetContentParams("owner_ad", str); ui.lab_ads.text = Language.GetContentParams("owner_ad", str);
ui.text_nowch.text = GameHelper.Get102Str(DataMgr.Ticket.Value); ui.text_nowch.text = DataMgr.Ticket.Value.ToString();
ui.text_ch_title.text = Language.GetContentParams("need_lv_text", vo.levels_need); ui.text_ch_title.text = Language.GetContentParams("need_lv_text", vo.levels_need);
if (GameHelper.IsGiftSwitch() && ConfigSystem.GetCommonConf().PiggyBankSwitch == 1) if (GameHelper.IsGiftSwitch() && ConfigSystem.GetCommonConf().PiggyBankSwitch == 1)
{ {
@@ -320,7 +320,7 @@ namespace RedHotRoast
Debug.Log(ConfigSystem.GetCommonConf().ExpiryUnlock); Debug.Log(ConfigSystem.GetCommonConf().ExpiryUnlock);
str = $"{makeupTaskData.LvVideoCount}/{ ConfigSystem.GetCommonConf().ExpiryUnlock}"; str = $"{makeupTaskData.LvVideoCount}/{ ConfigSystem.GetCommonConf().ExpiryUnlock}";
ui.lab_ads.text = Language.GetContentParams("owner_ad", str); ui.lab_ads.text = Language.GetContentParams("owner_ad", str);
ui.text_nowch.text = GameHelper.Get102Str(DataMgr.Ticket.Value); ui.text_nowch.text = DataMgr.Ticket.Value.ToString();
ui.text_ch_title.text = Language.GetContentParams("need_lv_text", vo.levels_need); ui.text_ch_title.text = Language.GetContentParams("need_lv_text", vo.levels_need);
if (GameHelper.IsGiftSwitch() && ConfigSystem.GetCommonConf().PiggyBankSwitch == 1) if (GameHelper.IsGiftSwitch() && ConfigSystem.GetCommonConf().PiggyBankSwitch == 1)
{ {
@@ -639,7 +639,7 @@ namespace RedHotRoast
ui.text_condi1.text = GameHelper.getChString(vo.item_need); ui.text_condi1.text = GameHelper.getChString(vo.item_need);
ui.pb_condi1.max = vo.item_need; ui.pb_condi1.max = vo.item_need;
Debug.Log($"DataMgr.Ticket.Value==============={DataMgr.Ticket.Value}"); Debug.Log($"DataMgr.Ticket.Value==============={DataMgr.Ticket.Value}");
ui.text_ch_number.text = GameHelper.getChString(DataMgr.Ticket.Value); ui.text_ch_number.text = DataMgr.Ticket.Value.ToString();
var curValue = Math.Min(DataMgr.Ticket.Value, vo.item_need); var curValue = Math.Min(DataMgr.Ticket.Value, vo.item_need);
ui.pb_condi1.value = (double)curValue; ui.pb_condi1.value = (double)curValue;
var textTitle = ui.pb_condi1.GetChild("title"); var textTitle = ui.pb_condi1.GetChild("title");
Assets/Scripts/ModuleUI/Play/RainPlayUI.cs
+2 -2
View File
@@ -493,13 +493,13 @@ namespace RedHotRoast
} }
else else
{ {
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open); // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
} }
} }
} }
else else
{ {
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open); // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
} }
}); });
Assets/Scripts/ModuleUI/Reward/RewardUI.cs
+18 -11
View File
@@ -104,7 +104,6 @@ namespace RedHotRoast
} }
var value = GetRewardValue(); var value = GetRewardValue();
ui.text_num.text = GameHelper.Get101Str(value);
((btn_claim4)ui.btn_collect).is_gift.selectedIndex = GameHelper.IsGiftSwitch() ? 1 : 0; ((btn_claim4)ui.btn_collect).is_gift.selectedIndex = GameHelper.IsGiftSwitch() ? 1 : 0;
DOVirtual.DelayedCall(0.2f, () => DOVirtual.DelayedCall(0.2f, () =>
@@ -120,9 +119,9 @@ namespace RedHotRoast
ui.btn_collect.SetClick(OnClickClaim); ui.btn_collect.SetClick(OnClickClaim);
if (GameHelper.IsGiftSwitch()) if (GameHelper.IsGiftSwitch())
{ {
ui.text_num.text = GameHelper.Get101Str(value); ui.text_num.text = GameHelper.Get102Str(value);
ui.btn_collect.title = "" + GameHelper.Get101Str((decimal)value); ui.btn_collect.title = GameHelper.Get102Str((decimal)value);
} }
else else
{ {
@@ -170,14 +169,14 @@ namespace RedHotRoast
break; break;
} }
} }
if (GameHelper.IsGiftSwitch()) // if (GameHelper.IsGiftSwitch())
{ // {
cash_num = value / (decimal)GameHelper.GetExchangeRateVo().Multi; // cash_num = value;
} // }
else // else
{ // {
cash_num = value; cash_num = value;
} // }
var src = "(" ; var src = "(" ;
(ui.wheel.GetChild("wheel_") as wheel_).t0.Play(Scroll); (ui.wheel.GetChild("wheel_") as wheel_).t0.Play(Scroll);
@@ -234,7 +233,15 @@ namespace RedHotRoast
private decimal GetRewardValue(int index = 0) private decimal GetRewardValue(int index = 0)
{ {
return GetRewardData(index).value / (decimal)GameHelper.GetExchangeRateVo().Multi;; if (GameHelper.IsGiftSwitch())
{
return GetRewardData(index).value / (decimal)GameHelper.GetExchangeRateVo().Multi;
}
else
{
return GetRewardData(index).value;
}
} }
private RewardOrigin GetRewardOrigin(int index = 0) private RewardOrigin GetRewardOrigin(int index = 0)
Assets/Scripts/ModuleUI/SecretUnlockView/SecretUnlockViewUI.cs
+1 -1
View File
@@ -96,7 +96,7 @@ namespace RedHotRoast
GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh); GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
GameDispatcher.Instance.Dispatch(GameMsg.Update101); GameDispatcher.Instance.Dispatch(GameMsg.Update101);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open); // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockTipsUI_Open, 1); UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockTipsUI_Open, 1);
TrackKit.SendEvent(ADEventTrack.SecretAlbums, ADEventTrack.Property.secret_coin); TrackKit.SendEvent(ADEventTrack.SecretAlbums, ADEventTrack.Property.secret_coin);
GameHelper.ShowTips("unlock_secret", true); GameHelper.ShowTips("unlock_secret", true);
Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs
+1 -1
View File
@@ -220,7 +220,7 @@ namespace RedHotRoast
if (GameHelper.IsGiftSwitch()) if (GameHelper.IsGiftSwitch())
{ {
rewardNum *= (decimal)GameHelper.GetExchangeRateVo().Multi; rewardNum *= (decimal)GameHelper.GetExchangeRateVo().Multi;
typeId = vo.item1[i]; typeId = 102;
} }
else else
{ {
Assets/Scripts/ModuleUI/UnlockTips/UnlockTipsUI.cs
+1 -1
View File
@@ -125,7 +125,7 @@ namespace RedHotRoast
{ {
if (_type == 1) if (_type == 1)
{ {
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open); // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
} }
else if (_type == 2) else if (_type == 2)
{ {
Assets/Scripts/ToolKit/Language.cs
+1 -1
View File
@@ -55,7 +55,7 @@ public static class Language
lang = "id"; lang = "id";
} }
// } // }
lang = "ru"; lang = "ko";
setCurrentLanguage(lang); setCurrentLanguage(lang);
} }