Skip to content

Commit 3ba1421

Browse files
noodle1983noodle1983
committed
unity2022
1 parent 7be25c2 commit 3ba1421

File tree

6 files changed

+117
-35
lines changed

6 files changed

+117
-35
lines changed

‎Assets/AndroidIl2cppPatchDemo/Editor/AndroidBuilder.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ static bool Exec(string filename, string args)
4242
Debug.Log("========================================================");
4343
Debug.LogFormat("exec:{0}, args:{1}", filename, args);
4444
System.Diagnostics.Process process = new System.Diagnostics.Process();
45-
process.StartInfo.FileName = filename;
46-
process.StartInfo.Arguments = args;
47-
process.StartInfo.UseShellExecute = false;
48-
process.StartInfo.CreateNoWindow = true;
49-
process.StartInfo.RedirectStandardOutput = true;
50-
process.StartInfo.RedirectStandardError = true;
51-
process.OutputDataReceived += (sender, args) => Debug.Log(args.Data);
52-
process.ErrorDataReceived += (sender, args) => Debug.LogError(args.Data);
45+
var startinfo = new System.Diagnostics.ProcessStartInfo("cmd.exe", "/C " + filename + " " + args);
46+
startinfo.RedirectStandardOutput = true;
47+
startinfo.RedirectStandardError = true;
48+
startinfo.UseShellExecute = false;
49+
startinfo.CreateNoWindow = true;
50+
process.StartInfo = startinfo;
51+
process.OutputDataReceived += (sender, args) => { if (args.Data != null) { Debug.Log(args.Data); } };
52+
process.ErrorDataReceived += (sender, args) => { if (args.Data != null) { Debug.LogError(args.Data); } };
5353

5454
int exit_code = -1;
5555

‎Packages/manifest.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"com.unity.2d.sprite": "1.0.0",
44
"com.unity.2d.tilemap": "1.0.0",
55
"com.unity.ads": "4.4.2",
6-
"com.unity.analytics": "3.6.12",
7-
"com.unity.collab-proxy": "2.1.0",
8-
"com.unity.ide.rider": "3.0.26",
6+
"com.unity.ai.navigation": "1.1.5",
7+
"com.unity.analytics": "3.8.1",
8+
"com.unity.collab-proxy": "2.2.0",
9+
"com.unity.ide.rider": "3.0.27",
910
"com.unity.ide.visualstudio": "2.0.22",
1011
"com.unity.ide.vscode": "1.2.5",
11-
"com.unity.multiplayer-hlapi": "1.0.6",
1212
"com.unity.purchasing": "4.9.4",
1313
"com.unity.test-framework": "1.1.33",
1414
"com.unity.textmeshpro": "3.0.6",
15-
"com.unity.timeline": "1.6.5",
15+
"com.unity.timeline": "1.7.6",
1616
"com.unity.ugui": "1.0.0",
1717
"com.unity.xr.legacyinputhelpers": "2.1.10",
1818
"com.unity.modules.ai": "1.0.0",

‎ProjectSettings/ProjectSettings.asset‎

