fix:1、修复bug。2、添加音效
This commit is contained in:
@@ -23,9 +23,9 @@ namespace FGUI.ZM_Common_01
|
||||
base.ConstructFromXML(xml);
|
||||
|
||||
bg_panel = (GGraph)GetChildAt(0);
|
||||
cast_text = (GRichTextField)GetChildAt(1);
|
||||
hide_text = (GRichTextField)GetChildAt(2);
|
||||
btn_broad = (GButton)GetChildAt(3);
|
||||
cast_text = (GRichTextField)GetChildAt(2);
|
||||
hide_text = (GRichTextField)GetChildAt(3);
|
||||
btn_broad = (GButton)GetChildAt(4);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1219,7 +1219,7 @@ namespace RedHotRoast
|
||||
if (IsGiftSwitch())
|
||||
{
|
||||
DataMgr.GetFirstReaward.Value = true;
|
||||
var awardNum = ConfigSystem.GetCommonConf().InitialNum;
|
||||
var awardNum = ConfigSystem.GetCommonConf().InitialNum * GetExchangeRateMulti();
|
||||
addMoney(awardNum);
|
||||
GameDispatcher.Instance.Dispatch(GameMsg.Update102);
|
||||
|
||||
@@ -1854,16 +1854,17 @@ namespace RedHotRoast
|
||||
|
||||
public static string getChString(decimal ch)
|
||||
{
|
||||
var exchangeRateVo = GetExchangeRateVo();
|
||||
ch = (decimal)exchangeRateVo.Multi * ch;
|
||||
if (isRDExchangeMode() && IsGiftSwitch())
|
||||
{
|
||||
var exchangeRateVo = GetExchangeRateVo();
|
||||
|
||||
ch = (decimal)exchangeRateVo.Multi * ch;
|
||||
string str = "<img src='ui://o9974uc5m39de3q'/>";
|
||||
return str + $"{exchangeRateVo.Payicon}{ch:N}";
|
||||
}
|
||||
else
|
||||
{
|
||||
return $"{exchangeRateVo.Currency}{ch:N}";
|
||||
return $"{ch:N}";
|
||||
}
|
||||
}
|
||||
public static string getTrackEvenName()
|
||||
|
||||
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 MiB After Width: | Height: | Size: 1.5 MiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1474,6 +1474,8 @@ namespace RedHotRoast
|
||||
Debug.Log($"[arrow] {clickArrow.id}正在移动,请勿点击其他箭头");
|
||||
return;
|
||||
}
|
||||
AudioManager.Instance.PlayDynamicEffect(AudioConst.UIButtonDefault);
|
||||
|
||||
|
||||
TriggerVibration(true);
|
||||
|
||||
|
||||
@@ -542,13 +542,13 @@ namespace RedHotRoast
|
||||
}
|
||||
else
|
||||
{
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
|
||||
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
|
||||
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
@@ -216,7 +216,7 @@ namespace RedHotRoast
|
||||
Debug.Log(ConfigSystem.GetCommonConf().ExpiryUnlock);
|
||||
str = $"{makeupTaskData.LvVideoCount}/{ConfigSystem.GetCommonConf().ExpiryUnlock}";
|
||||
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);
|
||||
if (GameHelper.IsGiftSwitch() && ConfigSystem.GetCommonConf().PiggyBankSwitch == 1)
|
||||
{
|
||||
@@ -320,7 +320,7 @@ namespace RedHotRoast
|
||||
Debug.Log(ConfigSystem.GetCommonConf().ExpiryUnlock);
|
||||
str = $"{makeupTaskData.LvVideoCount}/{ ConfigSystem.GetCommonConf().ExpiryUnlock}";
|
||||
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);
|
||||
if (GameHelper.IsGiftSwitch() && ConfigSystem.GetCommonConf().PiggyBankSwitch == 1)
|
||||
{
|
||||
@@ -639,7 +639,7 @@ namespace RedHotRoast
|
||||
ui.text_condi1.text = GameHelper.getChString(vo.item_need);
|
||||
ui.pb_condi1.max = vo.item_need;
|
||||
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);
|
||||
ui.pb_condi1.value = (double)curValue;
|
||||
var textTitle = ui.pb_condi1.GetChild("title");
|
||||
|
||||
@@ -493,13 +493,13 @@ namespace RedHotRoast
|
||||
}
|
||||
else
|
||||
{
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
|
||||
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
|
||||
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
@@ -104,7 +104,6 @@ namespace RedHotRoast
|
||||
}
|
||||
|
||||
var value = GetRewardValue();
|
||||
ui.text_num.text = GameHelper.Get101Str(value);
|
||||
|
||||
((btn_claim4)ui.btn_collect).is_gift.selectedIndex = GameHelper.IsGiftSwitch() ? 1 : 0;
|
||||
DOVirtual.DelayedCall(0.2f, () =>
|
||||
@@ -120,9 +119,9 @@ namespace RedHotRoast
|
||||
ui.btn_collect.SetClick(OnClickClaim);
|
||||
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
|
||||
{
|
||||
@@ -170,14 +169,14 @@ namespace RedHotRoast
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (GameHelper.IsGiftSwitch())
|
||||
{
|
||||
cash_num = value / (decimal)GameHelper.GetExchangeRateVo().Multi;
|
||||
}
|
||||
else
|
||||
{
|
||||
// if (GameHelper.IsGiftSwitch())
|
||||
// {
|
||||
// cash_num = value;
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
cash_num = value;
|
||||
}
|
||||
// }
|
||||
|
||||
var src = "(" ;
|
||||
(ui.wheel.GetChild("wheel_") as wheel_).t0.Play(Scroll);
|
||||
@@ -234,7 +233,15 @@ namespace RedHotRoast
|
||||
|
||||
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)
|
||||
|
||||
@@ -96,7 +96,7 @@ namespace RedHotRoast
|
||||
GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
|
||||
GameDispatcher.Instance.Dispatch(GameMsg.Update101);
|
||||
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
|
||||
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockTipsUI_Open, 1);
|
||||
TrackKit.SendEvent(ADEventTrack.SecretAlbums, ADEventTrack.Property.secret_coin);
|
||||
GameHelper.ShowTips("unlock_secret", true);
|
||||
|
||||
@@ -220,7 +220,7 @@ namespace RedHotRoast
|
||||
if (GameHelper.IsGiftSwitch())
|
||||
{
|
||||
rewardNum *= (decimal)GameHelper.GetExchangeRateVo().Multi;
|
||||
typeId = vo.item1[i];
|
||||
typeId = 102;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -125,7 +125,7 @@ namespace RedHotRoast
|
||||
{
|
||||
if (_type == 1)
|
||||
{
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
|
||||
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
|
||||
}
|
||||
else if (_type == 2)
|
||||
{
|
||||
|
||||
@@ -55,7 +55,7 @@ public static class Language
|
||||
lang = "id";
|
||||
}
|
||||
// }
|
||||
lang = "ru";
|
||||
lang = "ko";
|
||||
setCurrentLanguage(lang);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user