opt server

This commit is contained in:
Nim XD 2024-04-12 00:45:57 +05:30
parent b345dfc48b
commit 6ac49cab2f
25 changed files with 66 additions and 589 deletions

BIN
.DS_Store vendored

Binary file not shown.

BIN
Assets/.DS_Store vendored

Binary file not shown.

View File

@ -62,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 0} - {fileID: 2100000, guid: 2613116b8a9839f4eb8abb181b83477e, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -62,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 0} - {fileID: 2100000, guid: ad5de8193a625af48b1318e417ae6c7e, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -62,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 0} - {fileID: 2100000, guid: 5c1e5d25177fa1740921151b338e4d3b, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -62,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 0} - {fileID: 2100000, guid: 9636898e0cabdf64d99f5040090fe41e, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -62,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 0} - {fileID: 2100000, guid: cf8ec3e416933f743be4df134d5e44b1, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -62,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 0} - {fileID: 2100000, guid: 645f88d72b3eef14ea19d492a14cf019, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -62,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 0} - {fileID: 2100000, guid: 8e74db0c7188ac54caf60d60c6f47ad8, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -62,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 0} - {fileID: 2100000, guid: f6a02f93ff106dc4182282e95c48a7b6, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -62,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 0} - {fileID: 2100000, guid: 1b30e6bfb9cebd5418e40f107af416af, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -62,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 0} - {fileID: 2100000, guid: 29a955f37eb0e3549a9a2dfdc8ebcff6, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -104,7 +104,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 0} - {fileID: 2100000, guid: 2613116b8a9839f4eb8abb181b83477e, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0

View File

@ -6326,6 +6326,7 @@ MonoBehaviour:
questActions: [] questActions: []
completedQuests: [] completedQuests: []
isLoaded: 0 isLoaded: 0
playerAttack: {fileID: 0}
isDead: 0 isDead: 0
--- !u!114 &436175964407393514 --- !u!114 &436175964407393514
MonoBehaviour: MonoBehaviour:

View File

@ -3596,7 +3596,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6a160d838ff8b4b4693ac20007e008c7, type: 3} m_Script: {fileID: 11500000, guid: 6a160d838ff8b4b4693ac20007e008c7, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_AssetsPPU: 42 m_AssetsPPU: 39
m_RefResolutionX: 640 m_RefResolutionX: 640
m_RefResolutionY: 384 m_RefResolutionY: 384
m_UpscaleRT: 0 m_UpscaleRT: 0
@ -246824,7 +246824,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1650164939} m_GameObject: {fileID: 1650164939}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6442dc8070ceb41f094e44de0bf87274, type: 3} m_Script: {fileID: 11500000, guid: 6442dc8070ceb41f094e44de0bf87274, type: 3}
m_Name: m_Name:
@ -246838,7 +246838,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1650164939} m_GameObject: {fileID: 1650164939}
m_Enabled: 0 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d3a46f3965e4c4fca9282d03e7c4ecf9, type: 3} m_Script: {fileID: 11500000, guid: d3a46f3965e4c4fca9282d03e7c4ecf9, type: 3}
m_Name: m_Name:

View File

@ -15,10 +15,12 @@ public class SpriteHealthBar : MonoBehaviour
} }
public void SetHealth(float amount, float maxHealth = 100f){ public void SetHealth(float amount, float maxHealth = 100f){
if(maxHealth == 0 ){Debug.Log("max health is 0"); return;}
health = amount; health = amount;
float amountMult = amount / maxHealth; float amountMult = amount / maxHealth;
// Debug.Log($"Setting health {amount} / {maxHealth}"); // Debug.Log($"Setting health {amount} / {maxHealth}");
healthBarFill.localScale = new Vector3(startScale.x * amountMult, startScale.y,startScale.z ); healthBarFill.localScale = new Vector3(startScale.x * amountMult, startScale.y,startScale.z );
} }
} }

View File

@ -6,8 +6,13 @@ public class enemyHealthBar : MonoBehaviour
{ {
public enemyScript enemy; public enemyScript enemy;
float timer=0;
void Update() void Update()
{ {
if(timer >=0){ timer -= Time.deltaTime; return;}
timer = 0.5f;
enemy.healthBar.SetHealth(enemy.health, enemy.maxHealth); enemy.healthBar.SetHealth(enemy.health, enemy.maxHealth);
} }
} }

View File