Lines changed: 40 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!129 &1
44
PlayerSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 24
6+
serializedVersion: 26
77
productGUID: 19ecc7c7850bc3f48a2232de05a62cce
88
AndroidProfiler: 0
99
AndroidFilterTouchesWhenObscured: 0
@@ -48,14 +48,16 @@ PlayerSettings:
4848
defaultScreenHeightWeb: 600
4949
m_StereoRenderingPath: 0
5050
m_ActiveColorSpace: 0
51+
unsupportedMSAAFallback: 0
52+
m_SpriteBatchVertexThreshold: 300
5153
m_MTRendering: 1
5254
mipStripping: 0
5355
numberOfMipsStripped: 0
56+
numberOfMipsStrippedPerMipmapLimitGroup: {}
5457
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
5558
iosShowActivityIndicatorOnLoading: -1
5659
androidShowActivityIndicatorOnLoading: -1
5760
iosUseCustomAppBackgroundBehavior: 0
58-
iosAllowHTTPDownload: 1
5961
allowedAutorotateToPortrait: 1
6062
allowedAutorotateToPortraitUpsideDown: 1
6163
allowedAutorotateToLandscapeRight: 1
@@ -85,6 +87,7 @@ PlayerSettings:
8587
hideHomeButton: 0
8688
submitAnalytics: 1
8789
usePlayerLog: 1
90+
dedicatedServerOptimizations: 0
8891
bakeCollisionMeshes: 0
8992
forceSingleInstance: 0
9093
useFlipModelSwapchain: 1
@@ -119,8 +122,11 @@ PlayerSettings:
119122
switchNVNShaderPoolsGranularity: 33554432
120123
switchNVNDefaultPoolsGranularity: 16777216
121124
switchNVNOtherPoolsGranularity: 16777216
125+
switchGpuScratchPoolGranularity: 2097152
126+
switchAllowGpuScratchShrinking: 0
122127
switchNVNMaxPublicTextureIDCount: 0
123128
switchNVNMaxPublicSamplerIDCount: 0
129+
switchNVNGraphicsFirmwareMemory: 32
124130
switchMaxWorkerMultiple: 8
125131
stadiaPresentMode: 0
126132
stadiaTargetFramerate: 0
@@ -129,12 +135,7 @@ PlayerSettings:
129135
vulkanEnablePreTransform: 0
130136
vulkanEnableLateAcquireNextImage: 0
131137
vulkanEnableCommandBufferRecycling: 1
132-
m_SupportedAspectRatios:
133-
4:3: 1
134-
5:4: 1
135-
16:10: 1
136-
16:9: 1
137-
Others: 1
138+
loadStoreDebugModeEnabled: 0
138139
bundleVersion: 1.1
139140
preloadedAssets: []
140141
metroInputSource: 0
@@ -147,8 +148,9 @@ PlayerSettings:
147148
isWsaHolographicRemotingEnabled: 0
148149
enableFrameTimingStats: 0
149150
enableOpenGLProfilerGPURecorders: 1
151+
allowHDRDisplaySupport: 0
150152
useHDRDisplay: 0
151-
D3DHDRBitDepth: 0
153+
hdrBitDepth: 0
152154
m_ColorGamuts: 00000000
153155
targetPixelDensity: 30
154156
resolutionScalingMode: 0
@@ -160,12 +162,13 @@ PlayerSettings:
160162
Standalone: cn.noodle1983.unitypatchdemo
161163
buildNumber:
162164
Standalone: 0
165+
VisionOS: 0
163166
iPhone: 0
164167
tvOS: 0
165168
overrideDefaultApplicationIdentifier: 1
166169
AndroidBundleVersionCode: 2
167170
AndroidMinSdkVersion: 22
168-
AndroidTargetSdkVersion: 29
171+
AndroidTargetSdkVersion: 0
169172
AndroidPreferredInstallLocation: 1
170173
aotOptions:
171174
stripEngineCode: 0
@@ -177,12 +180,15 @@ PlayerSettings:
177180
APKExpansionFiles: 0
178181
keepLoadedShadersAlive: 0
179182
StripUnusedMeshComponents: 0
183+
strictShaderVariantMatching: 0
180184
VertexChannelCompressionMask: 214
181185
iPhoneSdkVersion: 988
182186
iOSTargetOSVersionString: 12.0
183187
tvOSSdkVersion: 0
184188
tvOSRequireExtendedGameController: 0
185189
tvOSTargetOSVersionString: 12.0
190+
VisionOSSdkVersion: 0
191+
VisionOSTargetOSVersionString: 1.0
186192
uIPrerenderedIcon: 0
187193
uIRequiresPersistentWiFi: 0
188194
uIRequiresFullScreen: 1
@@ -230,8 +236,10 @@ PlayerSettings:
230236
appleDeveloperTeamID:
231237
iOSManualSigningProvisioningProfileID:
232238
tvOSManualSigningProvisioningProfileID:
239+
VisionOSManualSigningProvisioningProfileID:
233240
iOSManualSigningProvisioningProfileType: 0
234241
tvOSManualSigningProvisioningProfileType: 0
242+
VisionOSManualSigningProvisioningProfileType: 0
235243
appleEnableAutomaticSigning: 0
236244
iOSRequireARKit: 0
237245
iOSAutomaticallyDetectAndAddCapabilities: 1
@@ -246,13 +254,15 @@ PlayerSettings:
246254
useCustomLauncherGradleManifest: 0
247255
useCustomBaseGradleTemplate: 0
248256
useCustomGradlePropertiesTemplate: 0
257+
useCustomGradleSettingsTemplate: 0
249258
useCustomProguardFile: 0
250259
AndroidTargetArchitectures: 3
251260
AndroidTargetDevices: 0
252261
AndroidSplashScreenScale: 0
253262
androidSplashScreen: {fileID: 0}
254263
AndroidKeystoreName: '{inproject}: '
255264
AndroidKeyaliasName:
265+
AndroidEnableArmv9SecurityFeatures: 0
256266
AndroidBuildApkPerCpuArchitecture: 0
257267
AndroidTVCompatibility: 1
258268
AndroidIsGame: 1
@@ -266,7 +276,6 @@ PlayerSettings:
266276
banner: {fileID: 0}
267277
androidGamepadSupportLevel: 0
268278
chromeosInputEmulation: 1
269-
AndroidMinifyWithR8: 0
270279
AndroidMinifyRelease: 0
271280
AndroidMinifyDebug: 0
272281
AndroidValidateAppBundleSize: 1
@@ -443,7 +452,9 @@ PlayerSettings:
443452
m_EncodingQuality: 1
444453
- m_BuildTarget: PS4
445454
m_EncodingQuality: 1
455+
m_BuildTargetGroupHDRCubemapEncodingQuality: []
446456
m_BuildTargetGroupLightmapSettings: []
457+
m_BuildTargetGroupLoadStoreDebugModeSettings: []
447458
m_BuildTargetNormalMapEncoding: []
448459
m_BuildTargetDefaultTextureCompressionFormat: []
449460
playModeTestRunnerEnabled: 0
@@ -456,6 +467,7 @@ PlayerSettings:
456467
locationUsageDescription:
457468
microphoneUsageDescription:
458469
bluetoothUsageDescription:
470+
macOSTargetOSVersion: 10.13.0
459471
switchNMETAOverride:
460472
switchNetLibKey:
461473
switchSocketMemoryPoolSize: 6144
@@ -464,10 +476,10 @@ PlayerSettings:
464476
switchScreenResolutionBehavior: 2
465477
switchUseCPUProfiler: 0
466478
switchEnableFileSystemTrace: 0
467-
switchUseGOLDLinker: 0
468479
switchLTOSetting: 0
469480
switchApplicationID: 0x01004b9000490000
470481
switchNSODependencies:
482+
switchCompilerFlags:
471483
switchTitleNames_0:
472484
switchTitleNames_1:
473485
switchTitleNames_2:
@@ -593,7 +605,6 @@ PlayerSettings:
593605
switchSocketBufferEfficiency: 4
594606
switchSocketInitializeEnabled: 1
595607
switchNetworkInterfaceManagerInitializeEnabled: 1
596-
switchPlayerConnectionEnabled: 1
597608
switchUseNewStyleFilepaths: 0
598609
switchUseLegacyFmodPriorities: 1
599610
switchUseMicroSleepForYield: 1
@@ -683,6 +694,7 @@ PlayerSettings:
683694
webGLMemorySize: 256
684695
webGLExceptionSupport: 1
685696
webGLNameFilesAsHashes: 0
697+
webGLShowDiagnostics: 0
686698
webGLDataCaching: 0
687699
webGLDebugSymbols: 0
688700
webGLEmscriptenArgs:
@@ -695,13 +707,20 @@ PlayerSettings:
695707
webGLLinkerTarget: 1
696708
webGLThreadsSupport: 0
697709
webGLDecompressionFallback: 0
710+
webGLInitialMemorySize: 32
711+
webGLMaximumMemorySize: 2048
712+
webGLMemoryGrowthMode: 2
713+
webGLMemoryLinearGrowthStep: 16
714+
webGLMemoryGeometricGrowthStep: 0.2
715+
webGLMemoryGeometricGrowthCap: 96
698716
webGLPowerPreference: 2
699717
scriptingDefineSymbols: {}
700718
additionalCompilerArguments: {}
701719
platformArchitecture: {}
702720
scriptingBackend:
703721
Android: 1
704722
il2cppCompilerConfiguration: {}
723+
il2cppCodeGeneration: {}
705724
managedStrippingLevel:
706725
Android: 1
707726
EmbeddedLinux: 1
@@ -721,11 +740,9 @@ PlayerSettings:
721740
suppressCommonWarnings: 1
722741
allowUnsafeCode: 0
723742
useDeterministicCompilation: 1
724-
enableRoslynAnalyzers: 1
725743
additionalIl2CppArgs:
726744
scriptingRuntimeVersion: 1
727745
gcIncremental: 0
728-
assemblyVersionValidation: 1
729746
gcWBarrierValidation: 0
730747
apiCompatibilityLevelPerPlatform: {}
731748
m_RenderingPath: 1
@@ -798,6 +815,11 @@ PlayerSettings:
798815
luminVersion:
799816
m_VersionCode: 1
800817
m_VersionName:
818+
hmiPlayerDataPath:
819+
hmiForceSRGBBlit: 1
820+
embeddedLinuxEnableGamepadInput: 1
821+
hmiLogStartupTiming: 0
822+
hmiCpuConfiguration:
801823
apiCompatibilityLevel: 6
802824
activeInputHandler: 0
803825
windowsGamepadBackendHint: 0
@@ -808,6 +830,7 @@ PlayerSettings:
808830
organizationId:
809831
cloudEnabled: 0
810832
legacyClampBlendShapeWeights: 1
811-
playerDataPath:
812-
forceSRGBBlit: 1
833+
hmiLoadingImage: {fileID: 0}
834+
platformRequiresReadableAssets: 0
813835
virtualTexturingSupportEnabled: 0
836+
insecureHttpOption: 0

