From 399ae7d7f236c0a5ab924523e5bde1d80a40a504 Mon Sep 17 00:00:00 2001 From: "sewmina7@gmail.com" Date: Mon, 22 Jul 2024 21:28:18 +0530 Subject: [PATCH] enemy death respawn --- .../Prefabs/Monster_13_Stone Golem.prefab | 2 +- .../Prefabs/Monster_14_Magma Golem.prefab | 2 +- .../Prefabs/Monster_19_Skeleton.prefab | 2 +- .../Prefabs/Monster_20_Skeleton King.prefab | 2 +- .../Prefabs/Monster_48_Flower.prefab | 2 +- .../Prefabs/Monster_49_Dark Flower.prefab | 2 +- .../Prefabs/Monster_58_Sword Block.prefab | 2 +- .../Prefabs/Monster_66_Scythe Ghost.prefab | 2 +- .../Prefabs/Monster_67_Rune Ghost.prefab | 2 +- Assets/GameManager.cs | 41 +++++++++++++++++++ .../Upgrade for URP.unitypackage.meta | 7 ---- Assets/MultiplayerPrefab/Golem.prefab | 2 +- Assets/Script/enemyScript.cs | 26 ++++++++++-- Assets/Script/playerNetwork.cs | 2 +- Packages/packages-lock.json | 35 ++++++++-------- .../BurstAotSettings_StandaloneLinux64.json | 17 ++++++++ ProjectSettings/EditorBuildSettings.asset | 4 +- ProjectSettings/ProjectVersion.txt | 4 +- 18 files changed, 113 insertions(+), 43 deletions(-) delete mode 100644 Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta create mode 100644 ProjectSettings/BurstAotSettings_StandaloneLinux64.json diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_13_Stone Golem.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_13_Stone Golem.prefab index 92e8a151..3fb72cb1 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_13_Stone Golem.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_13_Stone Golem.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 2613116b8a9839f4eb8abb181b83477e, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_14_Magma Golem.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_14_Magma Golem.prefab index 7b5a56c1..c6b2dda7 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_14_Magma Golem.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_14_Magma Golem.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: ad5de8193a625af48b1318e417ae6c7e, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_19_Skeleton.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_19_Skeleton.prefab index 51dae4b6..d726e603 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_19_Skeleton.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_19_Skeleton.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 5c1e5d25177fa1740921151b338e4d3b, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_20_Skeleton King.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_20_Skeleton King.prefab index 28725121..7ade41d3 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_20_Skeleton King.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_20_Skeleton King.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 9636898e0cabdf64d99f5040090fe41e, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_48_Flower.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_48_Flower.prefab index 73dd8a18..66de2476 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_48_Flower.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_48_Flower.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: cf8ec3e416933f743be4df134d5e44b1, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_49_Dark Flower.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_49_Dark Flower.prefab index 1629714f..5e18d2ee 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_49_Dark Flower.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_49_Dark Flower.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 645f88d72b3eef14ea19d492a14cf019, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_58_Sword Block.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_58_Sword Block.prefab index b81d11f9..45bd9292 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_58_Sword Block.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_58_Sword Block.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 8e74db0c7188ac54caf60d60c6f47ad8, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_66_Scythe Ghost.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_66_Scythe Ghost.prefab index f7dce126..726d095a 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_66_Scythe Ghost.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_66_Scythe Ghost.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 1b30e6bfb9cebd5418e40f107af416af, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_67_Rune Ghost.prefab b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_67_Rune Ghost.prefab index 4214db6e..e1c3d906 100644 --- a/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_67_Rune Ghost.prefab +++ b/Assets/4Direction Animated 2D Monsters (Fantazia Top Down)/Prefabs/Monster_67_Rune Ghost.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 29a955f37eb0e3549a9a2dfdc8ebcff6, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/GameManager.cs b/Assets/GameManager.cs index c8710175..2f658a73 100644 --- a/Assets/GameManager.cs +++ b/Assets/GameManager.cs @@ -91,6 +91,47 @@ public class GameManager : NetworkBehaviour Debug.LogError("Couldn't find loot data for " + type); } + + public static void OnEnemyDeath(enemyScript enemy, Vector3 spawnPos) + { + instance.onEnemyDeath(enemy,spawnPos); + } + + public void onEnemyDeath(enemyScript enemy, Vector3 spawnPos) + { + if (!isServer) + { + Debug.LogError("Server function called on client. This cant happen"); + return; + } + string enemyName = enemy.transform.name; + int enemyLevel = enemy.level; + + NetworkServer.Destroy(enemy.gameObject); + + foreach(EnemySpawnEntry entry in enemySpawns) + { + if (entry.prefab.name.Contains(enemyName.Replace("(Clone)",""))) + { + StartCoroutine(SpawnLater(entry.prefab, spawnPos, 5, enemyLevel)); + Debug.Log("Found enemy prefab for " + enemyName); + return; + } + } + Debug.LogError("Unable to find matching prefab for " + enemyName); + } + + + IEnumerator SpawnLater(GameObject go, Vector3 pos, float timer, int level) + { + yield return new WaitForSeconds(timer); + GameObject newGo = Instantiate(go, pos, Quaternion.identity); + + NetworkServer.Spawn(newGo); + newGo.GetComponent().SetLevel(level); + + } + } diff --git a/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta b/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta deleted file mode 100644 index 1d182472..00000000 --- a/Assets/Lana Studio/Casual RPG VFX/Upgrade for URP/Upgrade for URP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5b07afdbcf13e43438545d591cfd2e4b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/MultiplayerPrefab/Golem.prefab b/Assets/MultiplayerPrefab/Golem.prefab index 3a61d10e..99efc1b9 100644 --- a/Assets/MultiplayerPrefab/Golem.prefab +++ b/Assets/MultiplayerPrefab/Golem.prefab @@ -104,7 +104,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 2613116b8a9839f4eb8abb181b83477e, type: 2} + - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Script/enemyScript.cs b/Assets/Script/enemyScript.cs index e80da5d8..ad1677e5 100755 --- a/Assets/Script/enemyScript.cs +++ b/Assets/Script/enemyScript.cs @@ -395,16 +395,36 @@ public class enemyScript : NetworkBehaviour GameObject newLoot = Instantiate(GameManager.instance.GetRandomLoot(), lootSpawnPos, Quaternion.identity); NetworkServer.Spawn(newLoot); - yield return new WaitForSecondsRealtime(5); - transform.position = defaultPos; + yield return new WaitForSecondsRealtime(3); + + + if (!isServer) + { + CmdDie(); + } + else + { + GameManager.OnEnemyDeath(this, defaultPos); + } + + /* transform.position = defaultPos; health = (int)maxHealth; - magicalHealth = (int)maxHealth; + magicalHealth = (int)maxHealth;*/ //animationString = "Idle"; } + + [Command] + void CmdDie() + { + GameManager.OnEnemyDeath(this,defaultPos); + } + + + public void OnHealthChange(int oldVlaue, int newValue){ healthBar.SetHealth(newValue,maxHealth); diff --git a/Assets/Script/playerNetwork.cs b/Assets/Script/playerNetwork.cs index 0c9128cc..473db7f0 100755 --- a/Assets/Script/playerNetwork.cs +++ b/Assets/Script/playerNetwork.cs @@ -694,7 +694,7 @@ public class playerNetwork : NetworkBehaviour startClient.instance.networkManager.StopClient(); SceneManager.LoadScene("GameLogin"); -#if UNITY_EDITOR +#if UNITY_EDITOR || UNITY_SERVER #else PlayGamesPlatform.Instance.SignOut(); Firebase.Auth.FirebaseAuth.DefaultInstance.SignOut(); diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index affa79e0..db74cd40 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "9.1.1", + "version": "9.0.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.2", + "com.unity.2d.common": "8.0.1", "com.unity.2d.sprite": "1.0.0", "com.unity.collections": "1.1.0", "com.unity.modules.animation": "1.0.0", @@ -14,7 +14,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.aseprite": { - "version": "1.1.4", + "version": "1.0.0", "depth": 1, "source": "registry", "dependencies": { @@ -26,7 +26,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "8.0.2", + "version": "8.0.1", "depth": 2, "source": "registry", "dependencies": { @@ -46,12 +46,12 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "8.0.5", + "version": "8.0.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.animation": "9.1.1", - "com.unity.2d.common": "8.0.2", + "com.unity.2d.animation": "9.0.1", + "com.unity.2d.common": "8.0.1", "com.unity.2d.sprite": "1.0.0" }, "url": "https://packages.unity.com" @@ -63,12 +63,12 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "9.0.3", + "version": "9.0.2", "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "8.0.2", + "com.unity.2d.common": "8.0.1", "com.unity.modules.physics2d": "1.0.0" }, "url": "https://packages.unity.com" @@ -83,7 +83,7 @@ } }, "com.unity.2d.tilemap.extras": { - "version": "3.1.2", + "version": "3.1.1", "depth": 1, "source": "registry", "dependencies": { @@ -95,12 +95,11 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.15", + "version": "1.8.7", "depth": 3, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.mathematics": "1.2.1" }, "url": "https://packages.unity.com" }, @@ -133,14 +132,14 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "9.1.1", + "com.unity.2d.animation": "9.0.3", "com.unity.2d.pixel-perfect": "5.0.3", - "com.unity.2d.psdimporter": "8.0.5", + "com.unity.2d.psdimporter": "8.0.2", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "9.0.3", + "com.unity.2d.spriteshape": "9.0.2", "com.unity.2d.tilemap": "1.0.0", - "com.unity.2d.tilemap.extras": "3.1.2", - "com.unity.2d.aseprite": "1.1.4" + "com.unity.2d.tilemap.extras": "3.1.1", + "com.unity.2d.aseprite": "1.0.0" } }, "com.unity.ide.rider": { diff --git a/ProjectSettings/BurstAotSettings_StandaloneLinux64.json b/ProjectSettings/BurstAotSettings_StandaloneLinux64.json new file mode 100644 index 00000000..ca7cf1a1 --- /dev/null +++ b/ProjectSettings/BurstAotSettings_StandaloneLinux64.json @@ -0,0 +1,17 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "DebugDataKind": 1, + "EnableArmv9SecurityFeatures": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX64": 72, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 2a87c2b5..5b7e626f 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,10 +5,10 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 + - enabled: 0 path: Assets/Scenes/GameLogin.unity guid: 8f7fc7ae237f341739c369fc7d9f4b75 - - enabled: 1 + - enabled: 0 path: Assets/Scenes/MenuScene.unity guid: a141cf40801414f09a4017e4a9f84683 - enabled: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 31459c03..78a77889 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.33f1 -m_EditorVersionWithRevision: 2022.3.33f1 (b2c853adf198) +m_EditorVersion: 2022.3.7f1 +m_EditorVersionWithRevision: 2022.3.7f1 (b16b3b16c7a0)