Skip to content

Commit a08ac95

Browse files
author
DESKTOP-UBV38B7\codingworks
committed
ilrt allow unsafe code
1 parent 17ab3b3 commit a08ac95

File tree

6 files changed

+1671
-60
lines changed

6 files changed

+1671
-60
lines changed

‎Assembly-CSharp-Editor.csproj

Lines changed: 689 additions & 0 deletions
Large diffs are not rendered by default.

‎Assembly-CSharp.csproj

Lines changed: 901 additions & 0 deletions
Large diffs are not rendered by default.

‎Assets/ThirdParty/ILRuntime/Adapters/Editor/ILRuntimeCLRBinding.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ static void GenerateCLRBinding()
3030
//所有DLL内的类型的真实C#类型都是ILTypeInstance
3131
types.Add(typeof(List<ILRuntime.Runtime.Intepreter.ILTypeInstance>));
3232

33-
ILRuntime.Runtime.CLRBinding.BindingCodeGenerator.GenerateBindingCode(types, "Assets/ILRuntime/Generated");
33+
ILRuntime.Runtime.CLRBinding.BindingCodeGenerator.GenerateBindingCode(types, "Assets/ThirdParty/ILRuntime/Generated");
3434

3535
}
3636

‎ProjectSettings/ProjectSettings.asset

