fix：1、添加多语言的json文件，修复bug
This commit is contained in:
@@ -84,7 +84,7 @@ namespace RedHotRoast
|
||||
}
|
||||
|
||||
// WebviewManager.ShezhiACT(false);
|
||||
WebviewManager.Instance.SetDarkThough(false);
|
||||
// WebviewManager.Instance.SetDarkThough(false);
|
||||
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuygoldUI_Close);
|
||||
|
||||
@@ -163,7 +163,7 @@ namespace RedHotRoast
|
||||
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)
|
||||
@@ -173,10 +173,12 @@ namespace RedHotRoast
|
||||
ui.text_chprogress.text = SaveingPotHelper.getChNumber(SaveData.GetSaveObject().saveingpot_ch) + "/" + SaveingPotHelper.getChNumber(makeupTaskData.amount);
|
||||
ui.progress_ch.value = (SaveData.GetSaveObject().saveingpot_ch / makeupTaskData.amount) * 100;
|
||||
ske_pot.SetActive(true);
|
||||
Debug.Log("iiiiiiiiiiiiiiiiiiiii");
|
||||
if (SaveData.GetSaveObject().saveingpot_ch < makeupTaskData.amount)
|
||||
{
|
||||
((btn_watchAd)ui.btn_ch).watch.text = "Go";
|
||||
((btn_watchAd)ui.btn_ch).watch.text = Language.GetContentParams("go");
|
||||
((btn_watchAd)ui.btn_ch).buy_state.selectedIndex = 0;
|
||||
|
||||
ui.btn_ch.SetClick(() => { });
|
||||
ui.btn_ch.SetClick(() =>
|
||||
{
|
||||
GameHelper.ShowVideoAd("SaveingPotAd", isSuccess =>
|
||||
@@ -190,25 +192,29 @@ namespace RedHotRoast
|
||||
btnWatchad.enabled = false;
|
||||
btnWatchad.can_buy.selectedIndex = 1;
|
||||
btnWatchad.btn_text.text = CommonHelper.TimeFormat(SaveData.GetSaveObject()._watch_ad_cd - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour);
|
||||
HallManager.Instance.UpdateSecondEvent += upLvWatchAdsBtn;
|
||||
InitView();
|
||||
HallManager.Instance.UpdateSecondEvent += upLvWatchAdsBtn;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
btn_watchAd btnWatchad = ui.btn_ch as btn_watchAd;
|
||||
btnWatchad.enabled = true;
|
||||
btnWatchad.buy_state.selectedIndex = 1;
|
||||
btnWatchad.title = "GET GIFT CARD";
|
||||
btnWatchad.can_buy.selectedIndex = 0;
|
||||
btnWatchad.title = Language.GetContentParams("get_card");
|
||||
btnWatchad.SetClick(() => { });
|
||||
btnWatchad.SetClick(() =>
|
||||
{
|
||||
makeupTaskData.needShowAni = false;
|
||||
SaveData.SaveDataFunc();
|
||||
InitView();
|
||||
});
|
||||
|
||||
HallManager.Instance.UpdateSecondEvent -= upLvWatchAdsBtn;
|
||||
DOVirtual.DelayedCall(0.1f, InitView);
|
||||
}
|
||||
if (SaveData.GetSaveObject().saveingpot_ch > SaveData.GetSaveObject().last_saveingpot_ch)
|
||||
{
|
||||
@@ -315,7 +321,6 @@ namespace RedHotRoast
|
||||
ui.btn_watch.show_cd.selectedIndex = 0;
|
||||
}
|
||||
}
|
||||
|
||||
private void upLvWatchAdsBtn()
|
||||
{
|
||||
var lastAdTimes = SaveData.GetSaveObject()._watch_ad_cd;
|
||||
@@ -341,6 +346,8 @@ namespace RedHotRoast
|
||||
btn_watchad.enabled = true;
|
||||
btn_watchad.can_buy.selectedIndex = 0;
|
||||
if (GameHelper.IsGiftSwitch() && ConfigSystem.GetCommonConf().PiggyBankSwitch == 1) btn_watchad.img_saveingpot.visible = true;
|
||||
|
||||
InitView();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -378,7 +385,7 @@ namespace RedHotRoast
|
||||
{
|
||||
ui.cont_confirm.selectedIndex = 0;
|
||||
ui.type.selectedIndex = 6;
|
||||
ui.text_payhint.text = "You will get the " + makeupTaskData.amountStr + " for 90 days";
|
||||
ui.text_payhint.text = Language.GetContentParams("saveingpot_get", makeupTaskData.amountStr);
|
||||
ui.text_query.text = DataMgr.ExchangeAccount.Value;
|
||||
ui.btn_confirm.SetClick(() =>
|
||||
{
|
||||
@@ -541,7 +548,7 @@ namespace RedHotRoast
|
||||
}
|
||||
}
|
||||
|
||||
ui.lab_mn.text = GameHelper.Get101Str(vo.item_need - value);
|
||||
ui.lab_mn.text = GameHelper.Get102Str(vo.item_need - value);
|
||||
|
||||
ui.list_kicket.itemRenderer = refreshItem;
|
||||
ui.list_kicket.numItems = makeupTaskData.rdData.Count;
|
||||
@@ -555,12 +562,12 @@ namespace RedHotRoast
|
||||
if (makeupTaskData.rdData[index].isClaimed)
|
||||
{
|
||||
item.btn_claim.state.selectedIndex = 1;
|
||||
item.btn_claim.title = "Claimed";
|
||||
item.btn_claim.title = Language.GetContentParams("claimed");
|
||||
}
|
||||
else
|
||||
{
|
||||
item.btn_claim.state.selectedIndex = 0;
|
||||
item.btn_claim.title = "Claim";
|
||||
item.btn_claim.title = Language.GetContentParams("claim");
|
||||
}
|
||||
|
||||
item.btn_claim.SetClick(() =>
|
||||
@@ -596,7 +603,7 @@ namespace RedHotRoast
|
||||
}
|
||||
|
||||
var vo = MakeupModel_2.GetData(makeupTaskData.tableId);
|
||||
ui.lab_mn2.text = GameHelper.Get101Str(vo.item_need - value);
|
||||
ui.lab_mn2.text = GameHelper.Get102Str(vo.item_need - value);
|
||||
ui.lab_ticket.text = GameHelper.GetPriceInt(makeupTaskData.lastRdData.coupon_mount);
|
||||
ui.lab_code.text = makeupTaskData.lastRdData.code;
|
||||
|
||||
@@ -621,8 +628,8 @@ namespace RedHotRoast
|
||||
normal = false,
|
||||
url = vo.C_ShopURL
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
CtrlDispatcher.Instance.Dispatch(CtrlMsg.open_wb,openConfig);
|
||||
|
||||
CtrlCloseUI();
|
||||
@@ -735,12 +742,12 @@ namespace RedHotRoast
|
||||
return;
|
||||
}
|
||||
ui.type.selectedIndex = 4;
|
||||
ui.com_task.text_task.text = "get gift card";
|
||||
ui.com_task.text_payer.text = "{amt=$0.5} directly to your gift card";
|
||||
ui.com_task.text_task.text = Language.GetContentParams("get_card");
|
||||
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)
|
||||
{
|
||||
@@ -837,27 +844,31 @@ namespace RedHotRoast
|
||||
var account = enter_input.text.Replace(" ", "");
|
||||
if (account == null || account == "")
|
||||
{
|
||||
GameHelper.ShowTips("Please enter the correct account information1", true);
|
||||
string content = Language.GetContentParams("empty_account1", 1);
|
||||
GameHelper.ShowTips(content);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!GameHelper.CheckAccountValidly(account))
|
||||
{
|
||||
GameHelper.ShowTips("Please enter the correct account information2", true);
|
||||
string content = Language.GetContentParams("empty_account1", 2);
|
||||
GameHelper.ShowTips(content);
|
||||
return;
|
||||
}
|
||||
|
||||
var fname = ui.com_fname.enter_fname.text.Replace(" ", "");
|
||||
if (!GameHelper.CheckNameValidly(fname))
|
||||
{
|
||||
GameHelper.ShowTips("Please enter the correct account information3", true);
|
||||
string content = Language.GetContentParams("empty_account1", 3);
|
||||
GameHelper.ShowTips(content);
|
||||
return;
|
||||
}
|
||||
|
||||
var lname = ui.com_lname.enter_lname.text.Replace(" ", "");
|
||||
if (!GameHelper.CheckNameValidly(lname) && !AppConst.isPt())
|
||||
{
|
||||
GameHelper.ShowTips("Please enter the correct account information4", true);
|
||||
string content = Language.GetContentParams("empty_account1", 4);
|
||||
GameHelper.ShowTips(content);
|
||||
return;
|
||||
}
|
||||
DataMgr.ExchangeAccount.Value= account;
|
||||
@@ -921,8 +932,7 @@ namespace RedHotRoast
|
||||
|
||||
for (int i = 0; i < btn_list.Count; i++)
|
||||
{
|
||||
btn_list[i].text_ch.text = makeup_list[i].item_need + "";
|
||||
Debug.Log(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)
|
||||
{
|
||||
@@ -949,7 +959,7 @@ namespace RedHotRoast
|
||||
btn_list[i].img_outline.visible = false;
|
||||
btn_list[i].SetClick(() =>
|
||||
{
|
||||
GameHelper.ShowTips("To be unlocked");
|
||||
GameHelper.ShowTips("un_lock",true);
|
||||
});
|
||||
}
|
||||
else
|
||||
@@ -996,11 +1006,11 @@ namespace RedHotRoast
|
||||
{
|
||||
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]";
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -1024,11 +1034,11 @@ namespace RedHotRoast
|
||||
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