Skip to content

Commit d0fd132

Browse files
t-34400t-34400
authored
Merge pull request #15 from t-34400/develop
Update for Unity 2023 support and migrate to WebViewManager system
2 parents 3f97cf8 + 75dc077 commit d0fd132

41 files changed

Lines changed: 687 additions & 1510 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@
22
#
33
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
44
#
5+
.utmp/
56
/[Ll]ibrary/
67
/[Tt]emp/
78
/[Oo]bj/
89
/[Bb]uild/
910
/[Bb]uilds/
1011
/[Ll]ogs/
1112
/[Uu]ser[Ss]ettings/
13+
*.log
14+
15+
# By default unity supports Blender asset imports, *.blend1 blender files do not need to be commited to version control.
16+
*.blend1
17+
*.blend1.meta
1218

1319
# MemoryCaptures can get excessive in size.
1420
# They also could contain extremely sensitive data
@@ -22,6 +28,8 @@
2228

2329
# Autogenerated Jetbrains Rider plugin
2430
/[Aa]ssets/Plugins/Editor/JetBrains*
31+
# Jetbrains Rider personal-layer settings
32+
*.DotSettings.user
2533

2634
# Visual Studio cache directory
2735
.vs/
@@ -55,6 +63,9 @@ ExportedObj/
5563
# Unity3D generated file on crash reports
5664
sysinfo.txt
5765

66+
# Mono auto generated files
67+
mono_crash.*
68+
5869
# Builds
5970
*.apk
6071
*.aab
@@ -65,9 +76,24 @@ sysinfo.txt
6576
# Crashlytics generated file
6677
crashlytics-build.properties
6778