Lines changed: 69 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
--- !u!129 &1
44
PlayerSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 13
6+
serializedVersion: 15
77
productGUID: 5f8be1951f0fa92409bf9e3fa507748f
88
AndroidProfiler: 0
99
AndroidFilterTouchesWhenObscured: 0
10+
AndroidEnableSustainedPerformanceMode: 0
1011
defaultScreenOrientation: 4
1112
targetDevice: 2
1213
useOnDemandResources: 0
@@ -61,16 +62,18 @@ PlayerSettings:
6162
allowedAutorotateToLandscapeLeft: 1
6263
useOSAutorotation: 1
6364
use32BitDisplayBuffer: 1
65+
preserveFramebufferAlpha: 0
6466
disableDepthAndStencilBuffers: 0
6567
androidBlitType: 0
66-
defaultIsFullScreen: 1
6768
defaultIsNativeResolution: 1
6869
macRetinaSupport: 1
6970
runInBackground: 0
7071
captureSingleScreen: 0
7172
muteOtherAudioSources: 0
7273
Prepare IOS For Recording: 0
7374
Force IOS Speakers When Recording: 0
75+
deferSystemGesturesMode: 0
76+
hideHomeButton: 0
7477
submitAnalytics: 1
7578
usePlayerLog: 1
7679
bakeCollisionMeshes: 0
@@ -88,9 +91,7 @@ PlayerSettings:
8891
visibleInBackground: 1
8992
allowFullscreenSwitch: 1
9093
graphicsJobMode: 0
91-
macFullscreenMode: 2
92-
d3d9FullscreenMode: 1
93-
d3d11FullscreenMode: 1
94+
fullscreenMode: 1
9495
xboxSpeechDB: 0
9596
xboxEnableHeadOrientation: 0
9697
xboxEnableGuest: 0
@@ -99,24 +100,17 @@ PlayerSettings:
99100
n3dsDisableStereoscopicView: 0
100101
n3dsEnableSharedListOpt: 1
101102
n3dsEnableVSync: 0
102-
ignoreAlphaClear: 0
103103
xboxOneResolution: 0
104+
xboxOneSResolution: 0
105+
xboxOneXResolution: 3
104106
xboxOneMonoLoggingLevel: 0
105107
xboxOneLoggingLevel: 1
106108
xboxOneDisableEsram: 0
107109
xboxOnePresentImmediateThreshold: 0
110+
switchQueueCommandMemory: 0
108111
videoMemoryForVertexBuffers: 0
109112
psp2PowerMode: 0
110113
psp2AcquireBGM: 1
111-
wiiUTVResolution: 0
112-
wiiUGamePadMSAA: 1
113-
wiiUSupportsNunchuk: 0
114-
wiiUSupportsClassicController: 0
115-
wiiUSupportsBalanceBoard: 0
116-
wiiUSupportsMotionPlus: 0
117-
wiiUSupportsProController: 0
118-
wiiUAllowScreenCapture: 1
119-
wiiUControllerCount: 0
120114
m_SupportedAspectRatios:
121115
4:3: 1
122116
5:4: 1
@@ -126,6 +120,7 @@ PlayerSettings:
126120
bundleVersion: 1.0
127121
preloadedAssets: []
128122
metroInputSource: 0
123+
wsaTransparentSwapchain: 0
129124
m_HolographicPauseOnTrackingLoss: 1
130125
xboxOneDisableKinectGpuReservation: 0
131126
xboxOneEnable7thCore: 0
@@ -138,12 +133,19 @@ PlayerSettings:
138133
useSustainedPerformanceMode: 0
139134
enableVideoLayer: 0
140135
useProtectedVideoMemory: 0
136+
minimumSupportedHeadTracking: 0
137+
maximumSupportedHeadTracking: 1
141138
hololens:
142139
depthFormat: 1
140+
depthBufferSharingEnabled: 0
141+
enable360StereoCapture: 0
142+
oculus:
143+
sharedDepthBuffer: 0
144+
dashSupport: 0
143145
protectGraphicsMemory: 0
144146
useHDRDisplay: 0
145147
m_ColorGamuts: 00000000
146-
targetPixelDensity: 0
148+
targetPixelDensity: 30
147149
resolutionScalingMode: 0
148150
androidSupportedAspectRatio: 1
149151
androidMaxAspectRatio: 2.1
@@ -163,11 +165,9 @@ PlayerSettings:
163165
APKExpansionFiles: 0
164166
keepLoadedShadersAlive: 0
165167
StripUnusedMeshComponents: 0
166-
VertexChannelCompressionMask:
167-
serializedVersion: 2
168-
m_Bits: 238
168+
VertexChannelCompressionMask: 214
169169
iPhoneSdkVersion: 988
170-
iOSTargetOSVersionString: 7.0
170+
iOSTargetOSVersionString: 8.0
171171
tvOSSdkVersion: 0
172172
tvOSRequireExtendedGameController: 0
173173
tvOSTargetOSVersionString: 9.0
@@ -183,15 +183,22 @@ PlayerSettings:
183183
iPhone47inSplashScreen: {fileID: 0}
184184
iPhone55inPortraitSplashScreen: {fileID: 0}
185185
iPhone55inLandscapeSplashScreen: {fileID: 0}
186+
iPhone58inPortraitSplashScreen: {fileID: 0}
187+
iPhone58inLandscapeSplashScreen: {fileID: 0}
186188
iPadPortraitSplashScreen: {fileID: 0}
187189
iPadHighResPortraitSplashScreen: {fileID: 0}
188190
iPadLandscapeSplashScreen: {fileID: 0}
189191
iPadHighResLandscapeSplashScreen: {fileID: 0}
190192
appleTVSplashScreen: {fileID: 0}
193+
appleTVSplashScreen2x: {fileID: 0}
191194
tvOSSmallIconLayers: []
195+
tvOSSmallIconLayers2x: []
192196
tvOSLargeIconLayers: []
197+
tvOSLargeIconLayers2x: []
193198
tvOSTopShelfImageLayers: []
199+
tvOSTopShelfImageLayers2x: []
194200
tvOSTopShelfImageWideLayers: []
201+
tvOSTopShelfImageWideLayers2x: []
195202
iOSLaunchScreenType: 0
196203
iOSLaunchScreenPortrait: {fileID: 0}
197204
iOSLaunchScreenLandscape: {fileID: 0}
@@ -209,6 +216,8 @@ PlayerSettings:
209216
iOSLaunchScreeniPadFillPct: 100
210217
iOSLaunchScreeniPadSize: 100
211218
iOSLaunchScreeniPadCustomXibPath:
219+
iOSUseLaunchScreenStoryboard: 0
220+
iOSLaunchScreenCustomStoryboardPath:
212221
iOSDeviceRequirements: []
213222
iOSURLSchemes: []
214223
iOSBackgroundModes: 0
@@ -219,8 +228,15 @@ PlayerSettings:
219228
appleDeveloperTeamID:
220229
iOSManualSigningProvisioningProfileID:
221230
tvOSManualSigningProvisioningProfileID:
231+
iOSManualSigningProvisioningProfileType: 0
232+
tvOSManualSigningProvisioningProfileType: 0
222233
appleEnableAutomaticSigning: 0
223-
AndroidTargetDevice: 0
234+
iOSRequireARKit: 0
235+
appleEnableProMotion: 0
236+
clonedFromGUID: 00000000000000000000000000000000
237+
templatePackageId:
238+
templateDefaultScene:
239+
AndroidTargetArchitectures: 5
224240
AndroidSplashScreenScale: 0
225241
androidSplashScreen: {fileID: 0}
226242
AndroidKeystoreName:
@@ -237,6 +253,7 @@ PlayerSettings:
237253
androidGamepadSupportLevel: 0
238254
resolutionDialogBanner: {fileID: 0}
239255
m_BuildTargetIcons: []
256+
m_BuildTargetPlatformIcons: []
240257
m_BuildTargetBatching: []
241258
m_BuildTargetGraphicsAPIs: []
242259
m_BuildTargetVRSettings: []
@@ -248,25 +265,15 @@ PlayerSettings:
248265
Android: 1
249266
iPhone: 1
250267
tvOS: 1
251-
wiiUTitleID: 0005000011000000
252-
wiiUGroupID: 00010000
253-
wiiUCommonSaveSize: 4096
254-
wiiUAccountSaveSize: 2048
255-
wiiUOlvAccessKey: 0
256-
wiiUTinCode: 0
257-
wiiUJoinGameId: 0
258-
wiiUJoinGameModeMask: 0000000000000000
259-
wiiUCommonBossSize: 0
260-
wiiUAccountBossSize: 0
261-
wiiUAddOnUniqueIDs: []
262-
wiiUMainThreadStackSize: 3072
263-
wiiULoaderThreadStackSize: 1024
264-
wiiUSystemHeapSize: 128
265-
wiiUTVStartupScreen: {fileID: 0}
266-
wiiUGamePadStartupScreen: {fileID: 0}
267-
wiiUDrcBufferDisabled: 0
268-
wiiUProfilerLibPath:
268+
m_BuildTargetGroupLightmapEncodingQuality:
269+
- m_BuildTarget: Standalone
270+
m_EncodingQuality: 1
271+
- m_BuildTarget: XboxOne
272+
m_EncodingQuality: 1
273+
- m_BuildTarget: PS4
274+
m_EncodingQuality: 1
269275
playModeTestRunnerEnabled: 0
276+
runPlayModeTestAsEditModeTest: 0
270277
actionOnDotNetUnhandledException: 1
271278
enableInternalProfiler: 0
272279
logObjCUncaughtExceptions: 1
@@ -294,6 +301,9 @@ PlayerSettings:
294301
switchTitleNames_9:
295302
switchTitleNames_10:
296303
switchTitleNames_11:
304+
switchTitleNames_12:
305+
switchTitleNames_13:
306+
switchTitleNames_14:
297307
switchPublisherNames_0:
298308
switchPublisherNames_1:
299309
switchPublisherNames_2:
@@ -306,6 +316,9 @@ PlayerSettings:
306316
switchPublisherNames_9:
307317
switchPublisherNames_10:
308318
switchPublisherNames_11:
319+
switchPublisherNames_12:
320+
switchPublisherNames_13:
321+
switchPublisherNames_14:
309322
switchIcons_0: {fileID: 0}
310323
switchIcons_1: {fileID: 0}
311324
switchIcons_2: {fileID: 0}
@@ -318,6 +331,9 @@ PlayerSettings:
318331
switchIcons_9: {fileID: 0}
319332
switchIcons_10: {fileID: 0}
320333
switchIcons_11: {fileID: 0}
334+
switchIcons_12: {fileID: 0}
335+
switchIcons_13: {fileID: 0}
336+
switchIcons_14: {fileID: 0}
321337
switchSmallIcons_0: {fileID: 0}
322338
switchSmallIcons_1: {fileID: 0}
323339
switchSmallIcons_2: {fileID: 0}
@@ -330,6 +346,9 @@ PlayerSettings:
330346
switchSmallIcons_9: {fileID: 0}
331347
switchSmallIcons_10: {fileID: 0}
332348
switchSmallIcons_11: {fileID: 0}
349+
switchSmallIcons_12: {fileID: 0}
350+
switchSmallIcons_13: {fileID: 0}
351+
switchSmallIcons_14: {fileID: 0}
333352
switchManualHTML:
334353
switchAccessibleURLs:
335354
switchLegalInformation:
@@ -371,8 +390,11 @@ PlayerSettings:
371390
switchLocalCommunicationIds_7:
372391
switchParentalControl: 0
373392
switchAllowsScreenshot: 1
393+
switchAllowsVideoCapturing: 1
394+
switchAllowsRuntimeAddOnContentInstall: 0
374395
switchDataLossConfirmation: 0
375396
switchSupportedNpadStyles: 3
397+
switchNativeFsCacheSize: 32
376398
switchSocketConfigEnabled: 0
377399
switchTcpInitialSendBufferSize: 32
378400
switchTcpInitialReceiveBufferSize: 64
@@ -402,6 +424,8 @@ PlayerSettings:
402424
ps4PronunciationSIGPath:
403425
ps4BackgroundImagePath:
404426
ps4StartupImagePath:
427+
ps4StartupImagesFolder:
428+
ps4IconImagesFolder:
405429
ps4SaveDataImagePath:
406430
ps4SdkOverride:
407431
ps4BGMPath:
@@ -426,6 +450,7 @@ PlayerSettings:
426450
ps4pnFriends: 1
427451
ps4pnGameCustomData: 1
428452
playerPrefsSupport: 0
453+
enableApplicationExit: 0
429454
restrictedAudioUsageRights: 0
430455
ps4UseResolutionFallback: 0
431456
ps4ReprojectionSupport: 0
@@ -496,7 +521,6 @@ PlayerSettings:
496521
psp2InfoBarOnStartup: 0
497522
psp2InfoBarColor: 0
498523
psp2ScriptOptimizationLevel: 0
499-
psmSplashimage: {fileID: 0}
500524
splashScreenBackgroundSourceLandscape: {fileID: 0}
501525
splashScreenBackgroundSourcePortrait: {fileID: 0}
502526
spritePackerPolicy:
@@ -510,12 +534,14 @@ PlayerSettings:
510534
webGLTemplate: APPLICATION:Default
511535
webGLAnalyzeBuildSize: 0
512536
webGLUseEmbeddedResources: 0
513-
webGLUseWasm: 0
514537
webGLCompressionFormat: 1
538+
webGLLinkerTarget: 0
515539
scriptingDefineSymbols: {}
516540
platformArchitecture: {}
517541
scriptingBackend: {}
542+
il2cppCompilerConfiguration: {}
518543
incrementalIl2cppBuild: {}
544+
allowUnsafeCode: 1
519545
additionalIl2CppArgs:
520546
scriptingRuntimeVersion: 1
521547
apiCompatibilityLevelPerPlatform: {}
@@ -566,12 +592,6 @@ PlayerSettings:
566592
n3dsTitle: GameName
567593
n3dsProductCode:
568594
n3dsApplicationId: 0xFF3FF
569-
stvDeviceAddress:
570-
stvProductDescription:
571-
stvProductAuthor:
572-
stvProductAuthorEmail:
573-
stvProductLink:
574-
stvProductCategory: 0
575595
XboxOneProductId:
576596
XboxOneUpdateKey:
577597
XboxOneSandboxId:
@@ -594,14 +614,15 @@ PlayerSettings:
594614
XboxOneSplashScreen: {fileID: 0}
595615
XboxOneAllowedProductIds: []
596616
XboxOnePersistentLocalStorageSize: 0
617+
XboxOneXTitleMemory: 8
597618
xboxOneScriptCompiler: 0
598619
vrEditorSettings:
599620
daydream:
600621
daydreamIconForeground: {fileID: 0}
601622
daydreamIconBackground: {fileID: 0}
602623
cloudServicesEnabled: {}
603624
facebookSdkVersion: 7.9.4
604-
apiCompatibilityLevel: 2
625+
apiCompatibilityLevel: 3
605626
cloudProjectId:
606627
projectName:
607628
organizationId:

