Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
GraphicEdit committed Jan 2, 2024
1 parent 399ef4b commit d90d6f0
Show file tree
Hide file tree
Showing 32 changed files with 177 additions and 211 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion DarkFlow/Assets/Characters/3_Abe/Kicking.fbx.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 0 additions & 48 deletions DarkFlow/Assets/Editor/StartupSceneLoader.cs

This file was deleted.

Empty file added DarkFlow/Assets/Plugins/.keep
Empty file.
8 changes: 0 additions & 8 deletions DarkFlow/Assets/Plugins/ParrelSync/ScriptableObjects.meta

This file was deleted.

This file was deleted.

This file was deleted.

11 changes: 6 additions & 5 deletions DarkFlow/Assets/Scenes/systemTest.unity
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -411,17 +411,18 @@ MonoBehaviour:
m_GameObject: {fileID: 518869412}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fa1cd3d59b877b84aa6a7258c317c615, type: 3}
m_Script: {fileID: 11500000, guid: 5ac29fa319c8230458f11f733c334933, type: 3}
m_Name:
m_EditorClassIdentifier:
npcName: Billy NPC
desc: A guy who just AIs for fun.
isHostile: 0
NPCText: Hey there. I bet you didn't think I could talk yet!
dropOnDeath: {fileID: 0}
audioSource: {fileID: 0}
health: {fileID: 518869414}
npcNameBox: {fileID: 1860595803}
npcChatBox: {fileID: 1324247241}
health: {fileID: 0}
npcNameBox: {fileID: 0}
npcChatBox: {fileID: 0}
--- !u!136 &518869416
CapsuleCollider:
m_ObjectHideFlags: 0
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions DarkFlow/Assets/Scripts/AI/NPC.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions DarkFlow/Assets/Scripts/CharacterSystems/CharacterMain.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using UnityEngine;
using UnityEngine.InputSystem;



public class CharacterMain : MonoBehaviour
{
private bool isJumping;
Expand All @@ -16,7 +18,7 @@ public class CharacterMain : MonoBehaviour

private void Start()
{

}

private void Update()
Expand Down Expand Up @@ -63,4 +65,4 @@ private void HandleMovement()
*/
}
}
}
14 changes: 0 additions & 14 deletions DarkFlow/Assets/Scripts/ClientNetworkAnimator.cs

This file was deleted.

13 changes: 0 additions & 13 deletions DarkFlow/Assets/Scripts/ClientNetworkTransform.cs

This file was deleted.

44 changes: 0 additions & 44 deletions DarkFlow/Assets/Scripts/ClientPlayerSetings.cs

This file was deleted.

File renamed without changes.
32 changes: 32 additions & 0 deletions DarkFlow/Assets/Scripts/Editor/StartupSceneLoader.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
using UnityEditor;
using UnityEngine;
using UnityEditor.SceneManagement;

namespace DarkFlow.Editor
{
[InitializeOnLoadAttribute]
public static class StartupSceneLoader
{
static StartupSceneLoader()
{
EditorApplication.playModeStateChanged += LoadStartupScene;
}

static void LoadStartupScene(PlayModeStateChange state)
{
if (state == PlayModeStateChange.ExitingEditMode)
{
EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo();
}

if (state == PlayModeStateChange.EnteredPlayMode)
{
if (EditorSceneManager.GetActiveScene().buildIndex != 0 && EditorSceneManager.GetActiveScene().name != "systemTest")
{
EditorSceneManager.LoadScene(0);

}
}
}
}
}
39 changes: 0 additions & 39 deletions DarkFlow/Assets/Scripts/Matchplayer.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ void OnServerSpawnPlayer()
}
}
}

14 changes: 14 additions & 0 deletions DarkFlow/Assets/Scripts/Networking/ClientNetworkAnimator.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using System.Collections;
using System.Collections.Generic;
using Unity.Netcode.Components;
using UnityEngine;

[DisallowMultipleComponent]
public class ClientNetworkAnimator : NetworkAnimator
{
protected override bool OnIsServerAuthoritative()
{
return false;
}
}

Loading

0 comments on commit d90d6f0

Please sign in to comment.