fix:1、添加多语言的json文件,修复bug
This commit is contained in:
@@ -114,7 +114,7 @@ namespace RedHotRoast
|
||||
uiInfo.layerType = UILayerType.Bottom;
|
||||
uiInfo.isNeedOpenAnim = false;
|
||||
uiInfo.isNeedCloseAnim = false;
|
||||
uiInfo.isNeedUIMask = true;
|
||||
uiInfo.isNeedUIMask = false;
|
||||
uiInfo.isTickUpdate = true;
|
||||
}
|
||||
|
||||
@@ -385,8 +385,6 @@ namespace RedHotRoast
|
||||
}
|
||||
|
||||
GameHelper.IsShowFirstReward();
|
||||
|
||||
// GameHelper.IsShowPettyReward();
|
||||
|
||||
GameHelper.ShowStatementView();
|
||||
}
|
||||
@@ -410,6 +408,7 @@ namespace RedHotRoast
|
||||
{
|
||||
decimal coin = DataMgr.Ticket.Value;
|
||||
|
||||
coin *= (decimal)GameHelper.GetExchangeRateVo().Multi;
|
||||
if (ui.com_money is com_money comMoney) comMoney.text_gold.text = coin.ToString("0.00");
|
||||
}
|
||||
|
||||
@@ -600,7 +599,8 @@ namespace RedHotRoast
|
||||
{
|
||||
if (ui.com_money is com_money btnMoney)
|
||||
{
|
||||
btnMoney.text_gold.text = DataMgr.Ticket.Value.ToString("0.00");
|
||||
// btnMoney.text_gold.text = DataMgr.Ticket.Value.ToString("0.00");
|
||||
Set102();
|
||||
btnMoney.SetClick(PopMakeup);
|
||||
}
|
||||
}
|
||||
@@ -608,6 +608,11 @@ namespace RedHotRoast
|
||||
private void PopMakeup()
|
||||
{
|
||||
var makeupTaskData = DataMgr.MakeupTaskHistory.Value.Last();
|
||||
Debug.Log($"makeupTaskData============{DataMgr.MakeupTaskHistory.Value.Count} {makeupTaskData.tableId}");
|
||||
if (DataMgr.MakeupTaskHistory.Value.Count > 0 && makeupTaskData.tableId <= 0)
|
||||
{
|
||||
makeupTaskData.tableId = DataMgr.MakeupTaskHistory.Value.Count;
|
||||
}
|
||||
var vo = MakeupModel.GetData(makeupTaskData.tableId);
|
||||
if (vo == null)
|
||||
{
|
||||
@@ -652,8 +657,24 @@ namespace RedHotRoast
|
||||
ui.btn_petty.SetClick(() => { uiCtrlDispatcher.Dispatch(UICtrlMsg.PettyAwardUI_Open); });
|
||||
|
||||
ui.btn_signin.SetClick(() => { uiCtrlDispatcher.Dispatch(UICtrlMsg.SignInUI_Open); });
|
||||
|
||||
|
||||
if (ConfigSystem.GetCommonConf().StatementSwitch == 1)
|
||||
{
|
||||
|
||||
ui.btn_statement.SetClick(() =>
|
||||
{
|
||||
uiCtrlDispatcher.Dispatch(UICtrlMsg.StatementViewUI_Open);
|
||||
});
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
HallManager.Instance.openTipsTimes++;
|
||||
ui.btn_statement.visible = false;
|
||||
}
|
||||
|
||||
|
||||
ui.btn_statement.SetClick(() => { uiCtrlDispatcher.Dispatch(UICtrlMsg.StatementViewUI_Open); });
|
||||
|
||||
ui.btn_saveingpot.SetClick(() => { uiCtrlDispatcher.Dispatch(UICtrlMsg.SaveingPotUI_Open); });
|
||||
|
||||
@@ -1270,7 +1291,7 @@ namespace RedHotRoast
|
||||
else if (type == 1)
|
||||
{
|
||||
_isDeleteMode = !_isDeleteMode;
|
||||
GameHelper.ShowTips("You can delete any one of the arrows!");
|
||||
GameHelper.ShowTips("delete_arrow", true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1479,6 +1500,7 @@ namespace RedHotRoast
|
||||
}
|
||||
else
|
||||
{
|
||||
ReleaseArrowOccupied(clickArrow);
|
||||
MoveToDisappear(clickArrow);
|
||||
}
|
||||
}
|
||||
@@ -1863,7 +1885,7 @@ namespace RedHotRoast
|
||||
if (CheckIsOutOfBounds(tailPos, arrow.finalMoveDir))
|
||||
{
|
||||
// ========== 以下销毁逻辑和原代码保持一致 ==========
|
||||
ReleaseArrowOccupied(arrow);
|
||||
// ReleaseArrowOccupied(arrow);
|
||||
|
||||
foreach (var line in arrow.lineUnits)
|
||||
{
|
||||
@@ -1971,8 +1993,7 @@ namespace RedHotRoast
|
||||
/// 消除每条线时概率获得奖励
|
||||
/// </summary>
|
||||
private void DisappearLineGetReward()
|
||||
{
|
||||
|
||||
{
|
||||
if (!GameHelper.IsGiftSwitch()) return;
|
||||
|
||||
bool isGet = false;
|
||||
@@ -2007,8 +2028,10 @@ namespace RedHotRoast
|
||||
var start = fguiPosition;
|
||||
var end = GameHelper.GetUICenterPosition(ui.com_money.GetChild("text_gold"));
|
||||
float[] cash_array = GameHelper.GetRewardValue(0);
|
||||
Debug.Log($"小额奖励:{cash_array[0]}");
|
||||
var rewardSingleData = new RewardSingleData(102, (decimal)cash_array[0], RewardOrigin.AdTask)
|
||||
var littleReward = GameHelper.GetExchangeRateVo().Multi * cash_array[0];
|
||||
Debug.Log($"小额奖励:{cash_array[0]} {littleReward}");
|
||||
|
||||
var rewardSingleData = new RewardSingleData(102, (decimal)littleReward, RewardOrigin.AdTask)
|
||||
{
|
||||
startPosition = start,
|
||||
endPosition = new Vector2(end.x - 135, end.y - 135)
|
||||
|
||||
Reference in New Issue
Block a user