‎ProjectSettings/ProjectVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
m_EditorVersion: 2018.1.0f2
1+
m_EditorVersion: 2018.1.3f1

‎UnityGameFramework.sln

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityGameFramework", "UnityGameFramework.csproj", "{E3D071F7-F59C-E4D6-11CD-4D1984454E3C}"
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityGameFramework", "Assembly-CSharp.csproj", "{7DC02E95-A1AD-526C-2CC5-3442B1E5EC40}"
55
EndProject
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityGameFramework.Editor", "UnityGameFramework.Editor.csproj", "{AC2C2EEB-B73D-D3AA-91F6-97270854DEA6}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityGameFramework", "Assembly-CSharp-Editor.csproj", "{9295A8C3-D531-70CC-9864-277AFD648A8E}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Any CPU = Debug|Any CPU
1111
Release|Any CPU = Release|Any CPU
1212
EndGlobalSection
1313
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{E3D071F7-F59C-E4D6-11CD-4D1984454E3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{E3D071F7-F59C-E4D6-11CD-4D1984454E3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{E3D071F7-F59C-E4D6-11CD-4D1984454E3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{E3D071F7-F59C-E4D6-11CD-4D1984454E3C}.Release|Any CPU.Build.0 = Release|Any CPU
18-
{AC2C2EEB-B73D-D3AA-91F6-97270854DEA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19-
{AC2C2EEB-B73D-D3AA-91F6-97270854DEA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
20-
{AC2C2EEB-B73D-D3AA-91F6-97270854DEA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
21-
{AC2C2EEB-B73D-D3AA-91F6-97270854DEA6}.Release|Any CPU.Build.0 = Release|Any CPU
14+
{7DC02E95-A1AD-526C-2CC5-3442B1E5EC40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{7DC02E95-A1AD-526C-2CC5-3442B1E5EC40}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{7DC02E95-A1AD-526C-2CC5-3442B1E5EC40}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{7DC02E95-A1AD-526C-2CC5-3442B1E5EC40}.Release|Any CPU.Build.0 = Release|Any CPU
18+
{9295A8C3-D531-70CC-9864-277AFD648A8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
19+
{9295A8C3-D531-70CC-9864-277AFD648A8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
20+
{9295A8C3-D531-70CC-9864-277AFD648A8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
21+
{9295A8C3-D531-70CC-9864-277AFD648A8E}.Release|Any CPU.Build.0 = Release|Any CPU
2222
EndGlobalSection
2323
GlobalSection(SolutionProperties) = preSolution
2424
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)