Skip to content

Commit 91a44d6

Browse files
authored
Fix some server and Android issues (#207)
* Don't show Unity Logo * Update Android to v3.1.0 * Remove blank game object from Player that was causing server to crash * Re-export Android Project * Android: Hide Versions by Default This is causing the issue when root checks fail as there is an empty version card present * Gradle bump version
1 parent 756dea4 commit 91a44d6

34 files changed

+12
-38
lines changed

CopsAndRobbers/Assets/Prefabs/Player.prefab

-19
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ GameObject:
9595
- component: {fileID: 6286960928799873138}
9696
- component: {fileID: 4320991763438738490}
9797
- component: {fileID: -6012107923665898761}
98-
- component: {fileID: 8195048679506587132}
9998
- component: {fileID: 277985603917361195}
10099
- component: {fileID: 1691428282546766414}
101100
- component: {fileID: 6889764896076009993}
@@ -278,8 +277,6 @@ MonoBehaviour:
278277
moveSpeed: 5
279278
rigidBody: {fileID: -7991061093172292498}
280279
runSpeed: 40
281-
sfxHandler: {fileID: 8657292821654307289, guid: 8dd02ca52a92df747b74a40a07e73a4b,
282-
type: 3}
283280
movementClip: {fileID: 8300000, guid: 643b220620a99b746be2b953bd8e7719, type: 3}
284281
--- !u!114 &-5345460604086043374
285282
MonoBehaviour:
@@ -347,7 +344,6 @@ MonoBehaviour:
347344
MatchId:
348345
playerIndex: 0
349346
teamId: 0
350-
MoneyUpdater: {fileID: 8195048679506587132}
351347
currentMatch:
352348
matchId:
353349
publicMatch: 0
@@ -368,21 +364,6 @@ MonoBehaviour:
368364
syncMode: 0
369365
syncInterval: 0.1
370366
playerTransform: {fileID: 7821628412348684257}
371-
--- !u!114 &8195048679506587132
372-
MonoBehaviour:
373-
m_ObjectHideFlags: 0
374-
m_CorrespondingSourceObject: {fileID: 0}
375-
m_PrefabInstance: {fileID: 0}
376-
m_PrefabAsset: {fileID: 0}
377-
m_GameObject: {fileID: 3945214744724447283}
378-
m_Enabled: 1
379-
m_EditorHideFlags: 0
380-
m_Script: {fileID: 11500000, guid: 22b556a43be34e289d772e03c9add34e, type: 3}
381-
m_Name:
382-
m_EditorClassIdentifier:
383-
syncMode: 0
384-
syncInterval: 0.1
385-
mTeam: 0
386367
--- !u!114 &277985603917361195
387368
MonoBehaviour:
388369
m_ObjectHideFlags: 0

CopsAndRobbers/Assets/Scripts/PlayerScripts/PlayerAttack.meta

-8
This file was deleted.

CopsAndRobbers/Platform/Android/launcher/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ android {
2323
ndk {
2424
abiFilters 'armeabi-v7a'
2525
}
26-
versionCode 1
27-
versionName '3.0.0'
26+
versionCode 3
27+
versionName '3.1.1'
2828
}
2929

3030
aaptOptions {

CopsAndRobbers/Platform/Android/unityLibrary/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ android {
4545
ndk {
4646
abiFilters 'armeabi-v7a'
4747
}
48-
versionCode 1
49-
versionName '3.1.0'
48+
versionCode 3
49+
versionName '3.1.1'
5050
consumerProguardFiles 'proguard-unity.txt'
5151
buildConfigField "String","DEVICE_VERITY_API",localProperties['dveritykey']
5252
buildConfigField "String","GITHUB_RELEASE_API",globalProperties['relapiurl']

CopsAndRobbers/Platform/Android/unityLibrary/src/main/assets/bin/Data/boot.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ vr-enabled=0
33
hdr-display-enabled=0
44
androidStartInFullscreen=1
55
androidRenderOutsideSafeArea=1
6-
buildDate=637531290775723730
6+
buildDate=637534771958508210
Binary file not shown.

CopsAndRobbers/Platform/Android/unityLibrary/src/main/java/me/derangedsenators/copsandrobbers/MainActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private void onLaunchFail(){
113113
// OTA Download
114114
if(!apiResponse.getTag_name().equals(mVersion)){
115115
CardView versionView = super.findViewById(R.id.versionCardView);
116-
versionView.setVisibility(1);
116+
versionView.setVisibility(View.VISIBLE);
117117
TextView currentVersion = super.findViewById(R.id.currentVerison);
118118
currentVersion.setText(mVersion);
119119
TextView latestVersion = super.findViewById(R.id.latestVerison);
@@ -130,7 +130,7 @@ private void onLaunchFail(){
130130
}
131131
mDownloadController = new DownloadController(this,downloadURL);
132132
if(downloadURL.equals(""))
133-
super.findViewById(R.id.downloadInstallButton).setVisibility(0);
133+
super.findViewById(R.id.downloadInstallButton).setVisibility(View.GONE);
134134
}
135135
setRootView();
136136
}

CopsAndRobbers/Platform/Android/unityLibrary/src/main/res/layout/update_view.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
android:layout_margin="8dp"
6767
app:cardCornerRadius="8dp"
6868
app:cardElevation="8dp"
69-
android:visibility="visible"
69+
android:visibility="gone"
7070
>
7171
<LinearLayout
7272
android:layout_width="match_parent"

CopsAndRobbers/Platform/Android/unityLibrary/src/main/res/values-v28/styles.xml

-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@
33
<style name="BaseUnityTheme" parent="android:Theme.Material.Light.NoActionBar.Fullscreen">
44
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
55
</style>
6-
7-
86
</resources>

CopsAndRobbers/ProjectSettings/GraphicsSettings.asset

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ GraphicsSettings:
3939
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
4040
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
4141
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
42+
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
4243
m_PreloadedShaders: []
4344
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
4445
type: 0}

CopsAndRobbers/ProjectSettings/ProjectSettings.asset

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ PlayerSettings:
1818
cursorHotspot: {x: 0, y: 0}
1919
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
2020
m_ShowUnitySplashScreen: 1
21-
m_ShowUnitySplashLogo: 1
21+
m_ShowUnitySplashLogo: 0
2222
m_SplashScreenOverlayOpacity: 1
2323
m_SplashScreenAnimation: 1
2424
m_SplashScreenLogoStyle: 1
@@ -188,6 +188,8 @@ PlayerSettings:
188188
- {fileID: 0}
189189
- {fileID: 0}
190190
- {fileID: 0}
191+
- {fileID: 0}
192+
- {fileID: 0}
191193
metroInputSource: 0
192194
wsaTransparentSwapchain: 0
193195
m_HolographicPauseOnTrackingLoss: 1

0 commit comments

Comments
 (0)