com.xmobitea.changx.mini-localization 1.4.7 → 1.4.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (31) hide show
  1. package/Editor/LocalizationComponentEditor.cs.meta +11 -11
  2. package/Editor/LocalizationComponentWindowsEditor.cs +22 -5
  3. package/Editor/LocalizationKeyDrawer.cs +2 -2
  4. package/Editor/LocalizationKeyDrawer.cs.meta +11 -11
  5. package/Editor/LocalizationManagerEditor.cs +36 -16
  6. package/Editor/LocalizationSettingsEditor.cs +2 -2
  7. package/Editor/TMP_LocalizationComponentEditor.cs +2 -0
  8. package/Editor/TMP_LocalizationComponentEditor.cs.meta +11 -11
  9. package/Editor/Tools/GetLocalizationTools/linux-x64/GetLocalization.meta +7 -7
  10. package/Editor/Tools/GetLocalizationTools/linux-x64.meta +8 -8
  11. package/Editor/Tools/GetLocalizationTools/osx-x64/GetLocalization.meta +7 -7
  12. package/Editor/Tools/GetLocalizationTools/osx-x64.meta +8 -8
  13. package/Editor/Tools/GetLocalizationTools/win-x64/GetLocalization.exe.meta +7 -7
  14. package/Editor/Tools/GetLocalizationTools/win-x64.meta +8 -8
  15. package/Editor/com.xmobitea.changx.mini-localization.editor.asmdef +9 -3
  16. package/LICENSE.md +202 -1
  17. package/Runtime/LocalizationComponent.cs +1 -1
  18. package/Runtime/LocalizationConstantId.cs +5 -0
  19. package/Runtime/{LocalizationConstanceId.cs.meta → LocalizationConstantId.cs.meta} +11 -11
  20. package/Runtime/LocalizationLanguageItem.cs +2 -2
  21. package/Runtime/LocalizationManager.cs +4 -4
  22. package/Runtime/TMP_LocalizationComponent.cs +4 -0
  23. package/Runtime/com.xmobitea.changx.mini-localization.runtime.asmdef +15 -4
  24. package/package.json +17 -17
  25. package/Editor/Tools/GetLocalizationTools/linux-x64/GetLocalization.pdb +0 -0
  26. package/Editor/Tools/GetLocalizationTools/linux-x64/GetLocalization.pdb.meta +0 -7
  27. package/Editor/Tools/GetLocalizationTools/osx-x64/GetLocalization.pdb +0 -0
  28. package/Editor/Tools/GetLocalizationTools/osx-x64/GetLocalization.pdb.meta +0 -7
  29. package/Editor/Tools/GetLocalizationTools/win-x64/GetLocalization.pdb +0 -0
  30. package/Editor/Tools/GetLocalizationTools/win-x64/GetLocalization.pdb.meta +0 -7
  31. package/Runtime/LocalizationConstanceId.cs +0 -5
@@ -1,11 +1,11 @@
1
- fileFormatVersion: 2
2
- guid: 5b5bfbf16db005d4c92afef84a4c324e
3
- MonoImporter:
4
- externalObjects: {}
5
- serializedVersion: 2
6
- defaultReferences: []
7
- executionOrder: 0
8
- icon: {instanceID: 0}
9
- userData:
10
- assetBundleName:
11
- assetBundleVariant:
1
+ fileFormatVersion: 2
2
+ guid: 5b5bfbf16db005d4c92afef84a4c324e
3
+ MonoImporter:
4
+ externalObjects: {}
5
+ serializedVersion: 2
6
+ defaultReferences: []
7
+ executionOrder: 0
8
+ icon: {instanceID: 0}
9
+ userData:
10
+ assetBundleName:
11
+ assetBundleVariant:
@@ -5,8 +5,12 @@
5
5
 
6
6
  using UnityEngine;
7
7
  using UnityEngine.UI;
8
- using UnityEditor.IMGUI.Controls;
8
+
9
+ #if UNITY_USING_TMPRO
9
10
  using TMPro;
11
+ #endif
12
+
13
+ using UnityEditor.IMGUI.Controls;
10
14
  using UnityEditor.SceneManagement;
11
15
 
12
16
  public class LocalizationComponentWindowsEditor : EditorWindow
@@ -36,19 +40,30 @@
36
40
  if (parentGO)
37
41
  {
38
42
  var texts = parentGO.GetComponentsInChildren<Text>(true);
43
+
44
+ #if UNITY_USING_TMPRO
39
45
  var tmpTexts = parentGO.GetComponentsInChildren<TMP_Text>(true);
46
+ #endif
40
47
 
41
- textsInScene = new GameObject[texts.Length + tmpTexts.Length];
48
+ textsInScene = new GameObject[
49
+ texts.Length
50
+
51
+ #if UNITY_USING_TMPRO
52
+ + tmpTexts.Length
53
+ #endif
54
+ ];
42
55
 
43
56
  for (var i = 0; i < texts.Length; i++)
44
57
  {
45
58
  textsInScene[i] = texts[i].gameObject;
46
59
  }
47
60
 
61
+ #if UNITY_USING_TMPRO
48
62
  for (var i = 0; i < tmpTexts.Length; i++)
49
63
  {
50
64
  textsInScene[texts.Length + i] = tmpTexts[i].gameObject;
51
65
  }
66
+ #endif
52
67
  }