‎ProjectSettings/ProjectVersion.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.3.31f1
2-
m_EditorVersionWithRevision: 2021.3.31f1 (3409e2af086f)
1+
m_EditorVersion: 2022.3.16f1
2+
m_EditorVersionWithRevision: 2022.3.16f1 (d2c21f0ef2f1)

‎ProjectSettings/UnityConnectSettings.asset‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
UnityConnectSettings:
55
m_ObjectHideFlags: 0
66
serializedVersion: 1
7-
m_Enabled: 0
7+
m_Enabled: 1
88
m_TestMode: 0
99
m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
1010
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
1111
m_ConfigUrl: https://config.uca.cloud.unity3d.com
1212
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
1513
m_TestInitMode: 0
1614
CrashReportingSettings:
1715
m_EventUrl: https://perf-events.cloud.unity3d.com
@@ -25,6 +23,7 @@ UnityConnectSettings:
2523
m_Enabled: 0
2624
m_TestMode: 0
2725
m_InitializeOnStartup: 1
26+
m_PackageRequiringCoreStatsPresent: 1
2827
UnityAdsSettings:
2928
m_Enabled: 0
3029
m_InitializeOnStartup: 1

‎build_demo_apk_2022.3.cmd‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
rem global
2+
SET UnityBin="C:\Program Files\Unity\Hub\Editor\2022.3.16f1\Editor\Unity.exe"
3+
4+
rem prepare build cmd
5+
SET ScriptPath=%~dp0
6+
SET ScriptPath=%ScriptPath:~0,-1%
7+
8+
SET ProjectPath=%ScriptPath%
9+
SET BuildCmd=%UnityBin% -quit -buildTarget android -batchmode -projectPath "%ProjectPath%"
10+
11+
rem ==========================================================================================
12+
rem build 2022_3_version1 patch
13+
rem ==========================================================================================
14+
@echo "start to build 2022_3_version1"
15+
16+
cd %ProjectPath%
17+
git stash
18+
git reset HEAD --hard
19+
git checkout 2022_3_version1
20+
del %ProjectPath%\Assets\AndroidIl2cppPatchDemo\PrebuiltPatches\AllAndroidPatchFiles_version1.zip
21+
%BuildCmd% -executeMethod AndroidBuilder.BuildPatch -logFile build_version1.log
22+
if not exist "%ProjectPath%\Assets\AndroidIl2cppPatchDemo\PrebuiltPatches\AllAndroidPatchFiles_version1.zip" (
23+
echo "Build 2022_3_version1 Failed!"
24+
pause
25+
exit -1
26+
)
27+
28+
rem ==========================================================================================
29+
rem build 2022_3_version2 patch
30+
rem ==========================================================================================
31+
@echo "start to build 2022_3_version2"
32+
33+
cd %ProjectPath%
34+
git reset HEAD --hard
35+
git checkout 2022_3_version2
36+
del %ProjectPath%\Assets\AndroidIl2cppPatchDemo\PrebuiltPatches\AllAndroidPatchFiles_version2.zip
37+
%BuildCmd% -executeMethod AndroidBuilder.BuildPatch -logFile build_version2.log
38+
if not exist "%ProjectPath%\Assets\AndroidIl2cppPatchDemo\PrebuiltPatches\AllAndroidPatchFiles_version2.zip" (
39+
echo "Build 2022_3_version2 Failed!"
40+
pause
41+
exit -1
42+
)
43+
44+
rem ==========================================================================================
45+
rem build base apk
46+
rem ==========================================================================================
47+
@echo "start to build base version apk"
48+
49+
cd %ProjectPath%
50+
git reset HEAD --hard
51+
git checkout 2022_3_base
52+
%BuildCmd% -executeMethod AndroidBuilder.BuildWithoutPatch -logFile build_version0.log
53+
if not exist "%ProjectPath%\AndroidGradleProject_v1.0\cn.noodle1983.unitypatchdemo.apk" (
54+
echo "Build Failed! Please Rerun %ProjectPath%\AndroidGradleProject_v1.0\Test\src\main\build_apk.bat to check the error."
55+
exit -1
56+
)
57+
58+
copy /Y %ProjectPath%\AndroidGradleProject_v1.0\cn.noodle1983.unitypatchdemo.apk %ScriptPath%\Il2cppDemo_com.test.test.apk
59+
echo "Done!"
60+
exit 0

0 commit comments

Comments
 (0)