From 35bd75056c2a17b7596351138b98afadf720d30d Mon Sep 17 00:00:00 2001
From: hydekyle
Date: Wed, 12 Jan 2022 21:35:22 +0000
Subject: [PATCH 1/8] changed project database
---
Assets/1.Scripts/CanvasManager.cs | 86 ++++----
Assets/1.Scripts/GameManager.cs | 69 +++----
Assets/1.Scripts/Models.cs | 6 +-
Assets/1.Scripts/NetworkManager.cs | 86 +++-----
Assets/BulletMaterial.mat | 2 +-
Assets/Scenes/MainLevel.unity | 187 +++++++++++++++---
Assets/WebGLTemplates/MainTemplate/index.html | 8 +-
Assets/WebGLTemplates/MainTemplate/scores.php | 8 +-
Assets/src/pantalla2_corregido.jpg | Bin 360170 -> 253424 bytes
Packages/manifest.json | 11 +-
Packages/packages-lock.json | 32 +--
ProjectSettings/GraphicsSettings.asset | 8 +-
ProjectSettings/ProjectSettings.asset | 76 +++----
ProjectSettings/ProjectVersion.txt | 4 +-
ProjectSettings/UnityConnectSettings.asset | 1 +
15 files changed, 343 insertions(+), 241 deletions(-)
diff --git a/Assets/1.Scripts/CanvasManager.cs b/Assets/1.Scripts/CanvasManager.cs
index e6991ad..d2a151b 100644
--- a/Assets/1.Scripts/CanvasManager.cs
+++ b/Assets/1.Scripts/CanvasManager.cs
@@ -29,7 +29,7 @@ public class CanvasManager : MonoBehaviour
public TextMeshProUGUI informationText;
public TextMeshProUGUI storyText;
public GameObject storyImage, mainStoryButton;
- public Button nextButton;
+ public GameObject loadingBlackScreen;
private void Awake()
{
@@ -58,6 +58,7 @@ public void SetFillShieldIcon(float fillValue)
public void SendScore(string alias, int score)
{
GameSession.Instance.GameFinished();
+ GameManager.Instance.user.score = score.ToString();
StartCoroutine(NetworkManager.SendHighScore(alias, score, onEnded =>
{
myHighScore = score; // Cachear high score para compartir en FB
@@ -67,6 +68,7 @@ public void SendScore(string alias, int score)
public void ShowHighScores()
{
+ loadingBlackScreen.SetActive(true);
StartCoroutine(NetworkManager.GetHighScores(topUsers =>
{
Transform content = highScoresWindow.Find("Leader Board").Find("Scroll View").Find("Viewport").Find("Content");
@@ -82,9 +84,9 @@ public void ShowHighScores()
myRankPosition = x + 1; // Recachear si estoy en el top (puntuación puede ser diferente)
myHighScore = int.Parse(topUsers[x].score);
}
-
GameManager.Instance.SetAndroidControls(false);
highScoresWindow.gameObject.SetActive(true);
+ loadingBlackScreen.SetActive(false);
Invoke("MakeRetryAvailable", 1f);
}
}));
@@ -146,43 +148,43 @@ Sprite GetSpriteAvatar(int avatarNumber)
public void LoadUserDataAndShowMenu(User userData)
{
- GameManager.Instance.intentos = int.Parse(userData.intentos);
StartCoroutine(NetworkManager.GetGameConfiguration(gameConfig =>
{
informationText.text = gameConfig.stories[gameConfig.stories.Count - 1];
SetUserDataAndStartMenu(userData);
GameManager.Instance.SetGameConfiguration(gameConfig);
+ loadingBlackScreen.SetActive(false);
}));
}
- public void LoadUserDataAndShowMenuDebug(User userData)
- {
- GameManager.Instance.intentos = int.Parse(userData.intentos);
- var stories = GetDebugStories();
- informationText.text = stories[stories.Count - 1];
- SetUserDataAndStartMenu(userData);
- GameManager.Instance.gameConfiguration = new GameConfiguration()
- {
- livesPerCredit = 66,
- finalBossHealth = 20,
- miniBossHealth = 100,
- playerAttackSpeed = 10,
- playerMovementSpeed = 10,
- stories = stories,
- storyLevelWaitTime = 20
- };
- }
+ // public void LoadUserDataAndShowMenuDebug(User userData)
+ // {
+ // GameManager.Instance.intentos = int.Parse(userData.intentos);
+ // var stories = GetDebugStories();
+ // informationText.text = stories[stories.Count - 1];
+ // SetUserDataAndStartMenu(userData);
+ // GameManager.Instance.gameConfiguration = new GameConfiguration()
+ // {
+ // livesPerCredit = 3,
+ // finalBossHealth = 1555,
+ // miniBossHealth = 666,
+ // playerAttackSpeed = 10,
+ // playerMovementSpeed = 10,
+ // stories = stories,
+ // storyLevelWaitTime = 20
+ // };
+ // }
List GetDebugStories()
{
return new List(){
- "Story -1",
- "Story 0",
+ "Welcome to FreeGalaga, a game made by Ayoze",
+ "Get Ready !!",
"Story 1",
"Story 2",
"Story 3",
"Story 4",
- "Story Information"
+ "This is a free version of a Freelancer project of mine. \nYou can check the source code clicking on INFORMATION button. \nHave fun!"
};
}
@@ -199,10 +201,7 @@ private void SetUserDataAndStartMenu(User userData)
public void BTN_Start()
{
- if (!GameManager.Instance.debugMode && GameManager.Instance.intentos > 0)
- StartCoroutine(NetworkManager.ConsumeIntento(GameManager.Instance.alias, () => StartGame()));
- else
- StartGame();
+ StartGame();
}
private void StartGame()
@@ -225,8 +224,13 @@ void ShowMainStory()
public void ShowLevelStory(int number)
{
- storyText.text = GameManager.Instance.gameConfiguration.stories[number + 1];
- storiesUI.SetActive(true);
+ try
+ {
+ storyText.text = GameManager.Instance.gameConfiguration.stories[number + 1];
+ storiesUI.SetActive(true);
+ }
+ catch
+ { }
Invoke(nameof(BTN_Next), GameManager.Instance.gameConfiguration.storyLevelWaitTime / 10f);
}
@@ -298,25 +302,21 @@ void SetScore(int amount)
textHighScore.text = amount.ToString();
}
- void SetStars(int amount)
- {
- var stars = Mathf.Clamp(amount, 0, 3);
- for (var x = 0; x < stars; x++)
- {
- starsParent.GetChild(x).GetComponent().sprite = spriteStarON;
- }
- }
+ // void SetStars(int amount)
+ // {
+ // var stars = Mathf.Clamp(amount, 0, 3);
+ // for (var x = 0; x < stars; x++)
+ // {
+ // starsParent.GetChild(x).GetComponent().sprite = spriteStarON;
+ // }
+ // }
- public Sprite GetSpriteAvatar(string avatarURL)
+ public Sprite GetSpriteAvatar(string avatarIndex)
{
Sprite sprite = spritesAvatar[0];
try
{
- var avatarIndex = avatarURL.Split(new string[]
- {
- "avatar_player_"
- }, StringSplitOptions.None)[1].Split('.')[0];
- sprite = GetSpriteAvatar(int.Parse(avatarIndex));
+ GetSpriteAvatar(int.Parse(avatarIndex));
}
catch
{
diff --git a/Assets/1.Scripts/GameManager.cs b/Assets/1.Scripts/GameManager.cs
index ba8db41..e59656b 100644
--- a/Assets/1.Scripts/GameManager.cs
+++ b/Assets/1.Scripts/GameManager.cs
@@ -33,8 +33,7 @@ public class GameManager : MonoBehaviour
[HideInInspector]
public EZObjectPool enemyBulletsPoolGreen, enemyBulletsPoolRed, enemyBulletsPoolFire, enemyBombs;
- public string alias = "";
- public int intentos;
+ public User user;
[Header("SETTINGS")]
public GameObject bigExplosion;
@@ -56,46 +55,28 @@ void Initialize()
enemyBulletsPoolRed = EZObjectPool.CreateObjectPool(tablesEtc.disparosEnemigos[1], "Bullets Enemy Red", 5, false, true, true);
enemyBulletsPoolFire = EZObjectPool.CreateObjectPool(tablesEtc.disparosEnemigos[2], "Bullets Enemy Fire", 4, false, true, true);
enemyBombs = EZObjectPool.CreateObjectPool(bombPrefab, "Bombs Boss", 6, false, true, true);
+ if (!PlayerPrefs.HasKey("id"))
+ {
+ var newID = System.Guid.NewGuid().ToString();
+ PlayerPrefs.SetString("id", newID);
+ }
}
private void Start()
{
LoadGameConfig();
- if (!debugMode) GetUserData();
- else LoadDebugMode();
- }
-
- private void LoadDebugMode()
- {
- User testUser = new User()
- {
- alias = "test",
- avatar = "",
- intentos = "0",
- score = "666"
- };
- CanvasManager.Instance.LoadUserDataAndShowMenuDebug(testUser);
+ LoadUserData();
}
private void LoadGameConfig()
{
- if (!Application.isEditor) // Playing from WebGL
- {
- var baseURL = Application.absoluteURL;
- gameData.getHighScoresURL = baseURL + "scores.php";
- gameData.getUserDataURL = baseURL + "userdata.php";
- gameData.sendScoreURL = baseURL + "updatescore.php";
- gameData.consumeIntentosURL = baseURL + "consumeintentos.php";
- gameData.gameConfigurationURL = baseURL + "game-configuration.php";
- }
- else // JUST FOR UNITY EDITOR
- {
- gameData.getHighScoresURL = "https://www.experienciasvirtuales.tv/paloalto/spacegame_test/game/scores.php";
- gameData.sendScoreURL = "https://www.experienciasvirtuales.tv/paloalto/spacegame_test/game/updatescore.php";
- gameData.getUserDataURL = "https://www.experienciasvirtuales.tv/paloalto/spacegame_test/game/userdata.php";
- gameData.consumeIntentosURL = "https://www.experienciasvirtuales.tv/paloalto/spacegame_test/game/consumeintentos.php";
- gameData.gameConfigurationURL = "https://www.experienciasvirtuales.tv/paloalto/spacegame_test/game/game-configuration.php";
- }
+ string baseURL;
+ if (Application.isEditor) baseURL = "localhost:8079/galaga/";
+ else baseURL = Application.absoluteURL;
+ gameData.getHighScoresURL = baseURL + "getscores.php";
+ gameData.getUserDataURL = baseURL + "getuserdata.php";
+ gameData.sendScoreURL = baseURL + "updatescore.php";
+ gameData.gameDataURL = baseURL + "getgamedata.php";
}
public void SetGameConfiguration(GameConfiguration gameConfig)
@@ -103,22 +84,16 @@ public void SetGameConfiguration(GameConfiguration gameConfig)
gameConfiguration = gameConfig;
}
- private void GetUserData()
+ private void LoadUserData()
{
- if (!Application.isEditor) alias = HttpCookie.GetCookie("ALIAS");
-
- if (alias != "")
+ string id = PlayerPrefs.GetString("id");
+ StartCoroutine(NetworkManager.GetUserData(id, userData =>
{
- StartCoroutine(NetworkManager.GetUserData(alias, userData =>
- {
- gameData.userAlias = userData.alias;
- CanvasManager.Instance.LoadUserDataAndShowMenu(userData);
- }));
- }
- else
- {
- Debug.LogWarning("No ALIAS founded!");
- }
+ gameData.userAlias = userData.alias;
+ user = userData;
+ CanvasManager.Instance.LoadUserDataAndShowMenu(userData);
+ }));
+
}
public void StartGame()
diff --git a/Assets/1.Scripts/Models.cs b/Assets/1.Scripts/Models.cs
index af1d03a..30a0656 100644
--- a/Assets/1.Scripts/Models.cs
+++ b/Assets/1.Scripts/Models.cs
@@ -6,7 +6,8 @@
[System.Serializable]
public struct User
{
- public string alias, score, avatar, intentos;
+ public int avatar;
+ public string id, alias, score;
}
public struct GameConfiguration
@@ -77,6 +78,5 @@ public struct GameData
public string getHighScoresURL;
public string sendScoreURL;
public string getUserDataURL;
- public string consumeIntentosURL;
- public string gameConfigurationURL;
+ public string gameDataURL;
}
\ No newline at end of file
diff --git a/Assets/1.Scripts/NetworkManager.cs b/Assets/1.Scripts/NetworkManager.cs
index 35a93a3..8b193b2 100644
--- a/Assets/1.Scripts/NetworkManager.cs
+++ b/Assets/1.Scripts/NetworkManager.cs
@@ -12,7 +12,7 @@ public static IEnumerator SendHighScore(string alias, int score, Action on
{
var token = GetEncriptedToken(alias, score);
var sendScoreURL = GameManager.Instance.gameData.sendScoreURL;
- string sendScoreFinalURL = String.Concat(sendScoreURL, String.Format("?alias={0}&score={1}&token={2}", alias, score, token));
+ string sendScoreFinalURL = String.Concat(sendScoreURL, String.Format("?alias={0}&score={1}&token={2}&id={3}&avatar={4}", alias, score, token, PlayerPrefs.GetString("id"), GameManager.Instance.user.avatar));
using (UnityWebRequest webRequest = UnityWebRequest.Get(sendScoreFinalURL))
{
yield return webRequest.SendWebRequest();
@@ -24,61 +24,48 @@ public static IEnumerator SendHighScore(string alias, int score, Action on
}
}
- public static IEnumerator ConsumeIntento(string alias, Action onConsumed)
+ public static IEnumerator GetUserData(string id, Action userData)
{
- var token = GetEncriptedToken(alias, GameManager.Instance.intentos);
- var consumeIntentoURL = GameManager.Instance.gameData.consumeIntentosURL + "?alias=" + alias + "&token=" + token;
- using (UnityWebRequest webRequest = UnityWebRequest.Get(consumeIntentoURL))
- {
- yield return webRequest.SendWebRequest();
- if (!webRequest.isNetworkError)
- {
- onConsumed(); // Ahora se puede jugar con 0 intentos
- // if (webRequest.downloadHandler.text == "OK")
- // {
- // onConsumed ();
- // }
- }
- }
- }
-
- public static IEnumerator GetUserData(string alias, Action userData)
- {
- var getUserDataURL = GameManager.Instance.gameData.getUserDataURL + "?alias=" + alias;
+ var getUserDataURL = GameManager.Instance.gameData.getUserDataURL + "?id=" + id;
using (UnityWebRequest webRequest = UnityWebRequest.Get(getUserDataURL))
{
- User user = new User();
yield return webRequest.SendWebRequest();
if (!webRequest.isNetworkError)
{
Debug.Log(webRequest.downloadHandler.text);
- foreach (var rawUser in webRequest.downloadHandler.text.Split('|'))
+ Debug.Log(webRequest.responseCode);
+ if (webRequest.responseCode != 200) // El usuario no existe asi que creamos uno provisional
{
- try
+ string newID = PlayerPrefs.GetString("id");
+ userData(new User
{
- var storedUserValues = rawUser.Split('·');
- user = new User
- {
- alias = storedUserValues[0],
- score = storedUserValues[1],
- avatar = storedUserValues[2],
- intentos = storedUserValues[3]
- };
- }
- catch
- { }
+ id = newID,
+ alias = "Player-" + newID.Substring(0, 4),
+ score = "0",
+ avatar = 1
+ });
+ }
+ else
+ {
+ var storedUserValues = webRequest.downloadHandler.text.Split('|');
+ userData(new User
+ {
+ id = storedUserValues[0],
+ alias = storedUserValues[1],
+ score = storedUserValues[2],
+ avatar = int.Parse(storedUserValues[3])
+ });
}
}
- userData(user);
}
}
public static IEnumerator GetHighScores(Action> topUsers)
{
var highScoresURL = GameManager.Instance.gameData.getHighScoresURL;
+ List users = new List();
using (UnityWebRequest webRequest = UnityWebRequest.Get(highScoresURL))
{
- List users = new List();
yield return webRequest.SendWebRequest();
if (!webRequest.isNetworkError)
{
@@ -87,26 +74,28 @@ public static IEnumerator GetHighScores(Action> topUsers)
try
{
var storedUserValues = rawUser.Split('·');
- var newUser = new User
+ users.Add(new User
{
alias = storedUserValues[0],
score = storedUserValues[1],
- avatar = storedUserValues[2]
- };
- users.Add(newUser);
+ avatar = int.Parse(storedUserValues[2])
+ });
}
catch
{ }
}
topUsers(users);
}
- else Debug.LogWarning("Error GetHighScore: " + webRequest.error);
+ else
+ {
+ users.Add(GameManager.Instance.user);
+ }
}
}
public static IEnumerator GetGameConfiguration(Action gameConfiguration)
{
- var storiesURL = GameManager.Instance.gameData.gameConfigurationURL;
+ var storiesURL = GameManager.Instance.gameData.gameDataURL;
using (UnityWebRequest request = UnityWebRequest.Get(storiesURL))
{
GameConfiguration gameConfig = new GameConfiguration();
@@ -133,17 +122,6 @@ public static IEnumerator GetGameConfiguration(Action gameCon
}
}
- public static IEnumerator CheckLegality(Action isLegal)
- {
- var legalityURL = "https://hydekyle.ga/galaga/legal.txt";
- using (UnityWebRequest webRequest = UnityWebRequest.Get(legalityURL))
- {
- yield return webRequest.SendWebRequest();
- if (!webRequest.isNetworkError && webRequest.downloadHandler.text.Substring(0, 1) == "*") isLegal(false);
- else isLegal(true);
- }
- }
-
public static string Md5Sum(string strToEncrypt)
{
System.Text.UTF32Encoding ue = new System.Text.UTF32Encoding();
diff --git a/Assets/BulletMaterial.mat b/Assets/BulletMaterial.mat
index b51118a..4852c92 100644
--- a/Assets/BulletMaterial.mat
+++ b/Assets/BulletMaterial.mat
@@ -79,7 +79,7 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- - _Color: {r: 1, g: 0, b: 0, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Scenes/MainLevel.unity b/Assets/Scenes/MainLevel.unity
index deafcc6..3200013 100644
--- a/Assets/Scenes/MainLevel.unity
+++ b/Assets/Scenes/MainLevel.unity
@@ -98,7 +98,7 @@ LightmapSettings:
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
- m_LightingSettings: {fileID: 0}
+ m_LightingSettings: {fileID: 1564014426}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
@@ -1518,6 +1518,81 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 171636949}
m_CullTransparentMesh: 0
+--- !u!1 &173346898
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 173346899}
+ - component: {fileID: 173346901}
+ - component: {fileID: 173346900}
+ m_Layer: 5
+ m_Name: Loading
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &173346899
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 173346898}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1520833346}
+ m_RootOrder: 7
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 1.0211182, y: 0}
+ m_SizeDelta: {x: 59.6459, y: 56.8439}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &173346900
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 173346898}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0, g: 0, b: 0, a: 0.3764706}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 0}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &173346901
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 173346898}
+ m_CullTransparentMesh: 1
--- !u!1 &198035563
GameObject:
m_ObjectHideFlags: 0
@@ -1940,7 +2015,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2140480311}
- m_TargetAssemblyTypeName: GameManager, Assembly-CSharp
+ m_TargetAssemblyTypeName:
m_MethodName: ReloadScene
m_Mode: 1
m_Arguments:
@@ -2784,7 +2859,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 722508710}
- m_TargetAssemblyTypeName: Settings, Assembly-CSharp
+ m_TargetAssemblyTypeName:
m_MethodName: BTN_Sound
m_Mode: 1
m_Arguments:
@@ -3125,7 +3200,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 722508710}
- m_TargetAssemblyTypeName: Settings, Assembly-CSharp
+ m_TargetAssemblyTypeName:
m_MethodName: BTN_Back
m_Mode: 1
m_Arguments:
@@ -3467,7 +3542,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 722508710}
- m_TargetAssemblyTypeName: Settings, Assembly-CSharp
+ m_TargetAssemblyTypeName:
m_MethodName: OpenSettings
m_Mode: 1
m_Arguments:
@@ -3668,7 +3743,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 722508710}
- m_TargetAssemblyTypeName: Settings, Assembly-CSharp
+ m_TargetAssemblyTypeName:
m_MethodName: BTN_Touchpad
m_Mode: 1
m_Arguments:
@@ -4644,7 +4719,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1520833342}
- m_TargetAssemblyTypeName: CanvasManager, Assembly-CSharp
+ m_TargetAssemblyTypeName:
m_MethodName: BTN_CloseMainStory
m_Mode: 1
m_Arguments:
@@ -5054,7 +5129,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1520833342}
- m_TargetAssemblyTypeName: CanvasManager, Assembly-CSharp
+ m_TargetAssemblyTypeName:
m_MethodName: BTN_Start
m_Mode: 1
m_Arguments:
@@ -7456,7 +7531,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1520833342}
- m_TargetAssemblyTypeName: CanvasManager, Assembly-CSharp
+ m_TargetAssemblyTypeName:
m_MethodName: BTN_InformationBack
m_Mode: 1
m_Arguments:
@@ -7588,7 +7663,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1520833342}
- m_TargetAssemblyTypeName: CanvasManager, Assembly-CSharp
+ m_TargetAssemblyTypeName:
m_MethodName: BTN_SendScoreFB
m_Mode: 1
m_Arguments:
@@ -7721,7 +7796,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1520833342}
- m_TargetAssemblyTypeName: CanvasManager, Assembly-CSharp
+ m_TargetAssemblyTypeName:
m_MethodName: BTN_Next
m_Mode: 1
m_Arguments:
@@ -8196,7 +8271,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1520833342}
- m_TargetAssemblyTypeName: CanvasManager, Assembly-CSharp
+ m_TargetAssemblyTypeName:
m_MethodName: BTN_InformationBack
m_Mode: 1
m_Arguments:
@@ -8347,7 +8422,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_text:
+ m_text: LOADING
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: e900e938f9772844aaa63b55506ebd3c, type: 2}
m_sharedMaterial: {fileID: -9150468066996468349, guid: e900e938f9772844aaa63b55506ebd3c, type: 2}
@@ -9123,7 +9198,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 722508710}
- m_TargetAssemblyTypeName: Settings, Assembly-CSharp
+ m_TargetAssemblyTypeName:
m_MethodName: BTN_Music
m_Mode: 1
m_Arguments:
@@ -9350,7 +9425,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1520833342}
- m_TargetAssemblyTypeName: CanvasManager, Assembly-CSharp
+ m_TargetAssemblyTypeName:
m_MethodName: BTN_InformationOpen
m_Mode: 1
m_Arguments:
@@ -9505,7 +9580,7 @@ MonoBehaviour:
storyText: {fileID: 275499402}
storyImage: {fileID: 1978771328}
mainStoryButton: {fileID: 683611435}
- nextButton: {fileID: 0}
+ loadingBlackScreen: {fileID: 173346898}
informationUI: {fileID: 1329918065}
--- !u!114 &1520833343
MonoBehaviour:
@@ -9586,6 +9661,7 @@ RectTransform:
- {fileID: 275165302}
- {fileID: 1351121006}
- {fileID: 1329918066}
+ - {fileID: 173346899}
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -9594,6 +9670,67 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
+--- !u!850595691 &1564014426
+LightingSettings:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Settings.lighting
+ serializedVersion: 3
+ m_GIWorkflowMode: 1
+ m_EnableBakedLightmaps: 0
+ m_EnableRealtimeLightmaps: 0
+ m_RealtimeEnvironmentLighting: 1
+ m_BounceScale: 1
+ m_AlbedoBoost: 1
+ m_IndirectOutputScale: 1
+ m_UsingShadowmask: 1
+ m_BakeBackend: 0
+ m_LightmapMaxSize: 1024
+ m_BakeResolution: 40
+ m_Padding: 2
+ m_TextureCompression: 1
+ m_AO: 0
+ m_AOMaxDistance: 1
+ m_CompAOExponent: 1
+ m_CompAOExponentDirect: 0
+ m_ExtractAO: 0
+ m_MixedBakeMode: 2
+ m_LightmapsBakeMode: 1
+ m_FilterMode: 1
+ m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
+ m_ExportTrainingData: 0
+ m_TrainingDataDestination: TrainingData
+ m_RealtimeResolution: 2
+ m_ForceWhiteAlbedo: 0
+ m_ForceUpdates: 0
+ m_FinalGather: 0
+ m_FinalGatherRayCount: 256
+ m_FinalGatherFiltering: 1
+ m_PVRCulling: 1
+ m_PVRSampling: 1
+ m_PVRDirectSampleCount: 32
+ m_PVRSampleCount: 500
+ m_PVREnvironmentSampleCount: 500
+ m_PVREnvironmentReferencePointCount: 2048
+ m_LightProbeSampleCountMultiplier: 4
+ m_PVRBounces: 2
+ m_PVRMinBounces: 2
+ m_PVREnvironmentMIS: 0
+ m_PVRFilteringMode: 2
+ m_PVRDenoiserTypeDirect: 0
+ m_PVRDenoiserTypeIndirect: 0
+ m_PVRDenoiserTypeAO: 0
+ m_PVRFilterTypeDirect: 0
+ m_PVRFilterTypeIndirect: 0
+ m_PVRFilterTypeAO: 0
+ m_PVRFilteringGaussRadiusDirect: 1
+ m_PVRFilteringGaussRadiusIndirect: 5
+ m_PVRFilteringGaussRadiusAO: 2
+ m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+ m_PVRFilteringAtrousPositionSigmaIndirect: 2
+ m_PVRFilteringAtrousPositionSigmaAO: 1
--- !u!1 &1587326287
GameObject:
m_ObjectHideFlags: 0
@@ -10393,7 +10530,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1520833342}
- m_TargetAssemblyTypeName: CanvasManager, Assembly-CSharp
+ m_TargetAssemblyTypeName:
m_MethodName: BTN_Gameover
m_Mode: 1
m_Arguments:
@@ -10526,7 +10663,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1520833342}
- m_TargetAssemblyTypeName: CanvasManager, Assembly-CSharp
+ m_TargetAssemblyTypeName:
m_MethodName: BTN_Information
m_Mode: 1
m_Arguments:
@@ -11141,7 +11278,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 722508710}
- m_TargetAssemblyTypeName: Settings, Assembly-CSharp
+ m_TargetAssemblyTypeName:
m_MethodName: BTN_Accept
m_Mode: 1
m_Arguments:
@@ -12426,21 +12563,23 @@ MonoBehaviour:
getHighScoresURL:
sendScoreURL:
getUserDataURL:
- consumeIntentosURL:
- gameConfigurationURL:
+ gameDataURL:
enemyBulletsPoolGreen: {fileID: 0}
enemyBulletsPoolRed: {fileID: 0}
enemyBulletsPoolFire: {fileID: 0}
enemyBombs: {fileID: 0}
- alias: test
- intentos: 0
+ user:
+ avatar: 0
+ id:
+ alias:
+ score:
bigExplosion: {fileID: 267842034401730938, guid: ad1e2d3776cace348b32e39891e0e3c2, type: 3}
minPosX: -2.5
maxPosX: 2.5
minPosY: -5
maxPosY: -2
debugMode: 0
- showStories: 1
+ showStories: 0
--- !u!4 &2140480312
Transform:
m_ObjectHideFlags: 0
diff --git a/Assets/WebGLTemplates/MainTemplate/index.html b/Assets/WebGLTemplates/MainTemplate/index.html
index 12dbebc..bc6b361 100644
--- a/Assets/WebGLTemplates/MainTemplate/index.html
+++ b/Assets/WebGLTemplates/MainTemplate/index.html
@@ -31,13 +31,13 @@
- -->
+
+
+
+
diff --git a/Assets/WebGLTemplates/Crazy_2020/index.html.meta b/Assets/WebGLTemplates/Crazy_2020/index.html.meta
new file mode 100644
index 0000000..b5521be
--- /dev/null
+++ b/Assets/WebGLTemplates/Crazy_2020/index.html.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9b055bbce97f671419bb48caa1f53907
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/WebGLTemplates/Crazy_2020/template.html b/Assets/WebGLTemplates/Crazy_2020/template.html
new file mode 100644
index 0000000..e86dd29
--- /dev/null
+++ b/Assets/WebGLTemplates/Crazy_2020/template.html
@@ -0,0 +1,18 @@
+
+
+
+