53
68
  else
54
69
  {
@@ -141,7 +156,7 @@
141
156
  var style = new GUIStyle(EditorStyles.label);
142
157
  style.richText = true;
143
158
 
144
- GUILayout.Label("<color=red>" + localizationComponent.Key + "</color> missing on LocalizationConstanceId.cs", style);
159
+ GUILayout.Label("<color=red>" + localizationComponent.Key + "</color> missing on LocalizationConstantId.cs", style);
145
160
  }
146
161
  }
147
162
  }
@@ -153,12 +168,14 @@
153
168
  {
154
169
  Undo.AddComponent<LocalizationComponent>(text.gameObject);
155
170
  EditorSceneManager.MarkSceneDirty(text.gameObject.scene);
156
- }
171
+ }
157
172
  else
158
173
  {
174
+ #if UNITY_USING_TMPRO
159
175
  Undo.AddComponent<TMP_LocalizationComponent>(text.gameObject);
160
176
  EditorSceneManager.MarkSceneDirty(text.gameObject.scene);
161
- }
177
+ #endif
178
+ }
162
179
 
163
180
  Selection.objects = new Object[] { text.gameObject };
164
181
  }
@@ -62,7 +62,7 @@
62
62
  var style = new GUIStyle(EditorStyles.label);
63
63
  style.richText = true;
64
64
 
65
- EditorGUI.LabelField(new Rect(position.x, position.y + EditorGUIUtility.singleLineHeight, position.width, EditorGUIUtility.singleLineHeight), "\t\t<color=red>" + property.stringValue + "</color> missing on LocalizationConstanceId.cs", style);
65
+ EditorGUI.LabelField(new Rect(position.x, position.y + EditorGUIUtility.singleLineHeight, position.width, EditorGUIUtility.singleLineHeight), "\t\t<color=red>" + property.stringValue + "</color> missing on LocalizationConstantId.cs", style);
66
66
  }
67
67
  }
68
68
 
@@ -92,7 +92,7 @@
92
92
 
93
93
  var types = AppDomain.CurrentDomain.GetAssemblies()
94
94
  .SelectMany(s => s.GetTypes())
95
- .Where(p => p.Name == "LocalizationConstanceId" && p.Namespace == "XmobiTea.MiniLocalization").ToList();
95
+ .Where(p => p.Name == "LocalizationConstantId" && p.Namespace == "XmobiTea.MiniLocalization").ToList();
96
96
 
97
97
  foreach (var type in types)