68-
# Packed Addressables
69-
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
79+
# TestRunner generated files
80+
InitTestScene*.unity*
81+
82+
# Addressables default ignores, before user customizations
83+
/ServerData
84+
/[Aa]ssets/StreamingAssets/aa*
85+
/[Aa]ssets/AddressableAssetsData/link.xml*
86+
/[Aa]ssets/Addressables_Temp*
87+
# By default, Addressables content builds will generate addressables_content_state.bin
88+
# files in platform-specific subfolders, for example:
89+
# /Assets/AddressableAssetsData/OSX/addressables_content_state.bin
90+
/[Aa]ssets/AddressableAssetsData/*/*.bin*
91+
92+
# Visual Scripting auto-generated files
93+
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db
94+
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta
95+
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers
96+
/[Aa]ssets/Unity.VisualScripting.Generated/VisualScripting.Core/Property Providers.meta
7097

71-
# Temporary auto-generated Android Assets
72-
/[Aa]ssets/[Ss]treamingAssets/aa.meta
73-
/[Aa]ssets/[Ss]treamingAssets/aa/*
98+
# Auto-generated scenes by play mode tests
99+
/[Aa]ssets/[Ii]nit[Tt]est[Ss]cene*.unity*

‎Assets/Plugins/Android/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<uses-permission android:name="android.permission.INTERNET" />
77
<application android:networkSecurityConfig="@xml/network_security_config"
88
android:hardwareAccelerated="true">
9-
<activity android:name="com.t34400.webviewtexture.WebViewUnityPlayerActivity"
9+
<activity android:name="com.unity3d.player.UnityPlayerActivity"
1010
android:theme="@style/UnityThemeSelector">
1111
<intent-filter>
1212
<action android:name="android.intent.action.MAIN" />

‎Assets/Plugins/Android/mainTemplate.gradle‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
apply plugin: 'com.android.library'
2+
**APPLY_PLUGINS**
3+
4+
dependencies {
5+
implementation fileTree(dir: 'libs', include: ['*.jar'])
6+
implementation "org.jetbrains.kotlin:kotlin-stdlib:2.0.21"
7+
**DEPS**}
8+
9+
android {
10+
namespace "com.unity3d.player"
11+
ndkPath "**NDKPATH**"
12+
compileSdkVersion **APIVERSION**
13+
buildToolsVersion '**BUILDTOOLS**'
14+
15+
compileOptions {
16+
sourceCompatibility JavaVersion.VERSION_11
17+
targetCompatibility JavaVersion.VERSION_11
18+
}
19+
20+
defaultConfig {
21+
minSdkVersion **MINSDKVERSION**
22+
targetSdkVersion **TARGETSDKVERSION**
23+
ndk {
24+
abiFilters **ABIFILTERS**
25+
}
26+
versionCode **VERSIONCODE**
27+
versionName '**VERSIONNAME**'
28+
consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
29+
}
30+
31+
lintOptions {
32+
abortOnError false
33+
}
34+
35+
aaptOptions {
36+
noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ')
37+
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~"
38+
}**PACKAGING_OPTIONS**
39+
}
40+
**IL_CPP_BUILD_SETUP**
41+
**SOURCE_BUILD_SETUP**
42+
**EXTERNAL_SOURCES**

Assets/SimpleUnity3DWebView/Image.meta renamed to Assets/Plugins/Android/mainTemplate.gradle.meta

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Scenes/QuestScene.unity‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -875,6 +875,10 @@ PrefabInstance:
875875
propertyPath: textureSize.y
876876
value: 1200
877877
objectReference: {fileID: 0}
878+
- target: {fileID: 4072674907923421904, guid: c39e3a2e852a32e4197f3343ebdcee21, type: 3}
879+
propertyPath: textureWidth
880+
value: 1920
881+
objectReference: {fileID: 0}
878882
- target: {fileID: 7518887404996998715, guid: c39e3a2e852a32e4197f3343ebdcee21, type: 3}
879883
propertyPath: m_LocalPosition.z
880884
value: 0

Assets/SimpleUnity3DWebView/Plugins/Android/AndroidManifest_sample.xml renamed to Assets/SimpleUnity3DWebView/Plugins/Android/AndroidManifest_2022_sample.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<uses-permission android:name="android.permission.INTERNET" />
77
<application android:networkSecurityConfig="@xml/network_security_config"
88
android:hardwareAccelerated="true">
9-
<activity android:name="com.t34400.webviewtexture.WebViewUnityPlayerActivity"
9+
<activity android:name="com.unity3d.player.UnityPlayerActivity"
1010
android:theme="@style/UnityThemeSelector">
1111
<intent-filter>
1212
<action android:name="android.intent.action.MAIN" />

Assets/SimpleUnity3DWebView/Plugins/Android/AndroidManifest_sample.xml.meta renamed to Assets/SimpleUnity3DWebView/Plugins/Android/AndroidManifest_2022_sample.xml.meta

File renamed without changes.

‎Assets/SimpleUnity3DWebView/Plugins/Android/AndroidManifest_2023_sample.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
xmlns:tools="http://schemas.android.com/tools">
5+
<uses-permission android:name="android.permission.INTERNET" />
6+
<application android:networkSecurityConfig="@xml/network_security_config"
7+
android:hardwareAccelerated="true">
8+
<!--Used when Application Entry is set to GameActivity, otherwise remove this activity block-->
9+
<activity android:name="com.unity3d.player.UnityPlayerGameActivity"
10+
android:theme="@style/BaseUnityGameActivityTheme">
11+
<intent-filter>
12+
<action android:name="android.intent.action.MAIN" />
13+
<category android:name="android.intent.category.LAUNCHER" />
14+
</intent-filter>
15+
<meta-data android:name="unityplayer.UnityActivity" android:value="true" />
16+
<meta-data android:name="android.app.lib_name" android:value="game" />
17+
</activity>
18+
</application>
19+
</manifest>

‎Assets/SimpleUnity3DWebView/Plugins/Android/WebAppInterface.java‎

Lines changed: 0 additions & 193 deletions
This file was deleted.

‎Assets/SimpleUnity3DWebView/Plugins/Android/WebAppInterface.java.meta‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)