Skip to content

Commit 0bcdd71

Browse files
committed
Update else.
1 parent 5f2eba4 commit 0bcdd71

File tree

5 files changed

+38
-38
lines changed

5 files changed

+38
-38
lines changed

Assets/Resources/JCSUnity_Resources/JCS_Managers.prefab

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ GameObject:
2626
- component: {fileID: 11461692}
2727
- component: {fileID: 11407940}
2828
- component: {fileID: 114914540437033550}
29-
- component: {fileID: -1332835446664361958}
3029
m_Layer: 0
3130
m_Name: JCS_Managers
3231
m_TagString: Untagged
@@ -397,23 +396,6 @@ MonoBehaviour:
397396
m_EditorClassIdentifier:
398397
mPauseActions: []
399398
mResizePauseActionListTime: 20
400-
--- !u!114 &-1332835446664361958
401-
MonoBehaviour:
402-
m_ObjectHideFlags: 0
403-
m_CorrespondingSourceObject: {fileID: 0}
404-
m_PrefabInstance: {fileID: 0}
405-
m_PrefabAsset: {fileID: 0}
406-
m_GameObject: {fileID: 135910}
407-
m_Enabled: 1
408-
m_EditorHideFlags: 0
409-
m_Script: {fileID: 11500000, guid: 3e490bbba26129644858e6c0d8864796, type: 3}
410-
m_Name:
411-
m_EditorClassIdentifier:
412-
mDownloadList: []
413-
mRequesting: 0
414-
mRequestURL:
415-
mRequestPath:
416-
mPreloadPath: []
417399
--- !u!1 &1678435913
418400
GameObject:
419401
m_ObjectHideFlags: 0

Assets/Resources/JCSUnity_Resources/JCS_Settings.prefab

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ GameObject:
2121
- component: {fileID: 5090550957556680191}
2222
- component: {fileID: 5090550957556680188}
2323
- component: {fileID: 5090550957556680189}
24+
- component: {fileID: 8092299366469891948}
2425
m_Layer: 0
2526
m_Name: JCS_Settings
2627
m_TagString: Untagged
@@ -267,6 +268,23 @@ MonoBehaviour:
267268
type: 3}
268269
DEFAULT_CLOSE_WINDOW_CLIP: {fileID: 8300000, guid: 736e87ccc3170ce408ca6cf0785e0ee5,
269270
type: 3}
271+
--- !u!114 &8092299366469891948
272+
MonoBehaviour:
273+
m_ObjectHideFlags: 0
274+
m_CorrespondingSourceObject: {fileID: 0}
275+
m_PrefabInstance: {fileID: 0}
276+
m_PrefabAsset: {fileID: 0}
277+
m_GameObject: {fileID: 5090550957556680186}
278+
m_Enabled: 1
279+
m_EditorHideFlags: 0
280+
m_Script: {fileID: 11500000, guid: 3e490bbba26129644858e6c0d8864796, type: 3}
281+
m_Name:
282+
m_EditorClassIdentifier:
283+
mDownloadList: []
284+
mRequesting: 0
285+
mRequestURL:
286+
mRequestPath:
287+
preloadPath: []
270288
--- !u!1 &5090550958201105579
271289
GameObject:
272290
m_ObjectHideFlags: 0

Assets/StreamingAssets/build_info

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Build from DESKTOP-KVGQGUF at 8/4/2020 1:07:15 AM
1+
Build from DESKTOP-KVGQGUF at 8/4/2020 7:42:43 PM

Assets/_FrameworkTest_Assets/Scenes/FT_StreamingAssets.unity

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -745,6 +745,7 @@ GameObject:
745745
- component: {fileID: 1190060616}
746746
- component: {fileID: 1190060615}
747747
- component: {fileID: 1190060614}
748+
- component: {fileID: 1190060627}
748749
m_Layer: 0
749750
m_Name: JCS_Settings
750751
m_TagString: Untagged
@@ -991,6 +992,23 @@ Transform:
991992
m_Father: {fileID: 0}
992993
m_RootOrder: 0
993994
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
995+
--- !u!114 &1190060627
996+
MonoBehaviour:
997+
m_ObjectHideFlags: 0
998+
m_CorrespondingSourceObject: {fileID: 0}
999+
m_PrefabInstance: {fileID: 0}
1000+
m_PrefabAsset: {fileID: 0}
1001+
m_GameObject: {fileID: 1190060613}
1002+
m_Enabled: 1
1003+
m_EditorHideFlags: 0
1004+
m_Script: {fileID: 11500000, guid: 3e490bbba26129644858e6c0d8864796, type: 3}
1005+
m_Name:
1006+
m_EditorClassIdentifier:
1007+
mDownloadList: []
1008+
mRequesting: 0
1009+
mRequestURL:
1010+
mRequestPath:
1011+
preloadPath: []
9941012
--- !u!1 &1401617339
9951013
GameObject:
9961014
m_ObjectHideFlags: 0
@@ -1352,31 +1370,13 @@ GameObject:
13521370
- component: {fileID: 2097998341}
13531371
- component: {fileID: 2097998340}
13541372
- component: {fileID: 2097998339}
1355-
- component: {fileID: 2097998338}
13561373
m_Layer: 0
13571374
m_Name: JCS_Managers
13581375
m_TagString: Untagged
13591376
m_Icon: {fileID: 2974397684917235467, guid: 0000000000000000d000000000000000, type: 0}
13601377
m_NavMeshLayer: 0
13611378
m_StaticEditorFlags: 0
13621379
m_IsActive: 1
1363-
--- !u!114 &2097998338
1364-
MonoBehaviour:
1365-
m_ObjectHideFlags: 0
1366-
m_CorrespondingSourceObject: {fileID: 0}
1367-
m_PrefabInstance: {fileID: 0}
1368-
m_PrefabAsset: {fileID: 0}
1369-
m_GameObject: {fileID: 2097998337}
1370-
m_Enabled: 1
1371-
m_EditorHideFlags: 0
1372-
m_Script: {fileID: 11500000, guid: 3e490bbba26129644858e6c0d8864796, type: 3}
1373-
m_Name:
1374-
m_EditorClassIdentifier:
1375-
mDownloadList: []
1376-
mRequesting: 0
1377-
mRequestURL:
1378-
mRequestPath:
1379-
preloadPath: []
13801380
--- !u!114 &2097998339
13811381
MonoBehaviour:
13821382
m_ObjectHideFlags: 0

Assets/_FrameworkTest_Assets/Scripts/FT_StreamingAssets.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private void Update()
5252

5353
if (data != null)
5454
{
55-
string test = Encoding.ASCII.GetString(data);
55+
string test = JCS_ResConverter.AsText(data, JCS_CharsetType.ASCII);
5656
print(test);
5757
}
5858
}

0 commit comments

Comments
 (0)