Merge branch 'JK831:main' into main

Author: ieeh1016

Client/Capstone Project/Assembly-CSharp-Editor.csproj

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN-->
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.unity3d.player"
+    xmlns:tools="http://schemas.android.com/tools">
+    <application>
+        <activity android:name="com.unity3d.player.UnityPlayerActivity"
+                  android:theme="@style/UnityThemeSelector"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
+            
+        </activity>
+    </application>
+</manifest>

Client/Capstone Project/Assembly-CSharp.csproj

@@ -21,7 +21,8 @@
             android:value="\u0030.10.14" />
 
         <activity android:name="com.google.games.bridge.NativeBridgeActivity"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
+            android:exported="true" />
     </application>
 </manifest>
 

Client/Capstone Project/Assets/Plugins/Android/AndroidManifest.xml

@@ -5638,7 +5638,7 @@ MonoBehaviour:
   _stopButton: {fileID: 7441770931080884343}
   _missionButton: {fileID: 860780125548944086}
   _questionButton: {fileID: 8818272536255919024}
-  _whenPlayClicked: {fileID: 2774654939976431722}
+  _whenPlayClick: {fileID: 2774654939976431722}
 --- !u!1 &3961017822536822017
 GameObject:
   m_ObjectHideFlags: 0