diff --git a/Assets/RedHotRoast/FGUI/package/ZM_Sign_06/btn_sign.cs b/Assets/RedHotRoast/FGUI/package/ZM_Sign_06/btn_sign.cs
index 1ae65be4..c76a3677 100644
--- a/Assets/RedHotRoast/FGUI/package/ZM_Sign_06/btn_sign.cs
+++ b/Assets/RedHotRoast/FGUI/package/ZM_Sign_06/btn_sign.cs
@@ -10,7 +10,7 @@ namespace FGUI.ZM_Sign_06
public Controller day;
public Controller state;
public Controller is_gift;
- public GTextField reward_num;
+ public GRichTextField reward_num;
public Transition t0;
public const string URL = "ui://8ihaqs6isebxc";
@@ -26,7 +26,7 @@ namespace FGUI.ZM_Sign_06
day = GetControllerAt(0);
state = GetControllerAt(1);
is_gift = GetControllerAt(2);
- reward_num = (GTextField)GetChildAt(6);
+ reward_num = (GRichTextField)GetChildAt(6);
t0 = GetTransitionAt(0);
}
}
diff --git a/Assets/Resources/NetworkConfig.asset b/Assets/Resources/NetworkConfig.asset
index a1e16072..eb039bb3 100644
--- a/Assets/Resources/NetworkConfig.asset
+++ b/Assets/Resources/NetworkConfig.asset
@@ -13,6 +13,6 @@ MonoBehaviour:
m_Name: NetworkConfig
m_EditorClassIdentifier:
showNetworkLog: 1
- debugHost: api.jsoncompare.online
+ debugHost: wz-api-dev.tronwin.top
releaseHost: api.tronwin.top
connectionMode: 0
diff --git a/Assets/Resources/RedHotRoastAssets/FGUI/Arrow_Theme_fui.bytes b/Assets/Resources/RedHotRoastAssets/FGUI/Arrow_Theme_fui.bytes
index b25272f9..ae1e6310 100644
Binary files a/Assets/Resources/RedHotRoastAssets/FGUI/Arrow_Theme_fui.bytes and b/Assets/Resources/RedHotRoastAssets/FGUI/Arrow_Theme_fui.bytes differ
diff --git a/Assets/Resources/RedHotRoastAssets/FGUI/Arrow_game_fui.bytes b/Assets/Resources/RedHotRoastAssets/FGUI/Arrow_game_fui.bytes
index b938f7e8..e854df4f 100644
Binary files a/Assets/Resources/RedHotRoastAssets/FGUI/Arrow_game_fui.bytes and b/Assets/Resources/RedHotRoastAssets/FGUI/Arrow_game_fui.bytes differ
diff --git a/Assets/Resources/RedHotRoastAssets/FGUI/ZM_Sign_06_fui.bytes b/Assets/Resources/RedHotRoastAssets/FGUI/ZM_Sign_06_fui.bytes
index f386ab60..7ed2e913 100644
Binary files a/Assets/Resources/RedHotRoastAssets/FGUI/ZM_Sign_06_fui.bytes and b/Assets/Resources/RedHotRoastAssets/FGUI/ZM_Sign_06_fui.bytes differ
diff --git a/Assets/Resources/RedHotRoastAssets/FGUI/tixian_fui.bytes b/Assets/Resources/RedHotRoastAssets/FGUI/tixian_fui.bytes
index e31704a0..4ee74a75 100644
Binary files a/Assets/Resources/RedHotRoastAssets/FGUI/tixian_fui.bytes and b/Assets/Resources/RedHotRoastAssets/FGUI/tixian_fui.bytes differ
diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/de.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/de.xml
index 7f3009f5..5d6bf019 100644
--- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/de.xml
+++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/de.xml
@@ -421,7 +421,7 @@ nächste Level zu erreichen, ein Stein = ein Punkt
folgende PayPal-Konto einlösen.
Zahlungsdetails
- Zahlungsbetrag: {num=} USD
+ Zahlungsbetrag: {num=}
Zahlungsdatum: {data=}
Bestellnummer: {order=}
PayPal: [color=#1777ff]{email=}[/color]
diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/en.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/en.xml
index 1d81468a..dca86492 100644
--- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/en.xml
+++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/en.xml
@@ -422,7 +422,7 @@ next level, one tile for one point
following PayPal account.
Payment Details
- Payment Amount: {num=} USD
+ Payment Amount: {num=}
Payment Date: {data=}
Order Number: {order=}
PayPal: [color=#1777ff]{email=}[/color]
diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/es.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/es.xml
index ee0a8dd2..94125320 100644
--- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/es.xml
+++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/es.xml
@@ -421,7 +421,7 @@ siguiente nivel, una ficha = un punto
siguiente cuenta de PayPal.
Detalles del pago
- Monto del pago: {num=} USD
+ Monto del pago: {num=}
Fecha del pago: {data=}
Número de pedido: {order=}
PayPal: [color=#1777ff]{email=}[/color]
diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/fr.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/fr.xml
index 9af0b259..f0bcd0c0 100644
--- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/fr.xml
+++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/fr.xml
@@ -422,7 +422,7 @@ niveau suivant, une tuile = un point
compte PayPal suivant.
Détails du paiement
- Montant du paiement : {num=} USD
+ Montant du paiement : {num=}
Date du paiement : {data=}
Numéro de commande : {order=}
PayPal : [color=#1777ff]{email=}[/color]
diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/id.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/id.xml
index e6f99b25..df5d87fd 100644
--- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/id.xml
+++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/id.xml
@@ -406,7 +406,7 @@
आप नकद को निम्नलिखित पेपाल खाते में बदल सकते हैं।
भुगतान विवरण
- भुगतान राशि: {num=} अमेरिकी डॉलर
+ भुगतान राशि: {num=}
भुगतान तिथि: {data=}
ऑर्डर संख्या: {order=}
पेपाल: [color=#1777ff]{email=}[/color]
diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ja.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ja.xml
index 90a71626..a64368a4 100644
--- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ja.xml
+++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ja.xml
@@ -422,7 +422,7 @@
現金を交換できます
お支払い詳細
- お支払金額: {num=} USD
+ お支払金額: {num=}
お支払日: {data=}
注文番号: {order=}
PayPal: [color=#1777ff]{email=}[/color]
diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ko.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ko.xml
index 888365a3..24fd1f22 100644
--- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ko.xml
+++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ko.xml
@@ -422,7 +422,7 @@
현금 교환이 가능합니다
결제 상세
- 결제 금액: {num=} USD
+ 결제 금액: {num=}
결제일: {data=}
주문 번호: {order=}
PayPal: [color=#1777ff]{email=}[/color]
diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/pt.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/pt.xml
index bdeb283e..57799f6a 100644
--- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/pt.xml
+++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/pt.xml
@@ -419,7 +419,7 @@ próximo nível, um bloco por um ponto
seguinte conta PayPal.
Detalhes do Pagamento
- Valor do Pagamento: {num=} USD
+ Valor do Pagamento: {num=}
Data do Pagamento: {data=}
Número do Pedido: {order=}
PayPal: [color=#1777ff]{email=}[/color]
diff --git a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ru.xml b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ru.xml
index bbf20709..503cff08 100644
--- a/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ru.xml
+++ b/Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ru.xml
@@ -421,7 +421,7 @@
следующий счёт PayPal.
Детали платежа
- Сумма платежа: {num=} USD
+ Сумма платежа: {num=}
Дата платежа: {data=}
Номер заказа: {order=}
PayPal: [color=#1777ff]{email=}[/color]
diff --git a/Assets/SGModule/Net/SGModule/Scripts/Core/NetChecker.cs b/Assets/SGModule/Net/SGModule/Scripts/Core/NetChecker.cs
index e1e331de..f9ef153d 100644
--- a/Assets/SGModule/Net/SGModule/Scripts/Core/NetChecker.cs
+++ b/Assets/SGModule/Net/SGModule/Scripts/Core/NetChecker.cs
@@ -155,7 +155,7 @@ namespace SGModule.Net {
var pings = _pingAddresses.Select(ip => new Ping(ip)).ToList();
var startTime = Time.realtimeSinceStartup;
- var success = false;
+ var success = true;
// 等待所有 Ping 返回结果或超时
while (Time.realtimeSinceStartup - startTime < _checkInterval) {
@@ -175,7 +175,7 @@ namespace SGModule.Net {
// 如果有任意一个 Ping 成功,网络即为可用
Debug.Log($"isconnected: {success}");
- IsConnected = success;
+ IsConnected = true;
}
///
diff --git a/Assets/Scripts/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs b/Assets/Scripts/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs
index 33570d82..7c670c9d 100644
--- a/Assets/Scripts/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs
+++ b/Assets/Scripts/ModuleUI/MakeupConfirm/MakeupConfirmUI.cs
@@ -201,8 +201,8 @@ namespace RedHotRoast
initTop();
ui.btn_close.SetClick(CtrlCloseUI);
- if ((GameHelper.isRDExchangeMode() && DataMgr.ExchangeProcessMode.Value == 1) || (!GameHelper.isRDExchangeMode() && DataMgr.CHProcessMode.Value == 1))
- {
+ if ((GameHelper.isRDExchangeMode() && DataMgr.ExchangeProcessMode.Value == 1) || (!GameHelper.isRDExchangeMode() && DataMgr.CHProcessMode.Value == 1))
+ {
if (makeupTaskData.status == MakeupTaskStatus.Level)
{
Debug.Log("00000000000000000003");
diff --git a/Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs b/Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs
index 9a3b2658..1f45cbe7 100644
--- a/Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs
+++ b/Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs
@@ -138,7 +138,7 @@ namespace RedHotRoast
btnSign.title = signList[index].id + "";
btnSign.touchable = false;
- btnSign.reward_num.text = GameHelper.IsGiftSwitch()?GameHelper.getChString(signList[index].quantity[0]):GameHelper.Get101Str(signList[index].quantity[0]);
+ btnSign.reward_num.text = GameHelper.IsGiftSwitch()?GameHelper.Get102Str(signList[index].quantity[0]):GameHelper.Get101Str(signList[index].quantity[0]);
var animName = "appear2";
if (index % 5 == 4)
@@ -216,15 +216,18 @@ namespace RedHotRoast
for (var i = 0; i < vo.item1.Length; i++)
{
var rewardNum = vo.quantity[i];
+ var typeId = 101;
if (GameHelper.IsGiftSwitch())
{
rewardNum *= (decimal)GameHelper.GetExchangeRateVo().Multi;
+ typeId = vo.item1[i];
}
else
{
rewardNum = GameHelper.Get101Str(vo.quantity[i]).As();
}
- var rewardData = new RewardSingleData(101, rewardNum, RewardOrigin.SignIn,index)
+
+ var rewardData = new RewardSingleData(typeId, rewardNum, RewardOrigin.SignIn,index)
{
startPosition = startPos,
endPosition = new Vector2(ui.com_gold.x - 150, ui.com_gold.y - 136)
diff --git a/Assets/Scripts/ToolKit/Language.cs b/Assets/Scripts/ToolKit/Language.cs
index bf8947ff..03c5c1e0 100644
--- a/Assets/Scripts/ToolKit/Language.cs
+++ b/Assets/Scripts/ToolKit/Language.cs
@@ -55,7 +55,7 @@ public static class Language
lang = "id";
}
// }
- lang = "ja";
+ lang = "ru";
setCurrentLanguage(lang);
}