|
@@ -9,7 +9,7 @@ using Utility;
|
|
|
|
|
|
namespace Core.Language
|
|
|
{
|
|
|
- public class LanguageManager : Singleton<LanguageManager>, ITextTool
|
|
|
+ public class LanguageManager : Singleton<LanguageManager>, ITextTool
|
|
|
{
|
|
|
public enum LanguageType
|
|
|
{
|
|
@@ -31,7 +31,7 @@ namespace Core.Language
|
|
|
private FontSettingConfig fontSettingConfig;
|
|
|
|
|
|
//private LanguageChineseConfig textConfig;
|
|
|
- private Map<int, LanguageChineseConfig> allLangugeInfo = new Map<int, LanguageChineseConfig>();
|
|
|
+ // private Map<int, LanguageChineseConfig> allLangugeInfo = new Map<int, LanguageChineseConfig>();
|
|
|
// public Map<int, StartGameLanguageChineseConfig> allLoginLangugeInfo = new Map<int, StartGameLanguageChineseConfig>();
|
|
|
|
|
|
public Map<string, Font> fonts = new Map<string, Font>();
|
|
@@ -44,7 +44,7 @@ namespace Core.Language
|
|
|
{
|
|
|
Debug.Log("开始FontSettingConfig");
|
|
|
AssetHandle assetBundle =
|
|
|
- await AssetBundleLoadManager.Instance.LoadAssetAsyncTask<FontSettingConfig>("FontSettingConfig.asset");
|
|
|
+ await AssetBundleLoadManager.Instance.LoadAssetAsyncTask<FontSettingConfig>("FontSettingConfig.asset");
|
|
|
fontSettingConfig = assetBundle.AssetObject<FontSettingConfig>();
|
|
|
if (fontSettingConfig != null)
|
|
|
{
|
|
@@ -81,12 +81,12 @@ namespace Core.Language
|
|
|
LanguageChineseConfigHolder configDataHolder = JsonManager.FromJson<LanguageChineseConfigHolder>(ta.text);
|
|
|
assetBundle.Release();
|
|
|
configDataHolder.Init();
|
|
|
- allLangugeInfo.Clear();
|
|
|
- List<LanguageChineseConfig> configList = configDataHolder.configList;
|
|
|
- for (int i = 0; i < configList.Count; i++)
|
|
|
- {
|
|
|
- allLangugeInfo.Add(configList[i].ID, configList[i]);
|
|
|
- }
|
|
|
+ // allLangugeInfo.Clear();
|
|
|
+ // List<LanguageChineseConfig> configList = configDataHolder.GetAll();
|
|
|
+ // for (int i = 0; i < configList.Count; i++)
|
|
|
+ // {
|
|
|
+ // allLangugeInfo.Add(configList[i].ID, configList[i]);
|
|
|
+ // }
|
|
|
|
|
|
// configJson = "StartGame" + languageType + ".json";
|
|
|
// assetBundle =
|
|
@@ -187,8 +187,9 @@ namespace Core.Language
|
|
|
{
|
|
|
//return "-ok";
|
|
|
|
|
|
- LanguageChineseConfig icd = new LanguageChineseConfig();
|
|
|
- if (allLangugeInfo.TryGetValue(id, out icd))
|
|
|
+ LanguageChineseConfig icd = GetText(id);
|
|
|
+ // LanguageChineseConfig icd = new LanguageChineseConfig();
|
|
|
+ if (icd.ID > 0)
|
|
|
{
|
|
|
return icd.txt.Replace("\\n", "\n");
|
|
|
}
|
|
@@ -197,14 +198,19 @@ namespace Core.Language
|
|
|
return "无" + id;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ private LanguageChineseConfig GetText(int id)
|
|
|
+ {
|
|
|
+ LanguageChineseConfig icd = ConfigComponent.Instance.Get<LanguageChineseConfig>(id);
|
|
|
+ return icd;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
public string Text(int id, params object[] data)
|
|
|
{
|
|
|
//return "-ok";
|
|
|
|
|
|
- LanguageChineseConfig icd = new LanguageChineseConfig();
|
|
|
- if (allLangugeInfo.TryGetValue(id, out icd))
|
|
|
+ LanguageChineseConfig icd = GetText(id);
|
|
|
+ if (icd.ID > 0)
|
|
|
{
|
|
|
string d = icd.txt;
|
|
|
d = StringForString(d, data);
|
|
@@ -217,8 +223,9 @@ namespace Core.Language
|
|
|
public string Text2(int id, string[] data)
|
|
|
{
|
|
|
//return "-ok";
|
|
|
- LanguageChineseConfig icd = new LanguageChineseConfig();
|
|
|
- if (allLangugeInfo.TryGetValue(id, out icd))
|
|
|
+ LanguageChineseConfig icd = GetText(id);
|
|
|
+ if (icd.ID > 0)
|
|
|
+
|
|
|
{
|
|
|
string d = icd.txt;
|
|
|
d = StringForString(d, data);
|
|
@@ -231,8 +238,8 @@ namespace Core.Language
|
|
|
public string Text2(int id, float[] data)
|
|
|
{
|
|
|
//return "-ok";
|
|
|
- LanguageChineseConfig icd = new LanguageChineseConfig();
|
|
|
- if (allLangugeInfo.TryGetValue(id, out icd))
|
|
|
+ LanguageChineseConfig icd = GetText(id);
|
|
|
+ if (icd.ID>0)
|
|
|
{
|
|
|
string d = icd.txt;
|
|
|
d = StringForString(d, data);
|
|
@@ -246,8 +253,8 @@ namespace Core.Language
|
|
|
{
|
|
|
//return "-ok";
|
|
|
|
|
|
- LanguageChineseConfig icd = new LanguageChineseConfig();
|
|
|
- if (allLangugeInfo.TryGetValue(id, out icd))
|
|
|
+ LanguageChineseConfig icd = GetText(id);
|
|
|
+ if (icd.ID>0)
|
|
|
{
|
|
|
string d = icd.txt;
|
|
|
d = StringForString(d, data);
|
|
@@ -269,20 +276,33 @@ namespace Core.Language
|
|
|
case 1: return string.Format(message, par.GetValue(0));
|
|
|
case 2: return string.Format(message, par.GetValue(0), par.GetValue(1));
|
|
|
case 3: return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2));
|
|
|
- case 4: return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2), par.GetValue(3));
|
|
|
- case 5: return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2), par.GetValue(3), par.GetValue(4));
|
|
|
- case 6: return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2), par.GetValue(3), par.GetValue(4), par.GetValue(5));
|
|
|
- case 7: return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2), par.GetValue(3), par.GetValue(4), par.GetValue(5), par.GetValue(6));
|
|
|
- case 8: return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2), par.GetValue(3), par.GetValue(4), par.GetValue(5), par.GetValue(6), par.GetValue(7));
|
|
|
+ case 4:
|
|
|
+ return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2),
|
|
|
+ par.GetValue(3));
|
|
|
+ case 5:
|
|
|
+ return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2),
|
|
|
+ par.GetValue(3), par.GetValue(4));
|
|
|
+ case 6:
|
|
|
+ return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2),
|
|
|
+ par.GetValue(3), par.GetValue(4), par.GetValue(5));
|
|
|
+ case 7:
|
|
|
+ return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2),
|
|
|
+ par.GetValue(3), par.GetValue(4), par.GetValue(5), par.GetValue(6));
|
|
|
+ case 8:
|
|
|
+ return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2),
|
|
|
+ par.GetValue(3), par.GetValue(4), par.GetValue(5), par.GetValue(6), par.GetValue(7));
|
|
|
case 9:
|
|
|
- return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2), par.GetValue(3), par.GetValue(4), par.GetValue(5), par.GetValue(6), par.GetValue(7),
|
|
|
+ return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2),
|
|
|
+ par.GetValue(3), par.GetValue(4), par.GetValue(5), par.GetValue(6), par.GetValue(7),
|
|
|
par.GetValue(8));
|
|
|
case 10:
|
|
|
- return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2), par.GetValue(3), par.GetValue(4), par.GetValue(5), par.GetValue(6), par.GetValue(7),
|
|
|
+ return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2),
|
|
|
+ par.GetValue(3), par.GetValue(4), par.GetValue(5), par.GetValue(6), par.GetValue(7),
|
|
|
par.GetValue(8),
|
|
|
par.GetValue(9));
|
|
|
case 11:
|
|
|
- return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2), par.GetValue(3), par.GetValue(4), par.GetValue(5), par.GetValue(6), par.GetValue(7),
|
|
|
+ return string.Format(message, par.GetValue(0), par.GetValue(1), par.GetValue(2),
|
|
|
+ par.GetValue(3), par.GetValue(4), par.GetValue(5), par.GetValue(6), par.GetValue(7),
|
|
|
par.GetValue(8),
|
|
|
par.GetValue(9), par.GetValue(10));
|
|
|
}
|