fix:1、修复bug。2、添加跳转亚马逊。
This commit is contained in:
@@ -158,13 +158,14 @@ namespace ChillConnect
|
||||
private void InitView()
|
||||
{
|
||||
Makeup_2 makeupVo = ConfigSystem.GetConfig<MakeupModel_2>().GetData(makeupTaskData.tableId);
|
||||
ui.text_ad.text = string.Format(GameHelper.getDesByKey("saving_pot_5"), makeupVo.ADIncrease * GameHelper.GetExchangeRateVo().Multi);
|
||||
ui.text_ad.text = string.Format(GameHelper.getDesByKey("saving_pot_5"),
|
||||
SaveingPotHelper.getChNumber(makeupVo.ADIncrease * GameHelper.GetExchangeRateVo().Multi));
|
||||
string str = string.Format(GameHelper.getDesByKey("saving_pot_2"), makeupVo.PayIncrease);
|
||||
ui.text_pay.text = str;
|
||||
initTop();
|
||||
|
||||
ske_pot.SetActive(false);
|
||||
string val = $"{SaveData.GetSaveObject().saveingpot_ch:N}";
|
||||
string val = $"{SaveingPotHelper.getChNumber(SaveData.GetSaveObject().saveingpot_ch):N}";
|
||||
ui.text_lose.SetVar("num", val).FlushVars();
|
||||
// ui.text_lose.text = string.Format(ui.text_lose.text, SaveingPotHelper.getChString(SaveData.GetSaveObject().saveingpot_ch));
|
||||
if (makeupTaskData.needShowAni)
|
||||
@@ -194,6 +195,7 @@ namespace ChillConnect
|
||||
btnWatchad.can_buy.selectedIndex = 1;
|
||||
btnWatchad.btn_text.text = CommonHelper.TimeFormat(SaveData.GetSaveObject()._watch_ad_cd - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour);
|
||||
InitView();
|
||||
HallManager.Instance.UpdateSecondEvent += upLvWatchAdsBtn;
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -203,6 +205,7 @@ namespace ChillConnect
|
||||
btn_watchAd btnWatchad = ui.btn_ch as btn_watchAd;
|
||||
btnWatchad.enabled = true;
|
||||
btnWatchad.buy_state.selectedIndex = 1;
|
||||
btnWatchad.can_buy.selectedIndex = 0;
|
||||
btnWatchad.title = Language.GetContentParams("get_card");
|
||||
btnWatchad.SetClick(() => { });
|
||||
btnWatchad.SetClick(() =>
|
||||
@@ -211,6 +214,9 @@ namespace ChillConnect
|
||||
SaveData.saveDataFunc();
|
||||
InitView();
|
||||
});
|
||||
|
||||
HallManager.Instance.UpdateSecondEvent -= upLvWatchAdsBtn;
|
||||
DOVirtual.DelayedCall(0.1f, InitView);
|
||||
}
|
||||
if (SaveData.GetSaveObject().saveingpot_ch > SaveData.GetSaveObject().last_saveingpot_ch)
|
||||
{
|
||||
@@ -323,11 +329,11 @@ namespace ChillConnect
|
||||
btn_watchAd btn_watchad = ui.btn_ch as btn_watchAd;
|
||||
btn_watchad.img_saveingpot.visible = false;
|
||||
|
||||
if (SaveData.GetSaveObject().saveingpot_ch >= makeupTaskData.amount)
|
||||
{
|
||||
InitView();
|
||||
return;
|
||||
}
|
||||
// if (SaveData.GetSaveObject().saveingpot_ch >= makeupTaskData.amount)
|
||||
// {
|
||||
// InitView();
|
||||
// return;
|
||||
// }
|
||||
|
||||
if (GameHelper.GetNowTime() < lastAdTimes)
|
||||
{
|
||||
@@ -337,9 +343,11 @@ namespace ChillConnect
|
||||
}
|
||||
else
|
||||
{
|
||||
HallManager.Instance.UpdateSecondEvent -= upLvWatchAdsBtn;
|
||||
btn_watchad.enabled = true;
|
||||
btn_watchad.can_buy.selectedIndex = 0;
|
||||
if (GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1) btn_watchad.img_saveingpot.visible = true;
|
||||
InitView();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -615,14 +623,14 @@ namespace ChillConnect
|
||||
{
|
||||
// GameHelper.OpenEmail();
|
||||
|
||||
// SDKOpenConfig openConfig = new SDKOpenConfig
|
||||
// {
|
||||
// normal = false,
|
||||
// url = vo.C_ShopURL
|
||||
// };
|
||||
//
|
||||
//
|
||||
// CtrlDispatcher.Instance.Dispatch(CtrlMsg.open_wb,openConfig);
|
||||
SDKOpenConfig openConfig = new SDKOpenConfig
|
||||
{
|
||||
normal = false,
|
||||
url = vo.C_ShopURL
|
||||
};
|
||||
|
||||
|
||||
CtrlDispatcher.Instance.Dispatch(CtrlMsg.open_wb,openConfig);
|
||||
|
||||
CtrlCloseUI();
|
||||
});
|
||||
@@ -735,11 +743,11 @@ namespace ChillConnect
|
||||
}
|
||||
ui.type.selectedIndex = 4;
|
||||
ui.com_task.text_task.text = Language.GetContentParams("get_card");
|
||||
ui.com_task.text_payer.text = Language.GetContentParams("saveingpot_claimed","amt=$0.5");
|
||||
ui.com_task.text_payer.text = Language.GetContentParams("saveingpot_claimed",makeupTaskData.GetAmountStr());
|
||||
ui.com_task.text_orderid.text = makeupTaskData.orderID;
|
||||
ui.com_task.text_task_title.SetVar("ad", vo.ad_need.ToString()).FlushVars();
|
||||
ui.com_task.text_ads.text = $"{makeupTaskData.videoCount}/{vo.ad_need}";
|
||||
ui.com_task.text_payer.SetVar("amt", makeupTaskData.GetAmountStr()).FlushVars();
|
||||
// ui.com_task.text_payer.text = makeupTaskData.GetAmountStr();
|
||||
|
||||
if (makeupTaskData.videoCount >= vo.ad_need)
|
||||
{
|
||||
@@ -924,7 +932,7 @@ namespace ChillConnect
|
||||
|
||||
for (int i = 0; i < btn_list.Count; i++)
|
||||
{
|
||||
btn_list[i].text_ch.text = makeup_list[i].item_need + "";
|
||||
btn_list[i].text_ch.text = makeup_list[i].item_need * GameHelper.GetExchangeRateVo().Multi + "";
|
||||
btn_list[i].index.selectedIndex = i;
|
||||
if (i >= saveingpot_history.Count)
|
||||
{
|
||||
@@ -998,11 +1006,11 @@ namespace ChillConnect
|
||||
{
|
||||
if (GameHelper.isRDExchangeMode())
|
||||
{
|
||||
text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]<img src='ui://o9974uc5t9w7c3'/>" + broad_list[i][1] + "[/color]";
|
||||
text_list[i].text = $"{Language.GetContent("congratulations")},[color=#ad4800][size=36] " + broad_list[i][0] + $" [/size][/color]{Language.GetContent("exchange_success")}[color=#ad4800]<img src='ui://o9974uc5t9w7c3'/>" + broad_list[i][1] + "[/color]";
|
||||
}
|
||||
else
|
||||
{
|
||||
text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]$" + broad_list[i][1] + "[/color]";
|
||||
text_list[i].text = $"{Language.GetContent("congratulations")},[color=#ad4800][size=36] " + broad_list[i][0] + $" [/size][/color]{Language.GetContent("exchange_success")}[color=#ad4800]$" + broad_list[i][1] + "[/color]";
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -1026,11 +1034,11 @@ namespace ChillConnect
|
||||
broad_list.Add(new string[2] { config_name_list[name_index], config_money_list[money_index] });
|
||||
if (GameHelper.isRDExchangeMode())
|
||||
{
|
||||
text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]<img src='ui://o9974uc5t9w7c3'/>" + broad_list[i][1] + "[/color]";
|
||||
text_list[i].text = $"{Language.GetContent("congratulations")},[color=#ad4800][size=36] " + broad_list[i][0] + $" [/size][/color]{Language.GetContent("exchange_success")} [color=#ad4800]<img src='ui://o9974uc5t9w7c3'/>" + broad_list[i][1] + "[/color]";
|
||||
}
|
||||
else
|
||||
{
|
||||
text_list[i].text = "congratulations,[color=#ad4800][size=36] " + broad_list[i][0] + " [/size][/color]Successful exchange[color=#ad4800]$" + broad_list[i][1] + "[/color]";
|
||||
text_list[i].text = $"{Language.GetContent("congratulations")},[color=#ad4800][size=36] " + broad_list[i][0] + $" [/size][/color]{Language.GetContent("exchange_success")}[color=#ad4800]$" + broad_list[i][1] + "[/color]";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user