fix:1、修复bug
This commit is contained in:
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: e90382a4df24e4a97809defec553d4d4
|
guid: 67d429bb506537c48bbdec76552a223b
|
||||||
TextScriptImporter:
|
TextScriptImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
@@ -435,6 +435,13 @@ namespace RedHotRoast
|
|||||||
return $"{exchangeRateVO.Payicon}{price:N}";
|
return $"{exchangeRateVO.Payicon}{price:N}";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static string Get102Reward(decimal currency)
|
||||||
|
{
|
||||||
|
var exchangeRateVO = GetExchangeRateVo();
|
||||||
|
decimal price = currency * (decimal)exchangeRateVO.Multi;
|
||||||
|
return $"{price:N}";
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 金币/AD 字符串
|
/// 金币/AD 字符串
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -538,7 +538,7 @@ namespace RedHotRoast
|
|||||||
{
|
{
|
||||||
if (DataMgr.IsUnlockSecret.Value == 0)
|
if (DataMgr.IsUnlockSecret.Value == 0)
|
||||||
{
|
{
|
||||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockTipsUI_Open, 1);
|
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockTipsUI_Open, 1);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -605,6 +605,8 @@ namespace RedHotRoast
|
|||||||
UpdataAvatar();
|
UpdataAvatar();
|
||||||
InitBtn();
|
InitBtn();
|
||||||
ui.btn_task.SetClick(() => { OnClickTask(false); });
|
ui.btn_task.SetClick(() => { OnClickTask(false); });
|
||||||
|
|
||||||
|
ui.btn_restore.visible = false;
|
||||||
ui.btn_restore.SetClick(() =>
|
ui.btn_restore.SetClick(() =>
|
||||||
{
|
{
|
||||||
IAPPayManager.Instance.OnRestoreButtonClicked();
|
IAPPayManager.Instance.OnRestoreButtonClicked();
|
||||||
|
|||||||
@@ -361,12 +361,12 @@ namespace RedHotRoast
|
|||||||
{
|
{
|
||||||
if (GameHelper.GetLevel() < GameHelper.GetCommonModel().UnlockLive[1])
|
if (GameHelper.GetLevel() < GameHelper.GetCommonModel().UnlockLive[1])
|
||||||
{
|
{
|
||||||
if (DataMgr.IsUnlockLive.Value < 0 && !GameHelper.GetVipPrivilege(Subscription.UnlockLive.As<int>()))
|
// if (DataMgr.IsUnlockLive.Value < 0 && !GameHelper.GetVipPrivilege(Subscription.UnlockLive.As<int>()))
|
||||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretUnlockUI_Open, 2);
|
// // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretUnlockUI_Open, 2);
|
||||||
else if (DataMgr.IsUnlockLive.Value == 0)
|
// else if (DataMgr.IsUnlockLive.Value == 0)
|
||||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockTipsUI_Open, 2);
|
// // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockTipsUI_Open, 2);
|
||||||
else
|
// else
|
||||||
HandleDetailOpen(item, index);
|
// HandleDetailOpen(item, index);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -489,7 +489,7 @@ namespace RedHotRoast
|
|||||||
{
|
{
|
||||||
if (DataMgr.IsUnlockSecret.Value == 0)
|
if (DataMgr.IsUnlockSecret.Value == 0)
|
||||||
{
|
{
|
||||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockTipsUI_Open, 1);
|
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockTipsUI_Open, 1);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1064,14 +1064,14 @@ namespace RedHotRoast
|
|||||||
if (!GameHelper.GetVipPrivilege(Subscription.UnlockSecret.As<int>()) && DataMgr.IsUnlockSecret.Value < 0 && currentLevel >= commonModel.UnlockSecret[1] && GameHelper.GetCommonModel().Secret == 1 && GameHelper.GetCommonModel().Live == 1)
|
if (!GameHelper.GetVipPrivilege(Subscription.UnlockSecret.As<int>()) && DataMgr.IsUnlockSecret.Value < 0 && currentLevel >= commonModel.UnlockSecret[1] && GameHelper.GetCommonModel().Secret == 1 && GameHelper.GetCommonModel().Live == 1)
|
||||||
{
|
{
|
||||||
DataMgr.IsUnlockSecret.Value = 0;
|
DataMgr.IsUnlockSecret.Value = 0;
|
||||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockTipsUI_Open, 1);
|
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockTipsUI_Open, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
Debug.Log($"[Game End2] {currentLevel}/{commonModel.UnlockLive[1]}/{DataMgr.IsUnlockLive.Value}");
|
Debug.Log($"[Game End2] {currentLevel}/{commonModel.UnlockLive[1]}/{DataMgr.IsUnlockLive.Value}");
|
||||||
if (!GameHelper.GetVipPrivilege(Subscription.UnlockLive.As<int>()) && DataMgr.IsUnlockLive.Value < 0 && currentLevel >= commonModel.UnlockLive[1] && GameHelper.GetCommonModel().Secret == 1 && GameHelper.GetCommonModel().Live == 1)
|
if (!GameHelper.GetVipPrivilege(Subscription.UnlockLive.As<int>()) && DataMgr.IsUnlockLive.Value < 0 && currentLevel >= commonModel.UnlockLive[1] && GameHelper.GetCommonModel().Secret == 1 && GameHelper.GetCommonModel().Live == 1)
|
||||||
{
|
{
|
||||||
DataMgr.IsUnlockLive.Value = 0;
|
DataMgr.IsUnlockLive.Value = 0;
|
||||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockTipsUI_Open, 2);
|
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockTipsUI_Open, 2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -219,7 +219,7 @@ namespace RedHotRoast
|
|||||||
var typeId = 101;
|
var typeId = 101;
|
||||||
if (GameHelper.IsGiftSwitch())
|
if (GameHelper.IsGiftSwitch())
|
||||||
{
|
{
|
||||||
rewardNum *= (decimal)GameHelper.GetExchangeRateVo().Multi;
|
rewardNum = GameHelper.Get102Reward(rewardNum).As<decimal>();
|
||||||
typeId = 102;
|
typeId = 102;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ public static class Language
|
|||||||
lang = "id";
|
lang = "id";
|
||||||
}
|
}
|
||||||
// }
|
// }
|
||||||
lang = "ko";
|
lang = "fr";
|
||||||
setCurrentLanguage(lang);
|
setCurrentLanguage(lang);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user