@ -37,6 +37,9 @@ public class enemyScript : NetworkBehaviour
public int enemyAttackDamage = 10; public int enemyAttackDamage = 10;
void Awake(){
scanCooldown = Random.Range(0.5f, 1.5f);
}
private void Start(){ private void Start(){
rb2 = GetComponent<Rigidbody2D>(); rb2 = GetComponent<Rigidbody2D>();
//target = GameObject.FindWithTag("Player").transform; //target = GameObject.FindWithTag("Player").transform;
@ -44,7 +47,11 @@ public class enemyScript : NetworkBehaviour
defaultPos = transform.position; defaultPos = transform.position;
} }
[SyncVar(hook =nameof(OnLevelChanged))]
public int level; public int level;
void OnLevelChanged(int oldVal, int newVal){
SetLevel(newVal);
}
public void SetLevel(int _level){ public void SetLevel(int _level){
if(enemyLevel != null){ if(enemyLevel != null){
enemyLevel.text = _level.ToString(); enemyLevel.text = _level.ToString();
@ -64,7 +71,7 @@ public class enemyScript : NetworkBehaviour
Vector3 defaultPos; Vector3 defaultPos;
#if UNITY_SERVER
[Server] [Server]
private void Update(){ private void Update(){
@ -86,6 +93,17 @@ public class enemyScript : NetworkBehaviour
} }
}
#endif
float scanTimer =0;
float scanCooldown;
public void ScanPlayers(){
if(scanTimer >0){scanTimer-=Time.deltaTime; return;}
scanTimer = scanCooldown;
playerNetwork[] playersinNetwork = FindObjectsOfType<playerNetwork>(); playerNetwork[] playersinNetwork = FindObjectsOfType<playerNetwork>();
float closestDist = float.MaxValue; float closestDist = float.MaxValue;
playerNetwork closestPlayer = null; playerNetwork closestPlayer = null;
@ -111,7 +129,6 @@ public class enemyScript : NetworkBehaviour
//if(target == null) {return;} //if(target == null) {return;}
enemyFollow(); enemyFollow();
} }
// [ClientRpc] // [ClientRpc]

View File

@ -8,7 +8,12 @@ public class pickup : NetworkBehaviour
public string lootType = "default"; public string lootType = "default";
float updaterInterval = 0.4f; float updaterInterval = 0.8f;
void Awake(){
updaterInterval += Random.Range(0,0.2f);
}
float t = 0; float t = 0;
public float pickupDistance = 2; public float pickupDistance = 2;
public float closestPlayerDist = float.MaxValue; public float closestPlayerDist = float.MaxValue;
@ -25,7 +30,7 @@ public class pickup : NetworkBehaviour
void ScanPlayers(){ void ScanPlayers(){
playerNetwork[] players = FindObjectsOfType<playerNetwork>(); playerNetwork[] players = FindObjectsOfType<playerNetwork>();
if(players.Length <=0){return;}
playerNetwork closestPlayer = players[0]; playerNetwork closestPlayer = players[0];
closestPlayerDist = float.MaxValue; closestPlayerDist = float.MaxValue;
foreach(playerNetwork player in players){ foreach(playerNetwork player in players){

View File

@ -457,8 +457,12 @@ public class playerNetwork : NetworkBehaviour
death(); death();
} }
} }
public void ShowXP(){
float xpTimer = 0;
public void ShowXP(){
if(xpTimer >0){xpTimer -= Time.deltaTime;return;}
xpTimer = 1;
xpText.text = XP.ToString(); xpText.text = XP.ToString();
xpSlider.value = XpSliderVal; xpSlider.value = XpSliderVal;
@ -620,7 +624,7 @@ public class playerNetwork : NetworkBehaviour
startClient.instance.networkManager.StopClient(); startClient.instance.networkManager.StopClient();
SceneManager.LoadScene("GameLogin"); SceneManager.LoadScene("GameLogin");
// PlayGamesPlatform.Instance.SignOut(); PlayGamesPlatform.Instance.SignOut();
Firebase.Auth.FirebaseAuth.DefaultInstance.SignOut(); Firebase.Auth.FirebaseAuth.DefaultInstance.SignOut();
} }

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@ -4,7 +4,7 @@
QualitySettings: QualitySettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 5 serializedVersion: 5
m_CurrentQuality: 5 m_CurrentQuality: 2
m_QualitySettings: m_QualitySettings:
- serializedVersion: 3 - serializedVersion: 3
name: Very Low name: Very Low