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_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &649381191
|
--- !u!224 &649381191
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -189,6 +189,50 @@ public static class DataManager{
|
||||||
LoadingScreen.LoadLevel("MainMenu");
|
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){
|
public static async Task RefreshLeaderboard(bool total = false){
|
||||||
WWWForm form = new WWWForm();
|
WWWForm form = new WWWForm();
|
||||||
|
|
||||||
|
|
@ -240,7 +284,7 @@ public static class DataManager{
|
||||||
}
|
}
|
||||||
Debug.Log("my position: " +request.downloadHandler.text);
|
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);
|
Leaderboard.Add(newItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -156,6 +156,7 @@ public class GameManager : MonoBehaviour
|
||||||
|
|
||||||
if(instance.CurStrokes >= instance.MaxStrokes-1){
|
if(instance.CurStrokes >= instance.MaxStrokes-1){
|
||||||
instance.HoleInOne.CrossFadeInFixedTime("Play",0.01f);
|
instance.HoleInOne.CrossFadeInFixedTime("Play",0.01f);
|
||||||
|
DataManager.AddHoleInOne();
|
||||||
instance.Score++;
|
instance.Score++;
|
||||||
}
|
}
|
||||||
instance.CurStrokes = instance.MaxStrokes;
|
instance.CurStrokes = instance.MaxStrokes;
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ public class Hole : MonoBehaviour
|
||||||
|
|
||||||
public void OnTriggerExit2D(Collider2D other){
|
public void OnTriggerExit2D(Collider2D other){
|
||||||
if(other.tag == "Player"){
|
if(other.tag == "Player"){
|
||||||
Debug.Log(other.name + " Exited hole");
|
Debug.Log(other.name + " Exited hole ");
|
||||||
|
|
||||||
GameManager.CancelHole();
|
GameManager.CancelHole();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1,21 +1,8 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<projectSettings>
|
<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.IOSResolver.VerboseLoggingEnabled" value="False" />
|
||||||
<projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
|
<projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
|
||||||
<projectSetting name="Google.VersionHandler.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.PromptBeforeAutoResolution" value="False" />
|
||||||
<projectSetting name="GooglePlayServices.UseGradleDaemon" value="False" />
|
|
||||||
<projectSetting name="GooglePlayServices.UseJetifier" value="True" />
|
<projectSetting name="GooglePlayServices.UseJetifier" value="True" />
|
||||||
<projectSetting name="GooglePlayServices.VerboseLogging" value="True" />
|
|
||||||
</projectSettings>
|
</projectSettings>
|
||||||
|
|
@ -134,7 +134,7 @@ PlayerSettings:
|
||||||
16:10: 1
|
16:10: 1
|
||||||
16:9: 1
|
16:9: 1
|
||||||
Others: 1
|
Others: 1
|
||||||
bundleVersion: 1.3
|
bundleVersion: 1.4
|
||||||
preloadedAssets: []
|
preloadedAssets: []
|
||||||
metroInputSource: 0
|
metroInputSource: 0
|
||||||
wsaTransparentSwapchain: 0
|
wsaTransparentSwapchain: 0
|
||||||
|
|
@ -162,7 +162,7 @@ PlayerSettings:
|
||||||
iPhone: 0
|
iPhone: 0
|
||||||
tvOS: 0
|
tvOS: 0
|
||||||
overrideDefaultApplicationIdentifier: 1
|
overrideDefaultApplicationIdentifier: 1
|
||||||
AndroidBundleVersionCode: 3
|
AndroidBundleVersionCode: 4
|
||||||
AndroidMinSdkVersion: 22
|
AndroidMinSdkVersion: 22
|
||||||
AndroidTargetSdkVersion: 33
|
AndroidTargetSdkVersion: 33
|
||||||
AndroidPreferredInstallLocation: 1
|
AndroidPreferredInstallLocation: 1
|
||||||
|
|
@ -250,7 +250,7 @@ PlayerSettings:
|
||||||
AndroidTargetDevices: 0
|
AndroidTargetDevices: 0
|
||||||
AndroidSplashScreenScale: 0
|
AndroidSplashScreenScale: 0
|
||||||
androidSplashScreen: {fileID: 0}
|
androidSplashScreen: {fileID: 0}
|
||||||
AndroidKeystoreName: H:/LIFE/keys/xperience.keystore
|
AndroidKeystoreName: H:/keys/xperience.keystore
|
||||||
AndroidKeyaliasName: xperience
|
AndroidKeyaliasName: xperience
|
||||||
AndroidBuildApkPerCpuArchitecture: 0
|
AndroidBuildApkPerCpuArchitecture: 0
|
||||||
AndroidTVCompatibility: 0
|
AndroidTVCompatibility: 0
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user