98
98
  {
@@ -1,11 +1,11 @@
1
- fileFormatVersion: 2
2
- guid: c89e549aa37295f4b934b14c58f5726d
3
- MonoImporter:
4
- externalObjects: {}
5
- serializedVersion: 2
6
- defaultReferences: []
7
- executionOrder: 0
8
- icon: {instanceID: 0}
9
- userData:
10
- assetBundleName:
11
- assetBundleVariant:
1
+ fileFormatVersion: 2
2
+ guid: c89e549aa37295f4b934b14c58f5726d
3
+ MonoImporter:
4
+ externalObjects: {}
5
+ serializedVersion: 2
6
+ defaultReferences: []
7
+ executionOrder: 0
8
+ icon: {instanceID: 0}
9
+ userData:
10
+ assetBundleName:
11
+ assetBundleVariant:
@@ -8,15 +8,14 @@
8
8
  using System.Collections.Generic;
9
9
  using System.Text.RegularExpressions;
10
10
  using System.Text;
11
+ using XmobiTea.MiniAutoGenerate.Editor;
11
12
 
12
13
  [CustomEditor(typeof(LocalizationManager))]
13
14
  public class LocalizationManagerEditor : Editor
14
15
  {
15
- private const string Version = "1.4.7";
16
- private const string Library = @".\Library\PackageCache\com.xmobitea.changx.mini-localization@" + Version;
17
- //private const string Library = @".\Assets\MiniLocalization";
18
- private const string ProcessPath = @"\Editor\Tools\GetLocalizationTools";
19
- private const string CredentialsPath = @"\Editor\Tools\GetLocalizationTools\credentials.json";
16
+ private const string LibraryPackageCachePath = @"Library\PackageCache";
17
+ private const string ProcessPath = @"Editor\Tools\GetLocalizationTools";
18
+ private const string CredentialsPath = @"Editor\Tools\GetLocalizationTools\credentials.json";
20
19
 
21
20
  public override void OnInspectorGUI()
22
21
  {
@@ -32,9 +31,9 @@
32
31
  // ShowTMPLocalizationComponentWindowsEditor();
33
32
  //}
34
33
 
35
- if (GUILayout.Button("Generate LocalizationConstanceId.cs"))
34
+ if (GUILayout.Button("Generate LocalizationConstantId.cs"))
36
35
  {
37
- GenerateLocalizationConstanceId();
36
+ GenerateLocalizationConstantId();
38
37
  }
39
38
 
40
39
  if (GUILayout.Button("Fetch Localization"))
@@ -74,7 +73,11 @@
74
73
 
75
74
  if (!usingFetchLocalLocalization && !usingFetchOnlineLocalization) return;
76
75
 
77
- var processPath = Library + ProcessPath;
76
+ var localizationInPackageCache = GetLocalizationInPackageCache();
77
+ if (!localizationInPackageCache.EndsWith("\\") && !localizationInPackageCache.EndsWith("/"))
78
+ localizationInPackageCache += "/";
79
+
80
+ var processPath = localizationInPackageCache + ProcessPath;
78
81
 
79
82
  var filePath123 = "GetLocalization";
80
83
  var folderPath = "";
@@ -95,7 +98,7 @@
95
98
 
96
99
  processPath += "\\" + folderPath + "\\" + filePath123;
97
100
 
98
- var credentialsPath = Library + CredentialsPath;
101
+ var credentialsPath = localizationInPackageCache + CredentialsPath;
99
102
 
100
103
  var arguments = credentialsPath + " " + worksheetKey + (usingFetchLocalLocalization ? " true " : " false ") + (usingFetchOnlineLocalization ? "true " : "false ") + (string.IsNullOrEmpty(localizationSettings.SheetnameFetchLocalLocalization) ? "local" : localizationSettings.SheetnameFetchLocalLocalization) + " " + (string.IsNullOrEmpty(localizationSettings.SheetnameFetchOnlineLocalization) ? "online" : localizationSettings.SheetnameFetchOnlineLocalization);
101
104
 
@@ -159,13 +162,30 @@
159
162
 
160
163
  AssetDatabase.Refresh();
161
164
 
162
- GenerateLocalizationConstanceId();
165
+ GenerateLocalizationConstantId();
163
166
  }
164
167
 
165
- [MenuItem("XmobiTea Tools/Localization/Generate LocalizationConstanceId.cs")]
166
- public static void GenerateLocalizationConstanceId()
168
+ private static string GetLocalizationInPackageCache()
169
+ {
170
+ var directoryInfo = new DirectoryInfo(Application.dataPath + "/../" + LibraryPackageCachePath);
171
+
172
+ var allDirectoriesPackage = directoryInfo.GetDirectories();
173
+
174
+ foreach (var c in allDirectoriesPackage)
175
+ {
176
+ if (c.Name.StartsWith("com.xmobitea.changx.mini-localization@"))
177
+ {
178
+ return c.FullName;
179
+ }
180
+ }
181
+
182
+ throw new System.Exception("[Localization] Not found package com.xmobitea.changx.mini-localization in Library/PackageCache/");
183
+ }
184
+
185
+ [MenuItem("XmobiTea Tools/Localization/Generate LocalizationConstantId.cs")]
186
+ public static void GenerateLocalizationConstantId()
167
187
  {
168
- Debug.Log("[Localization] Generate Localization Constance Id");
188
+ Debug.Log("[Localization] Generate Localization Constant Id");
169
189
 
170
190
  var localizationSettings = Resources.Load<LocalizationSettings>(LocalizationSettings.ResourcesPath);
171
191
  if (localizationSettings == null)
@@ -190,7 +210,7 @@
190
210
  contentBuilder.AppendLine();
191
211
  contentBuilder.AppendLine("namespace XmobiTea.MiniLocalization");
192
212
  contentBuilder.AppendLine("{");
193
- contentBuilder.AppendLine(" public partial class LocalizationConstanceId");
213
+ contentBuilder.AppendLine(" public partial class LocalizationConstantId");
194
214
  contentBuilder.AppendLine(" {");
195
215
 
196
216
  var keyNameLst = new List<string>();
@@ -207,7 +227,7 @@
207
227
  {
208
228
  keyNameLst.Add(validKey);
209
229
 
210
- contentBuilder.AppendLine(" public const string " + validKey + " = " + "\"" + key + "\";");
230
+ contentBuilder.AppendLine(" public static readonly string " + validKey + " = " + "\"" + key + "\";");
211
231
  }
212
232
  else
213
233
  {
@@ -218,7 +238,7 @@
218
238
 
219
239
  contentBuilder.AppendLine(" }");
220
240
  contentBuilder.AppendLine("}");
221
- MiniAutoGenerate.Editor.AutoGenerate.GenerateFile("LocalizationConstanceId.cs", contentBuilder, Application.dataPath + "/XmobiTea-constance/Scripts/");
241
+ AutoGenerate.GenerateFile("LocalizationConstantId.cs", contentBuilder, Application.dataPath + "/XmobiTea-constant/Scripts/");
222
242
  }
223
243
 
224
244
  private static readonly HashSet<string> CSharpKeywords = new()
@@ -87,9 +87,9 @@ namespace XmobiTea.MiniLocalization.Editor
87
87
  // LocalizationManagerEditor.ShowTMPLocalizationComponentWindowsEditor();
88
88
  //}
89
89
 
90
- if (GUILayout.Button("Generate LocalizationConstanceId.cs"))
90
+ if (GUILayout.Button("Generate LocalizationConstantId.cs"))
91
91
  {
92
- LocalizationManagerEditor.GenerateLocalizationConstanceId();
92
+ LocalizationManagerEditor.GenerateLocalizationConstantId();
93
93
  }
94
94
 
95
95
  if (GUILayout.Button("Fetch Localization"))
@@ -1,5 +1,6 @@
1
1
  namespace XmobiTea.MiniLocalization.Editor
2
2
  {
3
+ #if UNITY_USING_TMPRO
3
4
  using System.IO;
4
5
  using UnityEditor;
5
6
 
@@ -63,4 +64,5 @@ namespace XmobiTea.MiniLocalization.Editor
63
64
  return localizationSettings;
64
65
  }
65
66
  }
67
+ #endif
66
68
  }
@@ -1,11 +1,11 @@
1
- fileFormatVersion: 2
2
- guid: 34247ecb70b2da345b44ab74e5586a22
3
- MonoImporter:
4
- externalObjects: {}
5
- serializedVersion: 2
6
- defaultReferences: []
7
- executionOrder: 0
8
- icon: {instanceID: 0}
9
- userData:
10
- assetBundleName:
11
- assetBundleVariant:
1
+ fileFormatVersion: 2
2
+ guid: 34247ecb70b2da345b44ab74e5586a22
3
+ MonoImporter:
4
+ externalObjects: {}
5
+ serializedVersion: 2
6
+ defaultReferences: []
7
+ executionOrder: 0
8
+ icon: {instanceID: 0}
9
+ userData:
10
+ assetBundleName:
11
+ assetBundleVariant:
@@ -1,7 +1,7 @@
1
- fileFormatVersion: 2
2
- guid: 7ae72a5d49f00b74d9f3bf38d3da3076
3
- DefaultImporter:
4
- externalObjects: {}
5
- userData:
6
- assetBundleName:
7
- assetBundleVariant:
1
+ fileFormatVersion: 2
2
+ guid: 7ae72a5d49f00b74d9f3bf38d3da3076
3
+ DefaultImporter:
4
+ externalObjects: {}
5
+ userData:
6
+ assetBundleName:
7
+ assetBundleVariant:
@@ -1,8 +1,8 @@
1
- fileFormatVersion: 2
2
- guid: 7d06c03dd392877489ecb75f3130eba4
3
- folderAsset: yes
4
- DefaultImporter:
5
- externalObjects: {}
6
- userData:
7
- assetBundleName:
8
- assetBundleVariant:
1
+ fileFormatVersion: 2
2
+ guid: 7d06c03dd392877489ecb75f3130eba4
3
+ folderAsset: yes
4
+ DefaultImporter:
5
+ externalObjects: {}
6
+ userData:
7
+ assetBundleName:
8
+ assetBundleVariant:
@@ -1,7 +1,7 @@
1
- fileFormatVersion: 2
2
- guid: 9dbff6f03e9e39347b2ffe90bd74c63f
3
- DefaultImporter:
4
- externalObjects: {}
5
- userData:
6
- assetBundleName:
7
- assetBundleVariant:
1
+ fileFormatVersion: 2
2
+ guid: 9dbff6f03e9e39347b2ffe90bd74c63f
3
+ DefaultImporter:
4
+ externalObjects: {}
5
+ userData:
6
+ assetBundleName:
7
+ assetBundleVariant:
@@ -1,8 +1,8 @@
1
- fileFormatVersion: 2
2
- guid: aa710d67c22b740489d440f5943ba8c9
3
- folderAsset: yes
4
- DefaultImporter:
5
- externalObjects: {}
6
- userData:
7
- assetBundleName:
8
- assetBundleVariant:
1
+ fileFormatVersion: 2
2
+ guid: aa710d67c22b740489d440f5943ba8c9
3
+ folderAsset: yes
4
+ DefaultImporter:
5
+ externalObjects: {}
6
+ userData:
7
+ assetBundleName:
8
+ assetBundleVariant:
@@ -1,7 +1,7 @@
1
- fileFormatVersion: 2
2
- guid: e319706edf896e745a508a8dae687444
3
- DefaultImporter:
4
- externalObjects: {}
5
- userData:
6
- assetBundleName:
7
- assetBundleVariant:
1
+ fileFormatVersion: 2
2
+ guid: e319706edf896e745a508a8dae687444
3
+ DefaultImporter:
4
+ externalObjects: {}
5
+ userData:
6
+ assetBundleName:
7
+ assetBundleVariant:
@@ -1,8 +1,8 @@
1
- fileFormatVersion: 2
2
- guid: 680e627246fbc2c4cb75b6fc20a7ef0c
3
- folderAsset: yes
4
- DefaultImporter:
5
- externalObjects: {}
6
- userData:
7
- assetBundleName:
8
- assetBundleVariant:
1
+ fileFormatVersion: 2
2
+ guid: 680e627246fbc2c4cb75b6fc20a7ef0c
3
+ folderAsset: yes
4
+ DefaultImporter:
5
+ externalObjects: {}
6
+ userData:
7
+ assetBundleName:
8
+ assetBundleVariant:
@@ -1,9 +1,9 @@
1
1
  {
2
2
  "name": "com.xmobitea.changx.mini-localization.editor",
3
- "rootNamespace": "",
3
+ "rootNamespace": "XmobiTea.MiniLocalization.Editor",
4
4
  "references": [
5
5
  "com.xmobitea.changx.mini-localization.runtime",
6
- "com.xmobitea.changx.mini-autogenerator.runtime",
6
+ "com.xmobitea.changx.mini-autogenerator.editor",
7
7
  "com.xmobitea.changx.mini-singleton.runtime",
8
8
  "Unity.TextMeshPro"
9
9
  ],
@@ -16,6 +16,12 @@
16
16
  "precompiledReferences": [],
17
17
  "autoReferenced": true,
18
18
  "defineConstraints": [],
19
- "versionDefines": [],
19
+ "versionDefines": [
20
+ {
21
+ "name": "com.unity.textmeshpro",
22
+ "expression": "",
23
+ "define": "UNITY_USING_TMPRO"
24
+ }
25
+ ],
20
26
  "noEngineReferences": false
21
27
  }
package/LICENSE.md CHANGED
@@ -1 +1,202 @@
1
- copyright ©2022 XmobiTea Family ("**_XmobiTea_**") https://xmobitea.com
1
+ Apache License
2
+ Version 2.0, January 2004
3
+ http://www.apache.org/licenses/
4
+
5
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6
+
7
+ 1. Definitions.
8
+
9
+ "License" shall mean the terms and conditions for use, reproduction,
10
+ and distribution as defined by Sections 1 through 9 of this document.
11
+
12
+ "Licensor" shall mean the copyright owner or entity authorized by
13
+ the copyright owner that is granting the License.
14
+
15
+ "Legal Entity" shall mean the union of the acting entity and all
16
+ other entities that control, are controlled by, or are under common
17
+ control with that entity. For the purposes of this definition,
18
+ "control" means (i) the power, direct or indirect, to cause the
19
+ direction or management of such entity, whether by contract or
20
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
21
+ outstanding shares, or (iii) beneficial ownership of such entity.
22
+
23
+ "You" (or "Your") shall mean an individual or Legal Entity
24
+ exercising permissions granted by this License.
25
+
26
+ "Source" form shall mean the preferred form for making modifications,
27
+ including but not limited to software source code, documentation
28
+ source, and configuration files.
29
+
30
+ "Object" form shall mean any form resulting from mechanical
31
+ transformation or translation of a Source form, including but
32
+ not limited to compiled object code, generated documentation,
33
+ and conversions to other media types.
34
+
35
+ "Work" shall mean the work of authorship, whether in Source or
36
+ Object form, made available under the License, as indicated by a
37
+ copyright notice that is included in or attached to the work
38
+ (an example is provided in the Appendix below).
39
+
40
+ "Derivative Works" shall mean any work, whether in Source or Object
41
+ form, that is based on (or derived from) the Work and for which the
42
+ editorial revisions, annotations, elaborations, or other modifications
43
+ represent, as a whole, an original work of authorship. For the purposes
44
+ of this License, Derivative Works shall not include works that remain
45
+ separable from, or merely link (or bind by name) to the interfaces of,
46
+ the Work and Derivative Works thereof.
47
+
48
+ "Contribution" shall mean any work of authorship, including
49
+ the original version of the Work and any modifications or additions
50
+ to that Work or Derivative Works thereof, that is intentionally
51
+ submitted to Licensor for inclusion in the Work by the copyright owner
52
+ or by an individual or Legal Entity authorized to submit on behalf of
53
+ the copyright owner. For the purposes of this definition, "submitted"
54
+ means any form of electronic, verbal, or written communication sent
55
+ to the Licensor or its representatives, including but not limited to
56
+ communication on electronic mailing lists, source code control systems,
57
+ and issue tracking systems that are managed by, or on behalf of, the
58
+ Licensor for the purpose of discussing and improving the Work, but
59
+ excluding communication that is conspicuously marked or otherwise
60
+ designated in writing by the copyright owner as "Not a Contribution."
61
+
62
+ "Contributor" shall mean Licensor and any individual or Legal Entity
63
+ on behalf of whom a Contribution has been received by Licensor and
64
+ subsequently incorporated within the Work.
65
+
66
+ 2. Grant of Copyright License. Subject to the terms and conditions of
67
+ this License, each Contributor hereby grants to You a perpetual,
68
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69
+ copyright license to reproduce, prepare Derivative Works of,
70
+ publicly display, publicly perform, sublicense, and distribute the
71
+ Work and such Derivative Works in Source or Object form.
72
+
73
+ 3. Grant of Patent License. Subject to the terms and conditions of
74
+ this License, each Contributor hereby grants to You a perpetual,
75
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76
+ (except as stated in this section) patent license to make, have made,
77
+ use, offer to sell, sell, import, and otherwise transfer the Work,
78
+ where such license applies only to those patent claims licensable
79
+ by such Contributor that are necessarily infringed by their
80
+ Contribution(s) alone or by combination of their Contribution(s)
81
+ with the Work to which such Contribution(s) was submitted. If You
82
+ institute patent litigation against any entity (including a
83
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
84
+ or a Contribution incorporated within the Work constitutes direct
85
+ or contributory patent infringement, then any patent licenses
86
+ granted to You under this License for that Work shall terminate
87
+ as of the date such litigation is filed.
88
+
89
+ 4. Redistribution. You may reproduce and distribute copies of the
90
+ Work or Derivative Works thereof in any medium, with or without
91
+ modifications, and in Source or Object form, provided that You
92
+ meet the following conditions:
93
+
94
+ (a) You must give any other recipients of the Work or
95
+ Derivative Works a copy of this License; and
96
+
97
+ (b) You must cause any modified files to carry prominent notices
98
+ stating that You changed the files; and
99
+
100
+ (c) You must retain, in the Source form of any Derivative Works
101
+ that You distribute, all copyright, patent, trademark, and
102
+ attribution notices from the Source form of the Work,
103
+ excluding those notices that do not pertain to any part of
104
+ the Derivative Works; and
105
+
106
+ (d) If the Work includes a "NOTICE" text file as part of its
107
+ distribution, then any Derivative Works that You distribute must
108
+ include a readable copy of the attribution notices contained
109
+ within such NOTICE file, excluding those notices that do not
110
+ pertain to any part of the Derivative Works, in at least one
111
+ of the following places: within a NOTICE text file distributed
112
+ as part of the Derivative Works; within the Source form or
113
+ documentation, if provided along with the Derivative Works; or,
114
+ within a display generated by the Derivative Works, if and
115
+ wherever such third-party notices normally appear. The contents
116
+ of the NOTICE file are for informational purposes only and
117
+ do not modify the License. You may add Your own attribution
118
+ notices within Derivative Works that You distribute, alongside
119
+ or as an addendum to the NOTICE text from the Work, provided
120
+ that such additional attribution notices cannot be construed
121
+ as modifying the License.
122
+
123
+ You may add Your own copyright statement to Your modifications and
124
+ may provide additional or different license terms and conditions
125
+ for use, reproduction, or distribution of Your modifications, or
126
+ for any such Derivative Works as a whole, provided Your use,
127
+ reproduction, and distribution of the Work otherwise complies with
128
+ the conditions stated in this License.
129
+
130
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
131
+ any Contribution intentionally submitted for inclusion in the Work
132
+ by You to the Licensor shall be under the terms and conditions of
133
+ this License, without any additional terms or conditions.
134
+ Notwithstanding the above, nothing herein shall supersede or modify
135
+ the terms of any separate license agreement you may have executed
136
+ with Licensor regarding such Contributions.
137
+
138
+ 6. Trademarks. This License does not grant permission to use the trade
139
+ names, trademarks, service marks, or product names of the Licensor,
140
+ except as required for reasonable and customary use in describing the
141
+ origin of the Work and reproducing the content of the NOTICE file.
142
+
143
+ 7. Disclaimer of Warranty. Unless required by applicable law or
144
+ agreed to in writing, Licensor provides the Work (and each
145
+ Contributor provides its Contributions) on an "AS IS" BASIS,
146
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147
+ implied, including, without limitation, any warranties or conditions
148
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149
+ PARTICULAR PURPOSE. You are solely responsible for determining the
150
+ appropriateness of using or redistributing the Work and assume any
151
+ risks associated with Your exercise of permissions under this License.
152
+
153
+ 8. Limitation of Liability. In no event and under no legal theory,
154
+ whether in tort (including negligence), contract, or otherwise,
155
+ unless required by applicable law (such as deliberate and grossly
156
+ negligent acts) or agreed to in writing, shall any Contributor be
157
+ liable to You for damages, including any direct, indirect, special,
158
+ incidental, or consequential damages of any character arising as a
159
+ result of this License or out of the use or inability to use the
160
+ Work (including but not limited to damages for loss of goodwill,
161
+ work stoppage, computer failure or malfunction, or any and all
162
+ other commercial damages or losses), even if such Contributor
163
+ has been advised of the possibility of such damages.
164
+
165
+ 9. Accepting Warranty or Additional Liability. While redistributing
166
+ the Work or Derivative Works thereof, You may choose to offer,
167
+ and charge a fee for, acceptance of support, warranty, indemnity,
168
+ or other liability obligations and/or rights consistent with this
169
+ License. However, in accepting such obligations, You may act only
170
+ on Your own behalf and on Your sole responsibility, not on behalf
171
+ of any other Contributor, and only if You agree to indemnify,
172
+ defend, and hold each Contributor harmless for any liability
173
+ incurred by, or claims asserted against, such Contributor by reason
174
+ of your accepting any such warranty or additional liability.
175
+
176
+ END OF TERMS AND CONDITIONS
177
+
178
+ APPENDIX: How to apply the Apache License to your work.
179
+
180
+ To apply the Apache License to your work, attach the following
181
+ boilerplate notice, with the fields enclosed by brackets "[]"
182
+ replaced with your own identifying information. (Don't include
183
+ the brackets!) The text should be enclosed in the appropriate
184
+ comment syntax for the file format. We also recommend that a
185
+ file or class name and description of purpose be included on the
186
+ same "printed page" as the copyright notice for easier
187
+ identification within third-party archives.
188
+
189
+ Copyright [2020 - 2026] [XmobiTea Family]
190
+
191
+ Licensed under the Apache License, Version 2.0 (the "License");
192
+ you may not use this file except in compliance with the License.
193
+ You may obtain a copy of the License at
194
+
195
+ http://www.apache.org/licenses/LICENSE-2.0
196
+
197
+ Unless required by applicable law or agreed to in writing, software
198
+ distributed under the License is distributed on an "AS IS" BASIS,
199
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
+ See the License for the specific language governing permissions and
201
+ limitations under the License.
202
+
@@ -6,7 +6,7 @@
6
6
  public class LocalizationKeyAttribute : PropertyAttribute { }
7
7
 
8
8
  [DisallowMultipleComponent]
9
- public class LocalizationComponentBase : MonoBehaviour
9
+ public abstract class LocalizationComponentBase : MonoBehaviour
10
10
  {
11
11
  [LocalizationKey]
12
12
  [SerializeField]
@@ -0,0 +1,5 @@
1
+ namespace XmobiTea.MiniLocalization
2
+ {
3
+ public partial class LocalizationConstantId { }
4
+
5
+ }
@@ -1,11 +1,11 @@
1
- fileFormatVersion: 2
2
- guid: 7da7091580dcd2049ba91061230f9a89
3
- MonoImporter:
4
- externalObjects: {}
5
- serializedVersion: 2
6
- defaultReferences: []
7
- executionOrder: 0
8
- icon: {instanceID: 0}
9
- userData:
10
- assetBundleName:
11
- assetBundleVariant:
1
+ fileFormatVersion: 2
2
+ guid: 7da7091580dcd2049ba91061230f9a89
3
+ MonoImporter:
4
+ externalObjects: {}
5
+ serializedVersion: 2
6
+ defaultReferences: []
7
+ executionOrder: 0
8
+ icon: {instanceID: 0}
9
+ userData:
10
+ assetBundleName:
11
+ assetBundleVariant:
@@ -3,7 +3,7 @@
3
3
  using System;
4
4
  using UnityEngine;
5
5
 
6
- #if ADDRESSABLE
6
+ #if UNITY_USING_ADDRESSABLE
7
7
  using UnityEngine.AddressableAssets;
8
8
  #endif
9
9
 
@@ -22,7 +22,7 @@
22
22
  private TextAsset xml;
23
23
  public TextAsset XML { get { return xml; } set { xml = value; } }
24
24
 
25
- #if ADDRESSABLE
25
+ #if UNITY_USING_ADDRESSABLE
26
26
 
27
27
  [SerializeField]
28
28
  private AssetReferenceT<TextAsset> xmlRef;
@@ -58,7 +58,7 @@
58
58
 
59
59
  if (!Instance.localizationLanguageItemDic.ContainsKey(systemLanguage))
60
60
  {
61
- Debug.LogError("[Localization] " + systemLanguage + " does not esixts!");
61
+ Debug.LogError("[Localization] " + systemLanguage + " does not exist!");
62
62
  return false;
63
63
  }
64
64
 
@@ -100,7 +100,7 @@
100
100
  }
101
101
  }
102
102
 
103
- #if ADDRESSABLE
103
+ #if UNITY_USING_ADDRESSABLE
104
104
  if (thisLanguage.XMLRef != null && thisLanguage.XMLRef.RuntimeKeyIsValid())
105
105
  {
106
106
  thisLanguage.XMLRef.LoadAssetAsync().Completed += (handle) =>
@@ -225,8 +225,8 @@
225
225
 
226
226
  public static string GetTextWithoutBOM(TextAsset textAsset)
227
227
  {
228
- var memoryStream = new MemoryStream(textAsset.bytes);
229
- var streamReader = new StreamReader(memoryStream, true);
228
+ using var memoryStream = new MemoryStream(textAsset.bytes);
229
+ using var streamReader = new StreamReader(memoryStream, true);
230
230
 
231
231
  var result = streamReader.ReadToEnd();
232
232
 
@@ -1,5 +1,7 @@
1
1
  namespace XmobiTea.MiniLocalization
2
2
  {
3
+ #if UNITY_USING_TMPRO
4
+
3
5
  using TMPro;
4
6
  using UnityEngine;
5
7
 
@@ -31,4 +33,6 @@
31
33
  if (mainTxt != null) mainTxt.text = LocalizationManager.GetText(_key);
32
34
  }
33
35
  }
36
+
37
+ #endif
34
38
  }
@@ -1,11 +1,11 @@
1
1
  {
2
2
  "name": "com.xmobitea.changx.mini-localization.runtime",
3
- "rootNamespace": "",
3
+ "rootNamespace": "XmobiTea.MiniLocalization",
4
4
  "references": [
5
5
  "com.xmobitea.changx.mini-singleton.runtime",
6
6
  "Unity.TextMeshPro",
7
- "Unity.Addressables",
8
- "Unity.ResourceManager"
7
+ "Unity.Addressables",
8
+ "Unity.ResourceManager"
9
9
  ],
10
10
  "includePlatforms": [],
11
11
  "excludePlatforms": [],
@@ -14,6 +14,17 @@
14
14
  "precompiledReferences": [],
15
15
  "autoReferenced": true,
16
16
  "defineConstraints": [],
17
- "versionDefines": [],
17
+ "versionDefines": [
18
+ {
19
+ "name": "com.unity.addressables",
20
+ "expression": "",
21
+ "define": "UNITY_USING_ADDRESSABLE"
22
+ },
23
+ {
24
+ "name": "com.unity.textmeshpro",
25
+ "expression": "",
26
+ "define": "UNITY_USING_TMPRO"
27
+ }
28
+ ],
18
29
  "noEngineReferences": false
19
30
  }
package/package.json CHANGED
@@ -1,19 +1,19 @@
1
1
  {
2
- "name": "com.xmobitea.changx.mini-localization",
3
- "version": "1.4.7",
4
- "displayName": "XmobiTea Localization",
5
- "description": "XmobiTea Unity package",
6
- "unity": "2020.3",
7
- "dependencies": {},
8
- "keywords": [
9
- "chang x",
10
- "changx",
11
- "xmobitea"
12
- ],
13
- "author": "Chang X <changx.develop@gmail.com> (https://xmobitea.com)",
14
- "main": "index.js",
15
- "scripts": {
16
- "test": "echo \"Error: no test specified\" && exit 1"
17
- },
18
- "license": "ISC"
2
+ "name": "com.xmobitea.changx.mini-localization",
3
+ "version": "1.4.9",
4
+ "displayName": "XmobiTea Localization",
5
+ "description": "XmobiTea Unity Toolkit packages",
6
+ "unity": "2020.3",
7
+ "dependencies": {
8
+ "com.xmobitea.changx.app": "1.4.0",
9
+ "com.xmobitea.changx.mini-autogenerate": "1.4.0",
10
+ "com.xmobitea.changx.mini-singleton": "1.4.0"
11
+ },
12
+ "keywords": [
13
+ "chang x",
14
+ "changx",
15
+ "xmobitea"
16
+ ],
17
+ "author": "Chang X <changx.develop@gmail.com> (https://xmobitea.com)",
18
+ "license": "Apache-2.0"
19
19
  }
@@ -1,7 +0,0 @@
1
- fileFormatVersion: 2
2
- guid: 51ee6a61c4b2e81498ff995e7ef42aa8
3
- DefaultImporter:
4
- externalObjects: {}
5
- userData:
6
- assetBundleName:
7
- assetBundleVariant:
@@ -1,7 +0,0 @@
1
- fileFormatVersion: 2
2
- guid: 2ab4b2d5d7d41094ba11dd2559be72b5
3
- DefaultImporter:
4
- externalObjects: {}
5
- userData:
6
- assetBundleName:
7
- assetBundleVariant:
@@ -1,7 +0,0 @@
1
- fileFormatVersion: 2
2
- guid: dd46034cda2ff664ab2c6d6b2e24278d
3
- DefaultImporter:
4
- externalObjects: {}
5
- userData:
6
- assetBundleName:
7
- assetBundleVariant:
@@ -1,5 +0,0 @@
1
- namespace XmobiTea.MiniLocalization
2
- {
3
- public partial class LocalizationConstanceId { }
4
-
5
- }