tron_wz/RedHotRoast-ios
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：1、多语言bug修复

Browse Source
This commit is contained in:
barry
2026-07-14 14:13:52 +08:00
parent 49d65c1fdc
commit 110660f299
15 changed files with 86 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/AssetGroups/Built In Data.asset
+3 -14
View File
@@ -15,20 +15,9 @@ MonoBehaviour:
m_GroupName: Built In Data
m_Data:
m_SerializedData: []
m_GUID: b6e6294fd2ce84e69babdcf02024855b
m_SerializeEntries:
- m_GUID: EditorSceneList
m_Address: EditorSceneList
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: Resources
m_Address: Resources
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_GUID: f5206167a7608ef448df490e42990168
m_SerializeEntries: []
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: e60983ba8459aa349988c3ecb65abf31, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: 0771ae25d28c8437b9222dcb0cbf91a1, type: 2}
m_Schemas: []
Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
+1 -1
View File
@@ -15,7 +15,7 @@ MonoBehaviour:
m_GroupName: Default Local Group
m_Data:
m_SerializedData: []
m_GUID: bf4be40b2f8134ca58296430b441c34c
m_GUID: ee8779760d3c7a346956ec80a7e8f542
m_SerializeEntries:
- m_GUID: 2286bdb9423d4da48ba3b1bd8765173f
m_Address: Assets/Configs
Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset
+3 -3
View File
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: Default Local Group_BundledAssetGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 9509abfdb587c41faba2e57981af0044, type: 2}
m_Group: {fileID: 0}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
@@ -34,9 +34,9 @@ MonoBehaviour:
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: 8debd0b1021fa413d9261181a7945ce0
m_Id: c18fb8ec4a732eb46a1d69df4b844eef
m_LoadPath:
m_Id: 7cb9206d2b5674f6abdf9abe0f879e31
m_Id: 3eabfc860a0ea834ea688f5a1ecdddf0
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset
+1 -1
View File
@@ -12,5 +12,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
m_Name: Default Local Group_ContentUpdateGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 11400000, guid: 9509abfdb587c41faba2e57981af0044, type: 2}
m_Group: {fileID: 0}
m_StaticContent: 0
Assets/AddressableAssetsData/link.xml
-15
View File
@@ -1,15 +0,0 @@
<linker>
<assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
</assembly>
<assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.LegacyResourcesProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
</assembly>
<assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.TextAsset" preserve="all" />
</assembly>
</linker>
Assets/AddressableAssetsData/link.xml.meta
-7
View File
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 31634554e5dfe40e7afe2944f58fdd6d
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/RedHotRoast/Define/Model/Config/Game/ExchangeDesModel.cs
+8
View File
@@ -9,5 +9,13 @@ namespace IgnoreOPS
public string des_key;
public string Mode_0;
public string Mode_1;
public string Mode_FR;
public string Mode_DE;
public string Mode_ES;
public string Mode_PT;
public string Mode_JA;
public string Mode_KO;
public string Mode_RU;
public string Mode_ID;
}
}
Assets/RedHotRoast/Helper/GameHelper.cs
+46 -12
View File
@@ -1798,26 +1798,60 @@ namespace RedHotRoast
#endregion
public static string getDesByKey(string key)
{
Debug.Log(key);
Debug.Log(JsonConvert.SerializeObject(ConfigSystem.GetConfig<ExchangeDes>()));
if (isRDExchangeMode())
var config = ConfigSystem.GetConfig<ExchangeDes>();
var data = config.FirstOrDefault(d => d.des_key == key);
if (data == null)
return "";
// 根据语言动态获取对应的字段值
string property = GetModelByLanguage(data);
if (property == null)
{
string str = ConfigSystem.GetConfig<ExchangeDes>().FirstOrDefault(data => data.des_key == key)?.Mode_1 ?? "";
if (str != "")
// 如果找不到对应语言字段，返回默认的 Mode_1
return data.Mode_1 ?? "";
}
string str = property ?? "";
if (str != "" && isRDExchangeMode())
{
str = str.Replace("<img1>", "<img src='ui://o9974uc5qbo98'/>")
.Replace("<img2>", "<img src='ui://o9974uc5t9w7c3'/>");
}
return str;
}
else
{
return ConfigSystem.GetConfig<ExchangeDes>().FirstOrDefault(data => data.des_key == key)?.Mode_0 ?? "";
}
}
return str;
}
private static string GetModelByLanguage(ExchangeDes vo)
{
var language = Language.getCurrentLanguage();
switch (language)
{
case "fr"://法语
return vo.Mode_FR;
case "de"://德语
return vo.Mode_DE;
case "es"://西班牙语
return vo.Mode_ES;
case "pt"://葡萄牙语
return vo.Mode_PT;
case "ja"://日语
return vo.Mode_JA;
case "ko"://韩语
return vo.Mode_KO;
case "ru"://俄语
return vo.Mode_RU;
case "id"://印尼语
return vo.Mode_ID;
default:
return vo.Mode_1;
}
}
public static bool isRDExchangeMode()
{
// return true; //zhushi
Assets/Resources/RedHotRoastAssets/TextAsset/I18N/br.xml → Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ru.xml
View File
Assets/Resources/RedHotRoastAssets/TextAsset/I18N/br.xml.meta → Assets/Resources/RedHotRoastAssets/TextAsset/I18N/ru.xml.meta
View File
Assets/Scripts/ModuleUI/Hall/HallUI.cs
+1
View File
@@ -483,6 +483,7 @@ namespace RedHotRoast
ui.btn_setting.SetClick(OnClickSetting);
ui.btn_shop.SetClick(OnClickShop);
// ui.btn_secret.SetClick(OnClickSecretAlbums);
ui.btn_vip.visible = false;
ui.btn_vip.SetClick(onClickVip);
WebviewManager.Instance.SetDarkThough(true);
Assets/Scripts/ModuleUI/Loading/LoadingUI.cs
+7
View File
@@ -53,6 +53,13 @@ namespace RedHotRoast
protected override void OnOpenBefore(object args)
{
var lang = PlayerPrefsKit.ReadString("LangIdKey");
if (lang.IsNullOrWhiteSpace())
{
lang = "en";
}
UIManager.Instance.SetSwitchLanguage(lang);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenBgUI_Open);
ui.com_pb.max = 100;
ui.com_pb.value = 0;
Assets/Scripts/ModuleUI/SaveingPot/SaveingPotUI.cs
+6 -8
View File
@@ -155,7 +155,6 @@ namespace RedHotRoast
//初始化页面逻辑
private void InitView()
{
Debug.Log($"DataMgr.ExchangeAccount====={DataMgr.ExchangeAccount.Value}");
Makeup_2 makeupVo = MakeupModel_2.GetData(makeupTaskData.tableId);
ui.text_ad.text = string.Format(GameHelper.getDesByKey("saving_pot_5"), makeupVo.ADIncrease);
string str = string.Format(GameHelper.getDesByKey("saving_pot_2"), makeupVo.PayIncrease);
@@ -214,7 +213,7 @@ namespace RedHotRoast
});
HallManager.Instance.UpdateSecondEvent -= upLvWatchAdsBtn;
DOVirtual.DelayedCall(0.1f, InitView);
InitView();
}
if (SaveData.GetSaveObject().saveingpot_ch > SaveData.GetSaveObject().last_saveingpot_ch)
{
@@ -327,12 +326,11 @@ namespace RedHotRoast
btn_watchAd btn_watchad = ui.btn_ch as btn_watchAd;
btn_watchad.img_saveingpot.visible = false;
if (SaveData.GetSaveObject().saveingpot_ch >= makeupTaskData.amount)
{
HallManager.Instance.UpdateSecondEvent -= upLvWatchAdsBtn;
InitView();
return;
}
// if (SaveData.GetSaveObject().saveingpot_ch >= makeupTaskData.amount)
// {
// InitView();
// return;
// }
if (GameHelper.GetNowTime() < lastAdTimes)
{
Assets/Scripts/ToolKit/Language.cs
+8 -8
View File
@@ -18,12 +18,7 @@ public static class Language
Debug.Log($"languageInitialize systemLanguage = {systemLanguage}");
var lang = "en";
// if (DataMgr.selectLanguage.Value != -1)
// {
// lang = getISOCode((SystemLanguage)DataMgr.selectLanguage.Value);
// }
// else
// {
if (systemLanguage == SystemLanguage.English)
{
lang = "en";
@@ -55,9 +50,12 @@ public static class Language
else if (systemLanguage == SystemLanguage.Russian)
{
lang = "ru";
}else if (systemLanguage == SystemLanguage.Indonesian)
{
lang = "id";
}
// }
// lang = "de";
lang = "ja";
setCurrentLanguage(lang);
}
@@ -156,9 +154,11 @@ public static class Language
return SystemLanguage.Korean;
} else if (ISO_Code == "ru") {
return SystemLanguage.Russian;
} else if (ISO_Code == "id") {
return SystemLanguage.Indonesian;
} else if (ISO_Code == "pt") {
return SystemLanguage.Portuguese;
} else {
}else {
return SystemLanguage.English;
}
}
RedHotRoast-ios.sln.DotSettings.user
+1
View File
@@ -7,6 +7,7 @@
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASettingsUI_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F6e53694256e748aaa40387bd9aae590a19400_003F8f_003F4404ef43_003FSettingsUI_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASetupCoroutine_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2026_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Feaa93d1ff51f46939e13cc06b5754f3d177000_003F3a_003F4f590d28_003FSetupCoroutine_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASRKZBz0SDK_005FUtility_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F0b1e655068fc4085b9a483f586af9fa01fb200_003F43_003Ff38cb8f3_003FSRKZBz0SDK_005FUtility_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATween_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2348fb5ecc9e4e689f37f7d7fadaea9a27a00_003F51_003F5195cb05_003FTween_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AUnityWebRequest_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FUsers_003F97354_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ff2936d3fea9f4afd965350486955c95ac600_003Fe6_003F2d5c77ec_003FUnityWebRequest_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;
&lt;Assembly Path="/Users/edy/Documents/RedHotRoast-ios/Assets/TCJPLYRM1xJTSDK/ThirdParty/IAP/Plugins/SDK_IAP.dll" /&gt;