production 1.4
This commit is contained in:
parent
6b9a2e7b80
commit
7a08f8d247
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -2902,7 +2902,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &649381191
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -189,6 +189,50 @@ public static class DataManager{
|
|||
LoadingScreen.LoadLevel("MainMenu");
|
||||
}
|
||||
|
||||
public static async void AddHoleInOne(){
|
||||
WWWForm form = new WWWForm();
|
||||
|
||||
Debug.Log(userData.ToString());
|
||||
|
||||
form.AddField("username", userData.username);
|
||||
form.AddField("password", userData.password);
|
||||
form.AddField("key", key);
|
||||
|
||||
using (UnityWebRequest request = UnityWebRequest.Post(API_ENDPOINT + "add_hole_in_one.php", form))
|
||||
{
|
||||
var operation = request.SendWebRequest();
|
||||
while (!operation.isDone)
|
||||
{
|
||||
await Task.Yield();
|
||||
}
|
||||
Debug.Log("add hole in one response: " +request.downloadHandler.text);
|
||||
|
||||
if(request.downloadHandler.text.Contains("{")){
|
||||
try{
|
||||
userData = JsonConvert.DeserializeObject<UserData>(request.downloadHandler.text);
|
||||
if(userData == null){
|
||||
throw new NullReferenceException();
|
||||
}
|
||||
if(userData.username.Length < 3){
|
||||
throw new IndexOutOfRangeException();
|
||||
}
|
||||
Debug.Log("Success parsing userdata");
|
||||
|
||||
|
||||
}catch(Exception e){
|
||||
Debug.Log("Error parsing userdata");
|
||||
}
|
||||
}else{
|
||||
|
||||
MessageBox.ShowMessage("Error Updating hole in ones, Server said\n" +request.downloadHandler.text);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// LoadingScreen.LoadLevel("MainMenu");
|
||||
}
|
||||
|
||||
public static async Task RefreshLeaderboard(bool total = false){
|
||||
WWWForm form = new WWWForm();
|
||||
|
||||
|
|
@ -240,7 +284,7 @@ public static class DataManager{
|
|||
}
|
||||
Debug.Log("my position: " +request.downloadHandler.text);
|
||||
|
||||
LeaderboardItemData newItem = new LeaderboardItemData(){position=int.Parse(request.downloadHandler.text), name= DataManager.userData.username, topScore = DataManager.userData.TopScore};
|
||||
LeaderboardItemData newItem = new LeaderboardItemData(){position=int.Parse(request.downloadHandler.text), name= DataManager.userData.username, topScore = DataManager.userData.TopScore, Score = DataManager.userData.score};
|
||||
Leaderboard.Add(newItem);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -156,6 +156,7 @@ public class GameManager : MonoBehaviour
|
|||
|
||||
if(instance.CurStrokes >= instance.MaxStrokes-1){
|
||||
instance.HoleInOne.CrossFadeInFixedTime("Play",0.01f);
|
||||
DataManager.AddHoleInOne();
|
||||
instance.Score++;
|
||||
}
|
||||
instance.CurStrokes = instance.MaxStrokes;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ public class Hole : MonoBehaviour
|
|||
|
||||
public void OnTriggerExit2D(Collider2D other){
|
||||
if(other.tag == "Player"){
|
||||
Debug.Log(other.name + " Exited hole");
|
||||
Debug.Log(other.name + " Exited hole ");
|
||||
|
||||
GameManager.CancelHole();
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,83 +1,83 @@
|
|||
<dependencies>
|
||||
<packages>
|
||||
<package>androidx.lifecycle:lifecycle-common-java8:2.4.1</package>
|
||||
<package>androidx.lifecycle:lifecycle-process:2.4.1</package>
|
||||
<package>com.google.android.gms:play-services-ads:21.3.0</package>
|
||||
<package>com.google.android.gms:play-services-auth:16+</package>
|
||||
<package>com.google.android.ump:user-messaging-platform:2.0.0</package>
|
||||
<package>com.google.signin:google-signin-support:1.0.4</package>
|
||||
</packages>
|
||||
<files>
|
||||
<file>Assets/Plugins/Android/androidx.annotation.annotation-1.2.0.jar</file>
|
||||
<file>Assets/Plugins/Android/androidx.annotation.annotation-experimental-1.1.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.arch.core.core-common-2.1.0.jar</file>
|
||||
<file>Assets/Plugins/Android/androidx.arch.core.core-runtime-2.1.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.browser.browser-1.4.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.collection.collection-1.1.0.jar</file>
|
||||
<file>Assets/Plugins/Android/androidx.concurrent.concurrent-futures-1.0.0.jar</file>
|
||||
<file>Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.core.core-1.6.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.4.1.jar</file>
|
||||
<file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-java8-2.4.1.jar</file>
|
||||
<file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.1.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.1.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-process-2.4.1.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.4.1.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-service-2.1.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.print.print-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.room.room-common-2.2.5.jar</file>
|
||||
<file>Assets/Plugins/Android/androidx.room.room-runtime-2.2.5.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.sqlite.sqlite-2.1.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.sqlite.sqlite-framework-2.1.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.startup.startup-runtime-1.1.1.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.tracing.tracing-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.1.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-ads-21.3.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-21.3.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-18.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-21.3.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.1.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-auth-16.0.1.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-auth-api-phone-16.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-auth-base-16.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-measurement-base-20.1.2.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-api-20.1.2.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.ump.user-messaging-platform-2.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.guava.listenablefuture-1.0.jar</file>
|
||||
<file>Assets/Plugins/Android/com.google.signin.google-signin-support-1.0.4.aar</file>
|
||||
</files>
|
||||
<settings>
|
||||
<setting name="androidAbis" value="arm64-v8a,armeabi-v7a" />
|
||||
<setting name="bundleId" value="com.Xperience.Golfinity" />
|
||||
<setting name="explodeAars" value="True" />
|
||||
<setting name="gradleBuildEnabled" value="True" />
|
||||
<setting name="gradlePropertiesTemplateEnabled" value="False" />
|
||||
<setting name="gradleTemplateEnabled" value="False" />
|
||||
<setting name="installAndroidPackages" value="True" />
|
||||
<setting name="localMavenRepoDir" value="Assets/GeneratedLocalRepo" />
|
||||
<setting name="packageDir" value="Assets/Plugins/Android" />
|
||||
<setting name="patchAndroidManifest" value="True" />
|
||||
<setting name="patchMainTemplateGradle" value="True" />
|
||||
<setting name="projectExportEnabled" value="False" />
|
||||
<setting name="useJetifier" value="True" />
|
||||
</settings>
|
||||
<dependencies>
|
||||
<packages>
|
||||
<package>androidx.lifecycle:lifecycle-common-java8:2.4.1</package>
|
||||
<package>androidx.lifecycle:lifecycle-process:2.4.1</package>
|
||||
<package>com.google.android.gms:play-services-ads:21.3.0</package>
|
||||
<package>com.google.android.gms:play-services-auth:16+</package>
|
||||
<package>com.google.android.ump:user-messaging-platform:2.0.0</package>
|
||||
<package>com.google.signin:google-signin-support:1.0.4</package>
|
||||
</packages>
|
||||
<files>
|
||||
<file>Assets/Plugins/Android/androidx.annotation.annotation-1.2.0.jar</file>
|
||||
<file>Assets/Plugins/Android/androidx.annotation.annotation-experimental-1.1.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.arch.core.core-common-2.1.0.jar</file>
|
||||
<file>Assets/Plugins/Android/androidx.arch.core.core-runtime-2.1.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.browser.browser-1.4.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.collection.collection-1.1.0.jar</file>
|
||||
<file>Assets/Plugins/Android/androidx.concurrent.concurrent-futures-1.0.0.jar</file>
|
||||
<file>Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.core.core-1.6.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.4.1.jar</file>
|
||||
<file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-java8-2.4.1.jar</file>
|
||||
<file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.1.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.1.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-process-2.4.1.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.4.1.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-service-2.1.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.print.print-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.room.room-common-2.2.5.jar</file>
|
||||
<file>Assets/Plugins/Android/androidx.room.room-runtime-2.2.5.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.sqlite.sqlite-2.1.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.sqlite.sqlite-framework-2.1.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.startup.startup-runtime-1.1.1.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.tracing.tracing-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.1.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-ads-21.3.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-21.3.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-18.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-21.3.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.1.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-auth-16.0.1.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-auth-api-phone-16.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-auth-base-16.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-measurement-base-20.1.2.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-api-20.1.2.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.android.ump.user-messaging-platform-2.0.0.aar</file>
|
||||
<file>Assets/Plugins/Android/com.google.guava.listenablefuture-1.0.jar</file>
|
||||
<file>Assets/Plugins/Android/com.google.signin.google-signin-support-1.0.4.aar</file>
|
||||
</files>
|
||||
<settings>
|
||||
<setting name="androidAbis" value="arm64-v8a,armeabi-v7a" />
|
||||
<setting name="bundleId" value="com.Xperience.Golfinity" />
|
||||
<setting name="explodeAars" value="True" />
|
||||
<setting name="gradleBuildEnabled" value="True" />
|
||||
<setting name="gradlePropertiesTemplateEnabled" value="False" />
|
||||
<setting name="gradleTemplateEnabled" value="False" />
|
||||
<setting name="installAndroidPackages" value="True" />
|
||||
<setting name="localMavenRepoDir" value="Assets/GeneratedLocalRepo" />
|
||||
<setting name="packageDir" value="Assets/Plugins/Android" />
|
||||
<setting name="patchAndroidManifest" value="True" />
|
||||
<setting name="patchMainTemplateGradle" value="True" />
|
||||
<setting name="projectExportEnabled" value="False" />
|
||||
<setting name="useJetifier" value="True" />
|
||||
</settings>
|
||||
</dependencies>
|
||||
|
|
@ -1,21 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<projectSettings>
|
||||
<projectSetting name="com.google.external-dependency-managerAnalyticsCookie" value="b8fb028eb25a48c7b46ec94f6831fb3c" />
|
||||
<projectSetting name="com.google.external-dependency-managerAnalyticsEnabled" value="True" />
|
||||
<projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
|
||||
<projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
|
||||
<projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />
|
||||
<projectSetting name="GooglePlayServices.AndroidPackageInstallationEnabled" value="True" />
|
||||
<projectSetting name="GooglePlayServices.AutoResolutionDisabledWarning" value="True" />
|
||||
<projectSetting name="GooglePlayServices.AutoResolveOnBuild" value="True" />
|
||||
<projectSetting name="GooglePlayServices.AutoResolverEnabled" value="False" />
|
||||
<projectSetting name="GooglePlayServices.ExplodeAars" value="True" />
|
||||
<projectSetting name="GooglePlayServices.LocalMavenRepoDir" value="Assets/GeneratedLocalRepo" />
|
||||
<projectSetting name="GooglePlayServices.PatchAndroidManifest" value="True" />
|
||||
<projectSetting name="GooglePlayServices.PatchMainTemplateGradle" value="True" />
|
||||
<projectSetting name="GooglePlayServices.PatchPropertiesTemplateGradle" value="True" />
|
||||
<projectSetting name="GooglePlayServices.PromptBeforeAutoResolution" value="False" />
|
||||
<projectSetting name="GooglePlayServices.UseGradleDaemon" value="False" />
|
||||
<projectSetting name="GooglePlayServices.UseJetifier" value="True" />
|
||||
<projectSetting name="GooglePlayServices.VerboseLogging" value="True" />
|
||||
</projectSettings>
|
||||
|
|
@ -134,7 +134,7 @@ PlayerSettings:
|
|||
16:10: 1
|
||||
16:9: 1
|
||||
Others: 1
|
||||
bundleVersion: 1.3
|
||||
bundleVersion: 1.4
|
||||
preloadedAssets: []
|
||||
metroInputSource: 0
|
||||
wsaTransparentSwapchain: 0
|
||||
|
|
@ -162,7 +162,7 @@ PlayerSettings:
|
|||
iPhone: 0
|
||||
tvOS: 0
|
||||
overrideDefaultApplicationIdentifier: 1
|
||||
AndroidBundleVersionCode: 3
|
||||
AndroidBundleVersionCode: 4
|
||||
AndroidMinSdkVersion: 22
|
||||
AndroidTargetSdkVersion: 33
|
||||
AndroidPreferredInstallLocation: 1
|
||||
|
|
@ -250,7 +250,7 @@ PlayerSettings:
|
|||
AndroidTargetDevices: 0
|
||||
AndroidSplashScreenScale: 0
|
||||
androidSplashScreen: {fileID: 0}
|
||||
AndroidKeystoreName: H:/LIFE/keys/xperience.keystore
|
||||
AndroidKeystoreName: H:/keys/xperience.keystore
|
||||
AndroidKeyaliasName: xperience
|
||||
AndroidBuildApkPerCpuArchitecture: 0
|
||||
AndroidTVCompatibility: 0
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user