Compare commits
No commits in common. "c635e0a0b76fa27c8aeed20a08a9f740d5924a4e" and "f39fae335cd8a32c0587d7e6345d0d321e5eb897" have entirely different histories.
c635e0a0b7
...
f39fae335c
@ -15,7 +15,7 @@ MonoBehaviour:
|
|||||||
m_Logging: 1
|
m_Logging: 1
|
||||||
m_AutomaticPerformanceModeEnabled: 1
|
m_AutomaticPerformanceModeEnabled: 1
|
||||||
m_EnableBoostOnStartup: 1
|
m_EnableBoostOnStartup: 1
|
||||||
m_StatsLoggingFrequencyInFrames: 30
|
m_StatsLoggingFrequencyInFrames: 50
|
||||||
m_IndexerSettings:
|
m_IndexerSettings:
|
||||||
m_Active: 1
|
m_Active: 1
|
||||||
m_ThermalActionDelay: 10
|
m_ThermalActionDelay: 10
|
||||||
|
|||||||
Binary file not shown.
@ -1,23 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: f03afcd094e19824e8549f6fec3655ef
|
|
||||||
AudioImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 7
|
|
||||||
defaultSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
loadType: 0
|
|
||||||
sampleRateSetting: 0
|
|
||||||
sampleRateOverride: 44100
|
|
||||||
compressionFormat: 1
|
|
||||||
quality: 1
|
|
||||||
conversionMode: 0
|
|
||||||
preloadAudioData: 1
|
|
||||||
platformSettingOverrides: {}
|
|
||||||
forceToMono: 0
|
|
||||||
normalize: 1
|
|
||||||
loadInBackground: 1
|
|
||||||
ambisonic: 0
|
|
||||||
3D: 1
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Binary file not shown.
@ -1,23 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 82a8d17c2698c834f96370756847edec
|
|
||||||
AudioImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 7
|
|
||||||
defaultSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
loadType: 0
|
|
||||||
sampleRateSetting: 0
|
|
||||||
sampleRateOverride: 44100
|
|
||||||
compressionFormat: 1
|
|
||||||
quality: 1
|
|
||||||
conversionMode: 0
|
|
||||||
preloadAudioData: 0
|
|
||||||
platformSettingOverrides: {}
|
|
||||||
forceToMono: 0
|
|
||||||
normalize: 1
|
|
||||||
loadInBackground: 0
|
|
||||||
ambisonic: 0
|
|
||||||
3D: 1
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@ -13,7 +13,6 @@ MonoBehaviour:
|
|||||||
m_Name: Input System Input Settings
|
m_Name: Input System Input Settings
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_SupportedDevices:
|
m_SupportedDevices:
|
||||||
- Mouse
|
|
||||||
- Gamepad
|
- Gamepad
|
||||||
- Keyboard
|
- Keyboard
|
||||||
m_UpdateMode: 1
|
m_UpdateMode: 1
|
||||||
@ -2,7 +2,7 @@
|
|||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
|
// This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
|
||||||
// version 1.6.3
|
// version 1.6.3
|
||||||
// from Assets/Input System Settings/InputActionMaps.inputactions
|
// from Assets/Input/InputActionMaps.inputactions
|
||||||
//
|
//
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
// the code is regenerated.
|
// the code is regenerated.
|
||||||
@ -56,7 +56,7 @@ public partial class @InputActionMaps: IInputActionCollection2, IDisposable
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
""name"": ""Boost"",
|
""name"": ""Boost"",
|
||||||
""type"": ""PassThrough"",
|
""type"": ""Button"",
|
||||||
""id"": ""c8819d8c-8dc4-4eb6-ae07-132d6fffbed4"",
|
""id"": ""c8819d8c-8dc4-4eb6-ae07-132d6fffbed4"",
|
||||||
""expectedControlType"": ""Button"",
|
""expectedControlType"": ""Button"",
|
||||||
""processors"": """",
|
""processors"": """",
|
||||||
@ -429,76 +429,6 @@ public partial class @InputActionMaps: IInputActionCollection2, IDisposable
|
|||||||
""isPartOfComposite"": false
|
""isPartOfComposite"": false
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
""name"": ""Meta"",
|
|
||||||
""id"": ""a5c1447b-b3fb-4a89-b942-fdf9beb5a79f"",
|
|
||||||
""actions"": [
|
|
||||||
{
|
|
||||||
""name"": ""Start"",
|
|
||||||
""type"": ""Button"",
|
|
||||||
""id"": ""18797b6b-ee2f-4fde-85c6-b70e831cdf95"",
|
|
||||||
""expectedControlType"": ""Button"",
|
|
||||||
""processors"": """",
|
|
||||||
""interactions"": """",
|
|
||||||
""initialStateCheck"": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
""name"": ""Pause"",
|
|
||||||
""type"": ""Button"",
|
|
||||||
""id"": ""2cf1215a-a9ec-4bce-8f08-978e08472f6a"",
|
|
||||||
""expectedControlType"": ""Button"",
|
|
||||||
""processors"": """",
|
|
||||||
""interactions"": """",
|
|
||||||
""initialStateCheck"": false
|
|
||||||
}
|
|
||||||
],
|
|
||||||
""bindings"": [
|
|
||||||
{
|
|
||||||
""name"": """",
|
|
||||||
""id"": ""5a7b5d2a-ece5-46e0-a265-deb8949f1b47"",
|
|
||||||
""path"": ""<Gamepad>/start"",
|
|
||||||
""interactions"": """",
|
|
||||||
""processors"": """",
|
|
||||||
""groups"": ""Controller"",
|
|
||||||
""action"": ""Start"",
|
|
||||||
""isComposite"": false,
|
|
||||||
""isPartOfComposite"": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
""name"": """",
|
|
||||||
""id"": ""3cd0cfc6-4d22-448f-8f55-ce3678def10a"",
|
|
||||||
""path"": ""<Keyboard>/enter"",
|
|
||||||
""interactions"": """",
|
|
||||||
""processors"": """",
|
|
||||||
""groups"": ""Keyboard 1;Keyboard 2"",
|
|
||||||
""action"": ""Start"",
|
|
||||||
""isComposite"": false,
|
|
||||||
""isPartOfComposite"": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
""name"": """",
|
|
||||||
""id"": ""98e0906e-0a6c-4097-a3f8-4d8640ad4d2a"",
|
|
||||||
""path"": ""<Gamepad>/start"",
|
|
||||||
""interactions"": """",
|
|
||||||
""processors"": """",
|
|
||||||
""groups"": ""Controller"",
|
|
||||||
""action"": ""Pause"",
|
|
||||||
""isComposite"": false,
|
|
||||||
""isPartOfComposite"": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
""name"": """",
|
|
||||||
""id"": ""fa09a433-c040-4da0-8e75-7c8a5f62d4ce"",
|
|
||||||
""path"": ""<Keyboard>/escape"",
|
|
||||||
""interactions"": """",
|
|
||||||
""processors"": """",
|
|
||||||
""groups"": ""Keyboard 1;Keyboard 2"",
|
|
||||||
""action"": ""Pause"",
|
|
||||||
""isComposite"": false,
|
|
||||||
""isPartOfComposite"": false
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
""controlSchemes"": [
|
""controlSchemes"": [
|
||||||
@ -548,10 +478,6 @@ public partial class @InputActionMaps: IInputActionCollection2, IDisposable
|
|||||||
m_Player_Steer = m_Player.FindAction("Steer", throwIfNotFound: true);
|
m_Player_Steer = m_Player.FindAction("Steer", throwIfNotFound: true);
|
||||||
m_Player_Reset = m_Player.FindAction("Reset", throwIfNotFound: true);
|
m_Player_Reset = m_Player.FindAction("Reset", throwIfNotFound: true);
|
||||||
m_Player_Boost = m_Player.FindAction("Boost", throwIfNotFound: true);
|
m_Player_Boost = m_Player.FindAction("Boost", throwIfNotFound: true);
|
||||||
// Meta
|
|
||||||
m_Meta = asset.FindActionMap("Meta", throwIfNotFound: true);
|
|
||||||
m_Meta_Start = m_Meta.FindAction("Start", throwIfNotFound: true);
|
|
||||||
m_Meta_Pause = m_Meta.FindAction("Pause", throwIfNotFound: true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
@ -679,60 +605,6 @@ public partial class @InputActionMaps: IInputActionCollection2, IDisposable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
public PlayerActions @Player => new PlayerActions(this);
|
public PlayerActions @Player => new PlayerActions(this);
|
||||||
|
|
||||||
// Meta
|
|
||||||
private readonly InputActionMap m_Meta;
|
|
||||||
private List<IMetaActions> m_MetaActionsCallbackInterfaces = new List<IMetaActions>();
|
|
||||||
private readonly InputAction m_Meta_Start;
|
|
||||||
private readonly InputAction m_Meta_Pause;
|
|
||||||
public struct MetaActions
|
|
||||||
{
|
|
||||||
private @InputActionMaps m_Wrapper;
|
|
||||||
public MetaActions(@InputActionMaps wrapper) { m_Wrapper = wrapper; }
|
|
||||||
public InputAction @Start => m_Wrapper.m_Meta_Start;
|
|
||||||
public InputAction @Pause => m_Wrapper.m_Meta_Pause;
|
|
||||||
public InputActionMap Get() { return m_Wrapper.m_Meta; }
|
|
||||||
public void Enable() { Get().Enable(); }
|
|
||||||
public void Disable() { Get().Disable(); }
|
|
||||||
public bool enabled => Get().enabled;
|
|
||||||
public static implicit operator InputActionMap(MetaActions set) { return set.Get(); }
|
|
||||||
public void AddCallbacks(IMetaActions instance)
|
|
||||||
{
|
|
||||||
if (instance == null || m_Wrapper.m_MetaActionsCallbackInterfaces.Contains(instance)) return;
|
|
||||||
m_Wrapper.m_MetaActionsCallbackInterfaces.Add(instance);
|
|
||||||
@Start.started += instance.OnStart;
|
|
||||||
@Start.performed += instance.OnStart;
|
|
||||||
@Start.canceled += instance.OnStart;
|
|
||||||
@Pause.started += instance.OnPause;
|
|
||||||
@Pause.performed += instance.OnPause;
|
|
||||||
@Pause.canceled += instance.OnPause;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void UnregisterCallbacks(IMetaActions instance)
|
|
||||||
{
|
|
||||||
@Start.started -= instance.OnStart;
|
|
||||||
@Start.performed -= instance.OnStart;
|
|
||||||
@Start.canceled -= instance.OnStart;
|
|
||||||
@Pause.started -= instance.OnPause;
|
|
||||||
@Pause.performed -= instance.OnPause;
|
|
||||||
@Pause.canceled -= instance.OnPause;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void RemoveCallbacks(IMetaActions instance)
|
|
||||||
{
|
|
||||||
if (m_Wrapper.m_MetaActionsCallbackInterfaces.Remove(instance))
|
|
||||||
UnregisterCallbacks(instance);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SetCallbacks(IMetaActions instance)
|
|
||||||
{
|
|
||||||
foreach (var item in m_Wrapper.m_MetaActionsCallbackInterfaces)
|
|
||||||
UnregisterCallbacks(item);
|
|
||||||
m_Wrapper.m_MetaActionsCallbackInterfaces.Clear();
|
|
||||||
AddCallbacks(instance);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
public MetaActions @Meta => new MetaActions(this);
|
|
||||||
private int m_ControllerSchemeIndex = -1;
|
private int m_ControllerSchemeIndex = -1;
|
||||||
public InputControlScheme ControllerScheme
|
public InputControlScheme ControllerScheme
|
||||||
{
|
{
|
||||||
@ -776,9 +648,4 @@ public partial class @InputActionMaps: IInputActionCollection2, IDisposable
|
|||||||
void OnReset(InputAction.CallbackContext context);
|
void OnReset(InputAction.CallbackContext context);
|
||||||
void OnBoost(InputAction.CallbackContext context);
|
void OnBoost(InputAction.CallbackContext context);
|
||||||
}
|
}
|
||||||
public interface IMetaActions
|
|
||||||
{
|
|
||||||
void OnStart(InputAction.CallbackContext context);
|
|
||||||
void OnPause(InputAction.CallbackContext context);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -34,7 +34,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "Boost",
|
"name": "Boost",
|
||||||
"type": "PassThrough",
|
"type": "Button",
|
||||||
"id": "c8819d8c-8dc4-4eb6-ae07-132d6fffbed4",
|
"id": "c8819d8c-8dc4-4eb6-ae07-132d6fffbed4",
|
||||||
"expectedControlType": "Button",
|
"expectedControlType": "Button",
|
||||||
"processors": "",
|
"processors": "",
|
||||||
@ -407,76 +407,6 @@
|
|||||||
"isPartOfComposite": false
|
"isPartOfComposite": false
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Meta",
|
|
||||||
"id": "a5c1447b-b3fb-4a89-b942-fdf9beb5a79f",
|
|
||||||
"actions": [
|
|
||||||
{
|
|
||||||
"name": "Start",
|
|
||||||
"type": "Button",
|
|
||||||
"id": "18797b6b-ee2f-4fde-85c6-b70e831cdf95",
|
|
||||||
"expectedControlType": "Button",
|
|
||||||
"processors": "",
|
|
||||||
"interactions": "",
|
|
||||||
"initialStateCheck": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Pause",
|
|
||||||
"type": "Button",
|
|
||||||
"id": "2cf1215a-a9ec-4bce-8f08-978e08472f6a",
|
|
||||||
"expectedControlType": "Button",
|
|
||||||
"processors": "",
|
|
||||||
"interactions": "",
|
|
||||||
"initialStateCheck": false
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"bindings": [
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "5a7b5d2a-ece5-46e0-a265-deb8949f1b47",
|
|
||||||
"path": "<Gamepad>/start",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "Controller",
|
|
||||||
"action": "Start",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "3cd0cfc6-4d22-448f-8f55-ce3678def10a",
|
|
||||||
"path": "<Keyboard>/enter",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "Keyboard 1;Keyboard 2",
|
|
||||||
"action": "Start",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "98e0906e-0a6c-4097-a3f8-4d8640ad4d2a",
|
|
||||||
"path": "<Gamepad>/start",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "Controller",
|
|
||||||
"action": "Pause",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "",
|
|
||||||
"id": "fa09a433-c040-4da0-8e75-7c8a5f62d4ce",
|
|
||||||
"path": "<Keyboard>/escape",
|
|
||||||
"interactions": "",
|
|
||||||
"processors": "",
|
|
||||||
"groups": "Keyboard 1;Keyboard 2",
|
|
||||||
"action": "Pause",
|
|
||||||
"isComposite": false,
|
|
||||||
"isPartOfComposite": false
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"controlSchemes": [
|
"controlSchemes": [
|
||||||
@ -1,37 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<log4net>
|
|
||||||
<!-- Define custom log levels -->
|
|
||||||
<level name="Debug" value="DEBUG" />
|
|
||||||
<level name="Info" value="INFO" />
|
|
||||||
<level name="Warn" value="WARN" />
|
|
||||||
<level name="Error" value="ERROR" />
|
|
||||||
|
|
||||||
<!-- Console appender -->
|
|
||||||
<appender name="UnityDebugConsole" type="UnityDebugAppender">
|
|
||||||
<layout type="log4net.Layout.PatternLayout" name="DefaultLayout">
|
|
||||||
<conversionPattern
|
|
||||||
value=" %message | %logger | Thread: [%thread] %date{ss:fff}ms %newline" />
|
|
||||||
</layout>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- Rolling file appender -->
|
|
||||||
<appender name="File" type="log4net.Appender.RollingFileAppender">
|
|
||||||
<file type="log4net.Util.PatternString" value="%property{LogFileName}.log" />
|
|
||||||
<appendToFile value="true" />
|
|
||||||
<rollingStyle value="Size" />
|
|
||||||
<maxSizeRollBackups value="5" />
|
|
||||||
<maximumFileSize value="10MB" />
|
|
||||||
<staticLogFileName value="true" />
|
|
||||||
<layout type="log4net.Layout.PatternLayout" name="DefaultLayout">
|
|
||||||
<conversionPattern
|
|
||||||
value="%date{yyyy-MM-dd HH:mm:ss.ffff} Thread: [%thread] %level %logger - %message%newline" />
|
|
||||||
</layout>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- Root logger -->
|
|
||||||
<root>
|
|
||||||
<level value="Debug" />
|
|
||||||
<appender-ref ref="UnityDebugConsole" />
|
|
||||||
<appender-ref ref="File" />
|
|
||||||
</root>
|
|
||||||
</log4net>
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
using log4net.Appender;
|
|
||||||
using log4net.Core;
|
|
||||||
using UnityEngine;
|
|
||||||
public class UnityDebugAppender : AppenderSkeleton
|
|
||||||
{
|
|
||||||
protected override void Append(LoggingEvent loggingEvent)
|
|
||||||
{
|
|
||||||
string message = RenderLoggingEvent(loggingEvent);
|
|
||||||
string colorTag = GetColorTag(loggingEvent.Level);
|
|
||||||
Debug.Log($"<b>{colorTag}</b> {message}");
|
|
||||||
}
|
|
||||||
private string GetColorTag(Level level)
|
|
||||||
{
|
|
||||||
// Map log levels to colors (customize as needed)
|
|
||||||
switch (level.Name)
|
|
||||||
{
|
|
||||||
case "DEBUG": return "<color=green>Debug: </color>";
|
|
||||||
case "INFO": return @"<color=black>Info: </color>";
|
|
||||||
case "WARN": return @"<color=yellow>Warning: </color>";
|
|
||||||
case "ERROR": return @"<color=red>Error: </color>";
|
|
||||||
default: return "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user