diff --git a/Assets/Assets.meta b/Assets/Assets.meta new file mode 100644 index 00000000..175421a5 --- /dev/null +++ b/Assets/Assets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 46da62dafd452134c8fbba35f20d7f72 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ExternalDependencyManager/Editor/1.2.185.meta b/Assets/ExternalDependencyManager/Editor/1.2.185.meta new file mode 100644 index 00000000..551903a9 --- /dev/null +++ b/Assets/ExternalDependencyManager/Editor/1.2.185.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: da3a82e05a8f859448ed6c4432431912 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/OneSignal.meta b/Assets/OneSignal.meta new file mode 100644 index 00000000..4264aa94 --- /dev/null +++ b/Assets/OneSignal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4eae7acb92dcf39438f85efa7a685ef6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PipeOut/Scenes/Loading.unity b/Assets/PipeOut/Scenes/Loading.unity index 2334f05c..1f051794 100644 --- a/Assets/PipeOut/Scenes/Loading.unity +++ b/Assets/PipeOut/Scenes/Loading.unity @@ -169,6 +169,53 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &79986214 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 2DxFX/Standard/Shiny_Reflect + m_Shader: {fileID: 4800000, guid: 6fc94ae14d17d3642b09718b5b932fd2, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex2: + m_Texture: {fileID: 2800000, guid: 6ed1aafd335608e48aa3198044a161df, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _Alpha: 0 + - _ColorMask: 15 + - _Distortion: 0.15873456 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _Value2: 0.5 + - _Value3: 1 + - _Value4: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] --- !u!1 &83133762 GameObject: m_ObjectHideFlags: 0 @@ -557,53 +604,6 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!21 &417474133 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: 2DxFX/Standard/Shiny_Reflect - m_Shader: {fileID: 4800000, guid: 6fc94ae14d17d3642b09718b5b932fd2, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex2: - m_Texture: {fileID: 2800000, guid: 6ed1aafd335608e48aa3198044a161df, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Alpha: 0 - - _ColorMask: 15 - - _Distortion: -0.16602409 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _Value2: 0.5 - - _Value3: 1 - - _Value4: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] --- !u!1 &439213423 GameObject: m_ObjectHideFlags: 0 @@ -2046,7 +2046,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 417474133} + m_Material: {fileID: 79986214} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Plugins/Android/OneSignalConfig.androidlib.meta b/Assets/Plugins/Android/OneSignalConfig.androidlib.meta new file mode 100644 index 00000000..5e8cebc1 --- /dev/null +++ b/Assets/Plugins/Android/OneSignalConfig.androidlib.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: 57854d4ffbb8b964197c5a820fbe8c8a +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Android: Android + second: + enabled: 1 + settings: {} + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/OneSignalConfig.androidlib/AndroidManifest.xml b/Assets/Plugins/Android/OneSignalConfig.androidlib/AndroidManifest.xml new file mode 100644 index 00000000..9d45d46f --- /dev/null +++ b/Assets/Plugins/Android/OneSignalConfig.androidlib/AndroidManifest.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/Assets/Plugins/Android/OneSignalConfig.androidlib/README.md b/Assets/Plugins/Android/OneSignalConfig.androidlib/README.md new file mode 100644 index 00000000..75fdcf6c --- /dev/null +++ b/Assets/Plugins/Android/OneSignalConfig.androidlib/README.md @@ -0,0 +1,63 @@ +_see a more detailed version of this guide at https://documentation.onesignal.com/docs/customize-notification-icons#how-to-add-default-icons_ + +# Android Notification Icons + +Icons are a way to provide a more unique, branded experience for your Android and Amazon app. + +You may add a default icon that appears with every notification you send, or you may add icons to just certain types of +notifications. The below tutorial shows you how to do both. + +## About Notification Icons +Android supports both Small and Large Notification Icons. + +### Small Notification Icons +The small icon is displayed on the top status bar as well as the notification itself. By default OneSignal will show a bell +icon, however we recommend you customize this so users recognize it's a notification from your app. Note that Android only +uses the alpha channel for the icon. It will display monochrome in the status bar but an accent color can be applied to the +left side the notification itself. + +### Large Notification Icons +The large notification icon will show up to the left of the notification text on Android 4.0.3 - 6.0 devices, and shows on +the right for Android 7.0+ devices. If you do not set a large icon, the small icon will be used instead. OneSignal will auto +scale large notification icons for you to prevent the icon from being cropped. The recommended size of the large icon is +256x256 pixels. + +## How to Add Default Icons +We **strongly** recommend adding default icons to every Android and Amazon app. + +### Step 1 - Generate Icons +#### Option A: Using Android Asset Studio _(Recommended)_ +To quickly and easily generate small icons with the correct settings, we recommend using the Android Asset Studio. Use +**ic_stat_onesignal_default** as the name. + +#### Option B: Manually Create Icons +If you prefer to create your own icons, you must make your icons the following sizes and make the small ones in white with a transparent background. + +| Name | Density (dp) | Size (px) | +|-------------------------------------|--------------|-----------| +| ic_stat_onesignal_default.png | MDPI | 24x24 | +| ic_stat_onesignal_default.png | HDPI | 36x36 | +| ic_stat_onesignal_default.png | XHDPI | 48x48 | +| ic_stat_onesignal_default.png | XXHDPI | 72x72 | +| ic_stat_onesignal_default.png | XXXHDPI | 96x96 | +| ic_onesignal_large_icon_default.png | XXXHDPI | 256x256 | + +> Required: Each name and pixel size must be present in the app. + +You must be sure the icon filenames are correct as per the above table. If you used Android Asset Studio for your small icon then this step may +have already been done for you. + +### Step 2 - Add icons to project +If you have already run our SDK setup wizard (found in the Unity Editor via the `Window > OneSignal SDK Setup` menu) then you will already have the +`OneSignalConfig.androidlib` imported into your project at the path `/Assets/Plugins/Android/OneSignalConfig.androidlib`. If this is not the case +please run the step **"Copy Android plugin to Assets"** to do so. Once this is ready you can simply copy the files you made in step 1 to +the correct paths: + +| Path | Density (dp) | Size (px) | +|------------------------------------------------------------------------------------------------------------|--------------|-----------| +| Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/**drawable-mdpi**/ic_stat_onesignal_default.png | MDPI | 24x24 | +| Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/**drawable-hdpi**/ic_stat_onesignal_default.png | HDPI | 36x36 | +| Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/**drawable-xhdpi**/ic_stat_onesignal_default.png | XHDPI | 48x48 | +| Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/**drawable-xxhdpi**/ic_stat_onesignal_default.png | XXHDPI | 72x72 | +| Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/**drawable-xxxhdpi**/ic_stat_onesignal_default.png | XXXHDPI | 96x96 | +| Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/**drawable-xxxhdpi**/ic_onesignal_large_icon_default.png | XXXHDPI | 256x256 | \ No newline at end of file diff --git a/Assets/Plugins/Android/OneSignalConfig.androidlib/build.gradle b/Assets/Plugins/Android/OneSignalConfig.androidlib/build.gradle new file mode 100644 index 00000000..75d5dbc1 --- /dev/null +++ b/Assets/Plugins/Android/OneSignalConfig.androidlib/build.gradle @@ -0,0 +1,24 @@ +apply plugin: 'com.android.library' + +android { + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + } + } + + def unityLib = project(':unityLibrary').extensions.getByName('android') + + defaultConfig { + consumerProguardFiles "consumer-proguard.pro" + minSdkVersion unityLib.defaultConfig.minSdkVersion.mApiLevel + targetSdkVersion unityLib.defaultConfig.targetSdkVersion.mApiLevel + } + + compileSdkVersion unityLib.compileSdkVersion + buildToolsVersion unityLib.buildToolsVersion + + lintOptions { + abortOnError false + } +} \ No newline at end of file diff --git a/Assets/Plugins/Android/OneSignalConfig.androidlib/consumer-proguard.pro b/Assets/Plugins/Android/OneSignalConfig.androidlib/consumer-proguard.pro new file mode 100644 index 00000000..1eb572fe --- /dev/null +++ b/Assets/Plugins/Android/OneSignalConfig.androidlib/consumer-proguard.pro @@ -0,0 +1,4 @@ +-keep class com.onesignal.** { *; } + +# Work around for IllegalStateException with kotlinx-coroutines-android +-keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;} \ No newline at end of file diff --git a/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-hdpi/ic_stat_onesignal_default.png b/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-hdpi/ic_stat_onesignal_default.png new file mode 100644 index 00000000..1b46e91d Binary files /dev/null and b/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-hdpi/ic_stat_onesignal_default.png differ diff --git a/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-mdpi/ic_stat_onesignal_default.png b/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-mdpi/ic_stat_onesignal_default.png new file mode 100644 index 00000000..cfa608a7 Binary files /dev/null and b/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-mdpi/ic_stat_onesignal_default.png differ diff --git a/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-xhdpi/ic_stat_onesignal_default.png b/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-xhdpi/ic_stat_onesignal_default.png new file mode 100644 index 00000000..1727053e Binary files /dev/null and b/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-xhdpi/ic_stat_onesignal_default.png differ diff --git a/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-xxhdpi/ic_stat_onesignal_default.png b/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-xxhdpi/ic_stat_onesignal_default.png new file mode 100644 index 00000000..f33f3fbb Binary files /dev/null and b/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-xxhdpi/ic_stat_onesignal_default.png differ diff --git a/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_onesignal_large_icon_default.png b/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_onesignal_large_icon_default.png new file mode 100644 index 00000000..83b74bc2 Binary files /dev/null and b/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_onesignal_large_icon_default.png differ diff --git a/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_stat_onesignal_default.png b/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_stat_onesignal_default.png new file mode 100644 index 00000000..6dd8e7f1 Binary files /dev/null and b/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_stat_onesignal_default.png differ diff --git a/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/raw/notification.wav b/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/raw/notification.wav new file mode 100644 index 00000000..622431c2 Binary files /dev/null and b/Assets/Plugins/Android/OneSignalConfig.androidlib/src/main/res/raw/notification.wav differ diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle index 1484753c..95c81ec2 100644 --- a/Assets/Plugins/Android/mainTemplate.gradle +++ b/Assets/Plugins/Android/mainTemplate.gradle @@ -1,19 +1,29 @@ apply plugin: 'com.android.library' **APPLY_PLUGINS** +repositories { + google() + mavenCentral() + maven { url 'https://plugins.gradle.org/m2/' } + maven { url "https://onesignal.jfrog.io/artifactory/onesignal-gradle-plugin" } +} + dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) + // Android Resolver Dependencies Start implementation 'androidx.constraintlayout:constraintlayout:2.1.4' // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:12 implementation 'com.google.android.gms:play-services-ads:23.2.0' // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7 implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1' // Assets/IronSource/Editor/IronSourceSDKDependencies.xml:17 - implementation 'com.google.android.gms:play-services-auth:20.7.0' + implementation 'com.google.android.gms:play-services-auth:20.7.0' // Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml:10 implementation 'com.google.android.gms:play-services-base:18.2.0' implementation 'com.google.android.gms:play-services-basement:18.1.0' // Assets/IronSource/Editor/IronSourceSDKDependencies.xml:25 implementation 'com.google.android.ump:user-messaging-platform:2.2.0' // Assets/GoogleMobileAds/Editor/GoogleUmpDependencies.xml:7 implementation 'com.ironsource.sdk:mediationsdk:7.3.1.1' // Assets/IronSource/Editor/IronSourceSDKDependencies.xml:9 + implementation 'com.onesignal:OneSignal:5.1.26' // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:6 // Android Resolver Dependencies End -**DEPS**} + **DEPS** +} // Android Resolver Exclusions Start android { @@ -26,6 +36,7 @@ android { } } // Android Resolver Exclusions End + android { namespace "com.unity3d.player" ndkPath "**NDKPATH**" @@ -57,6 +68,7 @@ android { ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~" }**PACKAGING_OPTIONS** } + **IL_CPP_BUILD_SETUP** **SOURCE_BUILD_SETUP** **EXTERNAL_SOURCES** diff --git a/Assets/Plugins/Android/settingsTemplate.gradle b/Assets/Plugins/Android/settingsTemplate.gradle index de7fc69b..f2e9ce89 100644 --- a/Assets/Plugins/Android/settingsTemplate.gradle +++ b/Assets/Plugins/Android/settingsTemplate.gradle @@ -18,6 +18,9 @@ dependencyResolutionManagement { mavenCentral() // Android Resolver Repos Start def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/") + maven { + url "https://repo.maven.apache.org/maven2" // Packages/com.onesignal.unity.android/Editor/OneSignalAndroidDependencies.xml:5 + } maven { url "https://maven.google.com/" // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7, Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:12, Assets/GoogleMobileAds/Editor/GoogleUmpDependencies.xml:7, Assets/IronSource/Editor/IronSourceSDKDependencies.xml:17, Assets/IronSource/Editor/IronSourceSDKDependencies.xml:25 } diff --git a/Packages/manifest.json b/Packages/manifest.json index a5c656f6..d5c805eb 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,8 @@ { "dependencies": { + "com.onesignal.unity.android": "5.1.12", + "com.onesignal.unity.core": "5.1.12", + "com.onesignal.unity.ios": "5.1.12", "com.unity.2d.sprite": "1.0.0", "com.unity.device-simulator.devices": "1.0.0", "com.unity.ide.rider": "3.0.31", @@ -40,5 +43,14 @@ "com.unity.modules.vr": "1.0.0", "com.unity.modules.wind": "1.0.0", "com.unity.modules.xr": "1.0.0" - } + }, + "scopedRegistries": [ + { + "name": "npmjs", + "url": "https://registry.npmjs.org", + "scopes": [ + "com.onesignal" + ] + } + ] } diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 1e5f5c5d..d030d5d8 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,30 @@ { "dependencies": { + "com.onesignal.unity.android": { + "version": "5.1.12", + "depth": 0, + "source": "registry", + "dependencies": { + "com.onesignal.unity.core": "5.1.12" + }, + "url": "https://registry.npmjs.org" + }, + "com.onesignal.unity.core": { + "version": "5.1.12", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://registry.npmjs.org" + }, + "com.onesignal.unity.ios": { + "version": "5.1.12", + "depth": 0, + "source": "registry", + "dependencies": { + "com.onesignal.unity.core": "5.1.12" + }, + "url": "https://registry.npmjs.org" + }, "com.unity.2d.sprite": { "version": "1.0.0", "depth": 0, diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml index 427f0beb..842cd8d6 100644 --- a/ProjectSettings/AndroidResolverDependencies.xml +++ b/ProjectSettings/AndroidResolverDependencies.xml @@ -8,6 +8,7 @@ com.google.android.ump:user-messaging-platform:2.2.0 com.google.signin:google-signin-support:1.0.4 com.ironsource.sdk:mediationsdk:7.3.1.1 + com.onesignal:OneSignal:5.1.26 Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.aar diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index fb3b38c1..7bc9f21b 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -12,12 +12,12 @@ MonoBehaviour: m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_EnablePreReleasePackages: 0 + m_EnablePreReleasePackages: 1 m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 m_SeeAllPackageVersions: 0 m_DismissPreviewPackagesInUse: 0 - oneTimeWarningShown: 0 + oneTimeWarningShown: 1 m_Registries: - m_Id: main m_Name: @@ -26,11 +26,19 @@ MonoBehaviour: m_IsDefault: 1 m_Capabilities: 7 m_ConfigSource: 0 - m_UserSelectedRegistryName: + - m_Id: scoped:project:npmjs + m_Name: npmjs + m_Url: https://registry.npmjs.org + m_Scopes: + - com.onesignal + m_IsDefault: 0 + m_Capabilities: 0 + m_ConfigSource: 4 + m_UserSelectedRegistryName: npmjs m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -840 - m_OriginalInstanceId: -842 + m_UserModificationsInstanceId: -834 + m_OriginalInstanceId: -836 m_LoadAssets: 0