export-table-pulgin-csharp 1.1.161 → 1.1.163

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 (4) hide show
  1. package/dist/ExportUnityCSJsonPlugin.d.ts.map +1 -1
  2. package/dist/ExportUnityCSJsonPlugin.js +25 -14
  3. package/package.json +2 -2
  4. package/src/ExportUnityCSJsonPlugin.ts +25 -14
package/dist/ExportUnityCSJsonPlugin.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ExportUnityCSJsonPlugin.d.ts","sourceRoot":"","sources":["../src/ExportUnityCSJsonPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAAE,iBAAiB,EAAqC,MAAM,kBAAkB,CAAA;AAQxJ,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA+DnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA2GzE;AAED,qBAAa,iBAAkB,SAAQ,UAAU;IAChD,IAAI,SAAU;IACd,IAAI,EAAE,MAAM,EAAE,CAAY;IAE1B,WAAW,CAAC,KAAK,EAAE,iBAAiB;IAmBpC,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;CA4C3C"}
1
+ {"version":3,"file":"ExportUnityCSJsonPlugin.d.ts","sourceRoot":"","sources":["../src/ExportUnityCSJsonPlugin.ts"],"names":[],"mappings":"AACA,OAAO,EAAO,iBAAiB,EAA+B,UAAU,EAAE,iBAAiB,EAAqC,MAAM,kBAAkB,CAAA;AAQxJ,wBAAgB,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CA+DnE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAsHzE;AAED,qBAAa,iBAAkB,SAAQ,UAAU;IAChD,IAAI,SAAU;IACd,IAAI,EAAE,MAAM,EAAE,CAAY;IAE1B,WAAW,CAAC,KAAK,EAAE,iBAAiB;IAmBpC,WAAW,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;CA4C3C"}
package/dist/ExportUnityCSJsonPlugin.js CHANGED
@@ -115,29 +115,40 @@ namespace ${exportNamespace}
115
115
  }
116
116
 
117
117
  public const string LoadUrl = "Assets/Bundles/GameConfigs/Auto/${fullName}${fileExt}";
118
+ public static int LoadState = 0;
119
+ public static bool IsLoadedSuccessfully => LoadState == 4;
120
+ public static bool IsComplete => LoadState != 0;
118
121
 
119
122
  public static async Task Load()
120
123
  {
121
- var loadUrl = LoadUrl;
122
- var configLiteral = await ConfigAssetLoader.LoadAssetAsync(loadUrl);
123
- if (configLiteral != null)
124
+ if (LoadState <= 0)
124
125
  {
125
- Debug.Log($"解析配表: {loadUrl}");
126
- try
126
+ LoadState = 1;
127
+ var loadUrl = LoadUrl;
128
+ var configLiteral = await ConfigAssetLoader.LoadAssetAsync(loadUrl);
129
+ if (configLiteral != null)
127
130
  {
128
- // JsonUtility.FromJsonOverwrite("{\\"a\\":"+configLiteral+"}", obj);
129
- ConfigAssetLoader.LoadConfigs(configLiteral, Configs);
131
+ Debug.Log($"解析配表: {loadUrl}");
132
+ try
133
+ {
134
+ // JsonUtility.FromJsonOverwrite("{\"a\":"+configLiteral+"}", obj);
135
+ LoadState = 2;
136
+ ConfigAssetLoader.LoadConfigs(configLiteral, Configs);
137
+ LoadState = 4;
138
+ }
139
+ catch (System.Exception ex)
140
+ {
141
+ LoadState = -2;
142
+ Debug.LogError($"解析配表失败: {loadUrl}");
143
+ throw ex;
144
+ }
130
145
  }
131
- catch(System.Exception ex)
146
+ else
132
147
  {
133
- Debug.LogError($"解析配表失败: {loadUrl}");
134
- throw ex;
148
+ LoadState = -1;
149
+ Debug.LogError($"配表资源缺失: {loadUrl}");
135
150
  }
136
151
  }
137
- else
138
- {
139
- Debug.LogError($"配表资源缺失: {loadUrl}");
140
- }
141
152
  }
142
153
 
143
154
  #if UNITY_EDITOR
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "export-table-pulgin-csharp",
3
- "version": "1.1.161",
3
+ "version": "1.1.163",
4
4
  "description": "",
5
5
  "main": "./dist/index.js",
6
6
  "scripts": {},
@@ -13,7 +13,7 @@
13
13
  "dependencies": {
14
14
  "@types/commander": "2.12.2",
15
15
  "@types/node": "^17.0.18",
16
- "export-table-lib": "^1.0.66",
16
+ "export-table-lib": "^1.0.67",
17
17
  "fs": "^0.0.1-security",
18
18
  "fs-extra": "^10.0.0",
19
19
  "fse": "^4.0.1"
package/src/ExportUnityCSJsonPlugin.ts CHANGED
@@ -115,29 +115,40 @@ namespace ${exportNamespace}
115
115
  }
116
116
 
117
117
  public const string LoadUrl = "Assets/Bundles/GameConfigs/Auto/${fullName}${fileExt}";
118
+ public static int LoadState = 0;
119
+ public static bool IsLoadedSuccessfully => LoadState == 4;
120
+ public static bool IsComplete => LoadState != 0;
118
121
 
119
122
  public static async Task Load()
120
123
  {
121
- var loadUrl = LoadUrl;
122
- var configLiteral = await ConfigAssetLoader.LoadAssetAsync(loadUrl);
123
- if (configLiteral != null)
124
+ if (LoadState <= 0)
124
125
  {
125
- Debug.Log($"解析配表: {loadUrl}");
126
- try
126
+ LoadState = 1;
127
+ var loadUrl = LoadUrl;
128
+ var configLiteral = await ConfigAssetLoader.LoadAssetAsync(loadUrl);
129
+ if (configLiteral != null)
127
130
  {
128
- // JsonUtility.FromJsonOverwrite("{\\"a\\":"+configLiteral+"}", obj);
129
- ConfigAssetLoader.LoadConfigs(configLiteral, Configs);
131
+ Debug.Log($"解析配表: {loadUrl}");
132
+ try
133
+ {
134
+ // JsonUtility.FromJsonOverwrite("{\"a\":"+configLiteral+"}", obj);
135
+ LoadState = 2;
136
+ ConfigAssetLoader.LoadConfigs(configLiteral, Configs);
137
+ LoadState = 4;
138
+ }
139
+ catch (System.Exception ex)
140
+ {
141
+ LoadState = -2;
142
+ Debug.LogError($"解析配表失败: {loadUrl}");
143
+ throw ex;
144
+ }
130
145
  }
131
- catch(System.Exception ex)
146
+ else
132
147
  {
133
- Debug.LogError($"解析配表失败: {loadUrl}");
134
- throw ex;
148
+ LoadState = -1;
149
+ Debug.LogError($"配表资源缺失: {loadUrl}");
135
150
  }
136
151
  }
137
- else
138
- {
139
- Debug.LogError($"配表资源缺失: {loadUrl}");
140
- }
141
152
  }
142
153
 
143
154
  #if UNITY_EDITOR