Skip to content

Commit 57ae5a4

Browse files
xiaoguzhuxiaoguzhu
committed
add macro FAIRYGUI_USE_ALPHA_TEXTURE to manually toggle seperate alpha texture feature
1 parent 1024ede commit 57ae5a4

File tree

7 files changed

+150
-18
lines changed

7 files changed

+150
-18
lines changed

‎Assets/Scripts/UI/UIPackage.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,6 +1312,7 @@ void LoadAtlas(PackageItem item)
13121312
Debug.LogWarning("FairyGUI: settings for '" + item.file + "' is wrong! Correct values are: (Generate Mip Maps=unchecked)");
13131313
}
13141314

1315+
#if FAIRYGUI_USE_ALPHA_TEXTURE
13151316
if (tex != null)
13161317
{
13171318
fileName = fileName + "!a";
@@ -1323,6 +1324,7 @@ void LoadAtlas(PackageItem item)
13231324
else
13241325
alphaTex = (Texture2D)_loadFunc(fileName, ext, typeof(Texture2D), out dm);
13251326
}
1327+
#endif
13261328

13271329
if (tex == null)
13281330
{

‎Packages/manifest.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"dependencies": {
3+
"com.unity.ide.visualstudio": "2.0.22",
4+
"com.unity.inputsystem": "1.7.0",
35
"com.unity.textmeshpro": "1.5.6",
46
"com.unity.ugui": "1.0.0",
57
"com.unity.modules.androidjni": "1.0.0",

‎ProjectSettings/EditorBuildSettings.asset

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@ EditorBuildSettings:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Scenes:
8+
- enabled: 1
9+
path: Assets/Examples/Scenes/Example 01 - Basics.unity
10+
guid: 97fd62303685de449a991eaa58a92cd5
811
- enabled: 1
912
path: Assets/Examples/Scenes/scene1.unity
1013
guid: 6940e9cae0b012148b4848f1c72c314a
1114
- enabled: 1
1215
path: Assets/Examples/Scenes/scene2.unity
1316
guid: 44b386c5d0d35be45b1a3f0e55977f62
17+
m_configObjects: {}

‎ProjectSettings/EditorSettings.asset

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,45 @@
33
--- !u!159 &1
44
EditorSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 5
7-
m_ExternalVersionControlSupport: Hidden Meta Files
6+
serializedVersion: 12
87
m_SerializationMode: 2
8+
m_LineEndingsForNewScripts: 1
99
m_DefaultBehaviorMode: 0
10+
m_PrefabRegularEnvironment: {fileID: 0}
11+
m_PrefabUIEnvironment: {fileID: 0}
1012
m_SpritePackerMode: 0
13+
m_SpritePackerCacheSize: 10
1114
m_SpritePackerPaddingPower: 1
15+
m_Bc7TextureCompressor: 0
1216
m_EtcTextureCompressorBehavior: 1
1317
m_EtcTextureFastCompressor: 1
1418
m_EtcTextureNormalCompressor: 2
1519
m_EtcTextureBestCompressor: 4
16-
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd
20+
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmref
1721
m_ProjectGenerationRootNamespace:
18-
m_UserGeneratedProjectSuffix:
19-
m_CollabEditorSettings:
20-
inProgressEnabled: 1
22+
m_EnableTextureStreamingInEditMode: 1
23+
m_EnableTextureStreamingInPlayMode: 1
24+
m_EnableEditorAsyncCPUTextureLoading: 0
25+
m_AsyncShaderCompilation: 1
26+
m_PrefabModeAllowAutoSave: 1
27+
m_EnterPlayModeOptionsEnabled: 0
28+
m_EnterPlayModeOptions: 3
29+
m_GameObjectNamingDigits: 1
30+
m_GameObjectNamingScheme: 0
31+
m_AssetNamingUsesSpace: 1
32+
m_InspectorUseIMGUIDefaultInspector: 0
33+
m_UseLegacyProbeSampleCount: 1
34+
m_SerializeInlineMappingsOnOneLine: 0
35+
m_DisableCookiesInLightmapper: 1
36+
m_AssetPipelineMode: 1
37+
m_RefreshImportMode: 0
38+
m_CacheServerMode: 0
39+
m_CacheServerEndpoint:
40+
m_CacheServerNamespacePrefix: default
41+
m_CacheServerEnableDownload: 1
42+
m_CacheServerEnableUpload: 1
43+
m_CacheServerEnableAuth: 0
44+
m_CacheServerEnableTls: 0
45+
m_CacheServerValidationMode: 2
46+
m_CacheServerDownloadBatchSize: 128
47+
m_EnableEnlightenBakedGI: 0

‎ProjectSettings/PackageManagerSettings.asset

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ MonoBehaviour:
1717
m_ScopedRegistriesSettingsExpanded: 1
1818
m_SeeAllPackageVersions: 0
1919
m_DismissPreviewPackagesInUse: 0
20-
oneTimeWarningShown: 0
20+
oneTimeWarningShown: 1
2121
m_Registries:
2222
- m_Id: main
2323
m_Name:
@@ -31,6 +31,6 @@ MonoBehaviour:
3131
m_RegistryInfoDraft:
3232
m_Modified: 0
3333
m_ErrorMessage:
34-
m_UserModificationsInstanceId: -836
35-
m_OriginalInstanceId: -838
34+
m_UserModificationsInstanceId: -830
35+
m_OriginalInstanceId: -832
3636
m_LoadAssets: 0

‎ProjectSettings/ProjectSettings.asset

Lines changed: 96 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ PlayerSettings:
159159
androidSupportedAspectRatio: 1
160160
androidMaxAspectRatio: 2.1
161161
applicationIdentifier:
162+
Android: com.DefaultCompany.FairyGUIunity
162163
Standalone: com.DefaultCompany.FairyGUI-unity
163164
buildNumber:
164165
Standalone: 0
@@ -281,7 +282,99 @@ PlayerSettings:
281282
AndroidValidateAppBundleSize: 1
282283
AndroidAppBundleSizeToValidate: 150
283284
m_BuildTargetIcons: []
284-
m_BuildTargetPlatformIcons: []
285+
m_BuildTargetPlatformIcons:
286+
- m_BuildTarget: Android
287+
m_Icons:
288+
- m_Textures: []
289+
m_Width: 432
290+
m_Height: 432
291+
m_Kind: 2
292+
m_SubKind:
293+
- m_Textures: []
294+
m_Width: 324
295+
m_Height: 324
296+
m_Kind: 2
297+
m_SubKind:
298+
- m_Textures: []
299+
m_Width: 216
300+
m_Height: 216
301+
m_Kind: 2
302+
m_SubKind:
303+
- m_Textures: []
304+
m_Width: 162
305+
m_Height: 162
306+
m_Kind: 2
307+
m_SubKind:
308+
- m_Textures: []
309+
m_Width: 108
310+
m_Height: 108
311+
m_Kind: 2
312+
m_SubKind:
313+
- m_Textures: []
314+
m_Width: 81
315+
m_Height: 81
316+
m_Kind: 2
317+
m_SubKind:
318+
- m_Textures: []
319+
m_Width: 192
320+
m_Height: 192
321+
m_Kind: 1
322+
m_SubKind:
323+
- m_Textures: []
324+
m_Width: 144
325+
m_Height: 144
326+
m_Kind: 1
327+
m_SubKind:
328+
- m_Textures: []
329+
m_Width: 96
330+
m_Height: 96
331+
m_Kind: 1
332+
m_SubKind:
333+
- m_Textures: []
334+
m_Width: 72
335+
m_Height: 72
336+
m_Kind: 1
337+
m_SubKind:
338+
- m_Textures: []
339+
m_Width: 48
340+
m_Height: 48
341+
m_Kind: 1
342+
m_SubKind:
343+
- m_Textures: []
344+
m_Width: 36
345+
m_Height: 36
346+
m_Kind: 1
347+
m_SubKind:
348+
- m_Textures: []
349+
m_Width: 192
350+
m_Height: 192
351+
m_Kind: 0
352+
m_SubKind:
353+
- m_Textures: []
354+
m_Width: 144
355+
m_Height: 144
356+
m_Kind: 0
357+
m_SubKind:
358+
- m_Textures: []
359+
m_Width: 96
360+
m_Height: 96
361+
m_Kind: 0
362+
m_SubKind:
363+
- m_Textures: []
364+
m_Width: 72
365+
m_Height: 72
366+
m_Kind: 0
367+
m_SubKind:
368+
- m_Textures: []
369+
m_Width: 48
370+
m_Height: 48
371+
m_Kind: 0
372+
m_SubKind:
373+
- m_Textures: []
374+
m_Width: 36
375+
m_Height: 36
376+
m_Kind: 0
377+
m_SubKind:
285378
m_BuildTargetBatching: []
286379
m_BuildTargetShaderSettings: []
287380
m_BuildTargetGraphicsJobs:
@@ -622,7 +715,7 @@ PlayerSettings:
622715
webGLMemoryGeometricGrowthCap: 96
623716
webGLPowerPreference: 2
624717
scriptingDefineSymbols:
625-
Standalone: FAIRYGUI_TMPRO
718+
Standalone: FAIRYGUI_TMPRO;FAIRYGUI_INPUT_SYSTEM
626719
additionalCompilerArguments: {}
627720
platformArchitecture: {}
628721
scriptingBackend: {}
@@ -728,7 +821,7 @@ PlayerSettings:
728821
hmiLogStartupTiming: 0
729822
hmiCpuConfiguration:
730823
apiCompatibilityLevel: 6
731-
activeInputHandler: 0
824+
activeInputHandler: 2
732825
windowsGamepadBackendHint: 0
733826
cloudProjectId:
734827
framebufferDepthMemorylessMode: 0

‎ProjectSettings/UnityConnectSettings.asset

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,29 @@
33
--- !u!310 &1
44
UnityConnectSettings:
55
m_ObjectHideFlags: 0
6+
serializedVersion: 1
67
m_Enabled: 0
78
m_TestMode: 0
8-
m_TestEventUrl:
9-
m_TestConfigUrl:
9+
m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
10+
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
11+
m_ConfigUrl: https://config.uca.cloud.unity3d.com
12+
m_DashboardUrl: https://dashboard.unity3d.com
13+
m_CNEventUrl: https://cdp.cloud.unity.cn/v1/events
14+
m_CNConfigUrl: https://cdp.cloud.unity.cn/config
1015
m_TestInitMode: 0
1116
CrashReportingSettings:
1217
m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes
13-
m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate
1418
m_Enabled: 0
19+
m_LogBufferSize: 10
1520
m_CaptureEditorExceptions: 1
1621
UnityPurchasingSettings:
1722
m_Enabled: 0
1823
m_TestMode: 0
1924
UnityAnalyticsSettings:
2025
m_Enabled: 0
21-
m_InitializeOnStartup: 1
2226
m_TestMode: 0
23-
m_TestEventUrl:
24-
m_TestConfigUrl:
27+
m_InitializeOnStartup: 1
28+
m_PackageRequiringCoreStatsPresent: 0
2529
UnityAdsSettings:
2630
m_Enabled: 0
2731
m_InitializeOnStartup: 1

0 commit comments

Comments
 (0)