Merge branch 'SamWorkset'

This commit is contained in:
2026-01-03 13:46:54 +02:00
1858 changed files with 148220 additions and 9923 deletions

View File

@@ -12,6 +12,8 @@ GameObject:
- component: {fileID: 3622985744187477872}
- component: {fileID: 4889582830418939434}
- component: {fileID: 4334268454398699518}
- component: {fileID: 1040399542938643003}
- component: {fileID: 7898671522480671537}
m_Layer: 5
m_Name: LetterButton
m_TagString: Untagged
@@ -122,6 +124,59 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1040399542938643003
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1943907191875735250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Delegates:
- eventID: 0
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 7898671522480671537}
m_TargetAssemblyTypeName: ButtonHoverSound, Assembly-CSharp
m_MethodName: OnSelect
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 7898671522480671537}
m_TargetAssemblyTypeName: ButtonHoverSound, Assembly-CSharp
m_MethodName: OnDeselect
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &7898671522480671537
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1943907191875735250}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cb2f1526149f8b44cad00bbed8424a37, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7747026983332875138
GameObject:
m_ObjectHideFlags: 0

View File

@@ -3,6 +3,7 @@ using FishNet.Object;
using FishNet.Object.Synchronizing;
using UnityEngine;
public class ArcheryTarget : NetworkBehaviour, IArrowHittable
{
public GameObject pointsText;
@@ -46,6 +47,8 @@ public class ArcheryTarget : NetworkBehaviour, IArrowHittable
target.SetPoints(score);
Spawn(prefab);
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.UFODestroy, gameObject);
Despawn(arrow.gameObject, DespawnType.Pool);
Despawn(gameObject, DespawnType.Pool);
}

View File

@@ -0,0 +1,15 @@
using UnityEngine;
using UnityEngine.EventSystems;
using FMODUnity;
public class ButtonHoverSound : MonoBehaviour, ISelectHandler, IDeselectHandler
{
public void OnSelect(BaseEventData eventData)
{
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterHover, gameObject);
}
public void OnDeselect(BaseEventData eventData)
{
// Nothing needed here, unless you want a deselect effect
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: cb2f1526149f8b44cad00bbed8424a37
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,9 +1,10 @@
using FishNet.Object;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
public class KeyboardManager : MonoBehaviour
public class KeyboardManager : NetworkBehaviour
{
public enum ShiftMode { Lowercase, NextUppercase, Uppercase }
@@ -25,6 +26,7 @@ public class KeyboardManager : MonoBehaviour
private float _currentScore;
private ShiftMode _shiftMode = ShiftMode.Lowercase;
void Start()
{
foreach (var button in letterButtons)
@@ -76,6 +78,7 @@ public class KeyboardManager : MonoBehaviour
string letter = label.text;
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, button.gameObject);
switch (_shiftMode)
{
case ShiftMode.Lowercase:
@@ -96,6 +99,8 @@ public class KeyboardManager : MonoBehaviour
void OnShiftPressed()
{
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, shiftButton.gameObject);
_shiftMode = _shiftMode switch
{
ShiftMode.Lowercase => ShiftMode.NextUppercase,
@@ -109,6 +114,8 @@ public class KeyboardManager : MonoBehaviour
void OnBackspacePressed()
{
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, backspaceButton.gameObject);
if (_input.Length > 0)
_input = _input.Substring(0, _input.Length - 1);
UpdateOutput();
@@ -116,6 +123,8 @@ public class KeyboardManager : MonoBehaviour
void OnEnterPressed()
{
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, enterButton.gameObject);
if (_input.Length > 0)
{
scoreBoard.SaveScore(_input, _currentScore);
@@ -125,6 +134,8 @@ public class KeyboardManager : MonoBehaviour
void OnSpacePressed()
{
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.LetterEnter, spaceButton.gameObject);
addToInput(" ");
UpdateOutput();
}

View File

@@ -1,3 +1,4 @@
using FishNet.Object;
using System;
using System.Collections.Generic;
using System.IO;
@@ -5,7 +6,7 @@ using System.Linq;
using TMPro;
using UnityEngine;
public class ScoreBoard : MonoBehaviour
public class ScoreBoard : NetworkBehaviour
{
[System.Serializable]
public class ScoreEntry