forked from Shardstone/trail-into-darkness
added missing assets
This commit is contained in:
@@ -30,6 +30,11 @@ MonoBehaviour:
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: 11a8dc4883c617b46a29d5dfdd4a67d1
|
||||
m_Address: AdventureSettings
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: 13c02b14c4d048fa9653293d54f6e0e1
|
||||
m_Address: Packages/com.unity.render-pipelines.universal/Shaders/2D/Sprite-Unlit-Default.shader
|
||||
m_ReadOnly: 0
|
||||
@@ -60,6 +65,11 @@ MonoBehaviour:
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: 5672eb4ca16a50b4c86b7fae03e98a30
|
||||
m_Address: PerksRegistry
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: 60a7c1e10ed7ff94cbe191d9d3e305ed
|
||||
m_Address: Assets/Art/UI/menu_corner.png
|
||||
m_ReadOnly: 0
|
||||
@@ -115,6 +125,11 @@ MonoBehaviour:
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: 9e8339bc69fe33641a8fbc5bffd0ebd5
|
||||
m_Address: EntitiesBaseSettings
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: a0ee74bf6f853704a8a568d5ef638ee9
|
||||
m_Address: Assets/TextMesh Pro/Fonts/1529ChampFleuryPro SDF.asset
|
||||
m_ReadOnly: 0
|
||||
@@ -136,6 +151,11 @@ MonoBehaviour:
|
||||
m_SerializedLabels:
|
||||
- mouse_cursor
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: bc14507c6a9500d4eac9e684e289d084
|
||||
m_Address: CharacterRegistry
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
- m_GUID: c8578ae5b690b4a43b15e00c4c8314be
|
||||
m_Address: Assets/Art/Map/map_icon_village.png
|
||||
m_ReadOnly: 0
|
||||
|
||||
@@ -14,12 +14,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier: Unity.Addressables.Editor::UnityEditor.AddressableAssets.Settings.AddressableAssetGroup
|
||||
m_GroupName: Default Local Group
|
||||
m_GUID: 05b724f967e7d40e69a2f8086a7d78cd
|
||||
m_SerializeEntries:
|
||||
- m_GUID: 11a8dc4883c617b46a29d5dfdd4a67d1
|
||||
m_Address: Assets/Database/Game/AdventureSettings.asset
|
||||
m_ReadOnly: 0
|
||||
m_SerializedLabels: []
|
||||
FlaggedDuringContentUpdateRestriction: 0
|
||||
m_SerializeEntries: []
|
||||
m_ReadOnly: 0
|
||||
m_Settings: {fileID: 11400000, guid: 7e98b357dd76a43e191428299c44eef2, type: 2}
|
||||
m_SchemaSet:
|
||||
|
||||
@@ -98,14 +98,17 @@ namespace Nox.Core {
|
||||
ISaveSlotManager saveSlotManager = new SaveSlotManager(saveStorage, saveSettings);
|
||||
saveSystem = new SaveSystem(saveSerializer, saveStorage, saveSlotManager, saveSettings);
|
||||
|
||||
var adventuredata = new AdventureData();
|
||||
var characterSystems = DefaultCharacterSystemsFactory.Create(maxPartySize: 4, new PerkRegistry(), new CharacterRegistry());
|
||||
var adventureData = new AdventureData();
|
||||
var characterBaseSettings = Addressables.LoadAssetAsync<CharacterBaseSettings>("CharacterBaseSettings").WaitForCompletion();
|
||||
var perKRegistry = Addressables.LoadAssetAsync<PerkRegistry>("PerkRegistry").WaitForCompletion();
|
||||
var characterRegistry = Addressables.LoadAssetAsync<CharacterRegistry>("CharacterRegistry").WaitForCompletion();
|
||||
var characterSystems = DefaultCharacterSystemsFactory.Create(characterBaseSettings, perKRegistry, characterRegistry);
|
||||
var partyCreatorModel = new PartyCreatorModel(characterSystems.CharacterFactory, characterSystems.PartyFactory);
|
||||
|
||||
applicationStates = new Dictionary<GameState, IGameState> {
|
||||
[GameState.BootState] = new SplashGameState(bootstrapReferences, gameDataState),
|
||||
[GameState.MainMenu] = new MainMenuGameState(gameDataState, menuGameStateData, bootstrapReferences, saveSystem, partyCreatorModel, adventuredata),
|
||||
[GameState.GameMode] = new GameModeGameState(gameDataState, bootstrapReferences, platform.PlatformSettings, saveSystem, sceneTransition, adventuredata),
|
||||
[GameState.MainMenu] = new MainMenuGameState(gameDataState, menuGameStateData, bootstrapReferences, saveSystem, partyCreatorModel, adventureData),
|
||||
[GameState.GameMode] = new GameModeGameState(gameDataState, bootstrapReferences, platform.PlatformSettings, saveSystem, sceneTransition, adventureData),
|
||||
};
|
||||
createApplicationStateMarker.End();
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ namespace Nox.Core {
|
||||
gameDataState.ChangePlayMode(sceneReference.playMode);
|
||||
}
|
||||
}
|
||||
advSettingsHandler = Addressables.LoadAssetAsync<AdventureSettings>("Assets/Database/Game/AdventureSettings.asset");
|
||||
advSettingsHandler = Addressables.LoadAssetAsync<AdventureSettings>("AdventureSettings");
|
||||
adventureSettings = advSettingsHandler.WaitForCompletion();
|
||||
InitializeGameViews();
|
||||
currentPlaymode = gameDataState.ActivePlayMode;
|
||||
|
||||
42
Assets/Code/GameState/Entities/CharacterBaseSettings.cs
Normal file
42
Assets/Code/GameState/Entities/CharacterBaseSettings.cs
Normal file
@@ -0,0 +1,42 @@
|
||||
using System;
|
||||
using UnityEngine;
|
||||
|
||||
namespace Nox.Game {
|
||||
[CreateAssetMenu(fileName = "EntitiesBaseSettings", menuName = "Nox/Database/Entities/EntitiesBaseSettings")]
|
||||
public class CharacterBaseSettings: ScriptableObject {
|
||||
|
||||
[Header("Character General Defaults")]
|
||||
public int startAttributesPool = 12;
|
||||
|
||||
[Header("Character Creation Defaults")]
|
||||
public EntityAttributes defaultEntityAttributes;
|
||||
public EntityStats defaultEntityStats;
|
||||
public PerksData defaultPerksData;
|
||||
public ModifiersData defaultModifiersData;
|
||||
|
||||
[Header("General Racial Bonuses and Perks per Class")]
|
||||
public RacialBonuses [] racialBonuses;
|
||||
public ClassBonuses [] classBonuses;
|
||||
|
||||
[Header("Party System Defaults")]
|
||||
public int maxPartySize = 4;
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public sealed class RacialBonuses {
|
||||
public CharacterRace race;
|
||||
public EntityAttributes defaultEntityAttributes;
|
||||
public EntityStats defaultEntityStats;
|
||||
public PerksData perksData;
|
||||
public ModifiersData modifiersData;
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public sealed class ClassBonuses {
|
||||
public CharacterClass @class;
|
||||
public EntityAttributes defaultEntityAttributes;
|
||||
public EntityStats defaultEntityStats;
|
||||
public PerksData perksData;
|
||||
public ModifiersData modifiersData;
|
||||
}
|
||||
}
|
||||
@@ -2,14 +2,14 @@ using System;
|
||||
|
||||
namespace Nox.Game {
|
||||
public static class DefaultCharacterSystemsFactory {
|
||||
public static ICharacterSystems Create(int maxPartySize, PerkRegistry perkRegistry, CharacterRegistry characterRegistry) {
|
||||
public static ICharacterSystems Create(CharacterBaseSettings characterBaseSettings, PerkRegistry perkRegistry, CharacterRegistry characterRegistry) {
|
||||
IPerkFactory perkFactory = new PerkFactory(perkRegistry);
|
||||
ICharacterAttributesFactory attributesFactory = new CharacterAttributesFactory(characterRegistry);
|
||||
ICharacterStatsFactory statsFactory = new CharacterStatsFactory();
|
||||
ICharacterFactory characterFactory = new CharacterFactory(attributesFactory, statsFactory, perkFactory);
|
||||
IPartyFactory partyFactory = new PartyFactory(new PartyFactoryOptions {
|
||||
minPartySize = 1,
|
||||
maxPartySize = maxPartySize,
|
||||
maxPartySize = characterBaseSettings.maxPartySize,
|
||||
enforceUniqueCharacterIds = true
|
||||
});
|
||||
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
using UnityEngine;
|
||||
|
||||
namespace Nox.Game {
|
||||
[CreateAssetMenu(fileName = "EntitiesBaseSettings", menuName = "Nox/Database/Entities/EntitiesBaseSettings")]
|
||||
public class EntitiesBaseSettings: ScriptableObject {
|
||||
[Header("Character Creation")]
|
||||
public int startAttributesPool = 12;
|
||||
public int startLevel = 1;
|
||||
|
||||
public RacialBonus [] racialBonuses;
|
||||
}
|
||||
|
||||
public class RacialBonus {
|
||||
public CharacterRace race;
|
||||
public CharacterClass characterClass;
|
||||
public int bonus;
|
||||
}
|
||||
}
|
||||
8
Assets/Database/Entities.meta
Normal file
8
Assets/Database/Entities.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: dc417caaee5ca6245ac02ea6fd77fbed
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
35
Assets/Database/Entities/CharacterRegistry.asset
Normal file
35
Assets/Database/Entities/CharacterRegistry.asset
Normal file
@@ -0,0 +1,35 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 91e3086d6951456e9a8a59fcbac0f750, type: 3}
|
||||
m_Name: CharacterRegistry
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Nox.Game.CharacterRegistry
|
||||
defaultCharacter:
|
||||
id:
|
||||
displayName:
|
||||
race: 0
|
||||
class: 0
|
||||
role: 0
|
||||
attributes:
|
||||
might: 0
|
||||
reflex: 0
|
||||
knowledge: 0
|
||||
perception: 0
|
||||
stats:
|
||||
health: 0
|
||||
stamina: 0
|
||||
level: 0
|
||||
experience: 0
|
||||
perksData:
|
||||
perks: []
|
||||
activeModifiers:
|
||||
modifiers: []
|
||||
characters: []
|
||||
8
Assets/Database/Entities/CharacterRegistry.asset.meta
Normal file
8
Assets/Database/Entities/CharacterRegistry.asset.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bc14507c6a9500d4eac9e684e289d084
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
32
Assets/Database/Entities/EntitiesBaseSettings.asset
Normal file
32
Assets/Database/Entities/EntitiesBaseSettings.asset
Normal file
@@ -0,0 +1,32 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1bbecc15c7cd4a7ca90ce17b3d3d75f0, type: 3}
|
||||
m_Name: EntitiesBaseSettings
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Nox.Game.CharacterBaseSettings
|
||||
startAttributesPool: 12
|
||||
defaultEntityAttributes:
|
||||
might: 0
|
||||
reflex: 0
|
||||
knowledge: 0
|
||||
perception: 0
|
||||
defaultEntityStats:
|
||||
health: 0
|
||||
stamina: 0
|
||||
level: 0
|
||||
experience: 0
|
||||
defaultPerksData:
|
||||
perks: []
|
||||
defaultModifiersData:
|
||||
modifiers: []
|
||||
racialBonuses: []
|
||||
classBonuses: []
|
||||
maxPartySize: 4
|
||||
8
Assets/Database/Entities/EntitiesBaseSettings.asset.meta
Normal file
8
Assets/Database/Entities/EntitiesBaseSettings.asset.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9e8339bc69fe33641a8fbc5bffd0ebd5
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
16
Assets/Database/Entities/PerksRegistry.asset
Normal file
16
Assets/Database/Entities/PerksRegistry.asset
Normal file
@@ -0,0 +1,16 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!114 &11400000
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0adb42b13ce44d8792247246a49e9c3f, type: 3}
|
||||
m_Name: PerksRegistry
|
||||
m_EditorClassIdentifier: Assembly-CSharp::Nox.Game.PerkRegistry
|
||||
perksData:
|
||||
perks: []
|
||||
8
Assets/Database/Entities/PerksRegistry.asset.meta
Normal file
8
Assets/Database/Entities/PerksRegistry.asset.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5672eb4ca16a50b4c86b7fae03e98a30
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -592,6 +592,38 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 836462145768403853, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 836462145768403853, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 836462145768403853, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 836462145768403853, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2124443195524357696, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2124443195524357696, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2124443195524357696, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2124443195524357696, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2913371113149423864, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: GUI
|
||||
@@ -676,6 +708,38 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6675701153400291410, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6675701153400291410, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6675701153400291410, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6675701153400291410, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7497223681040273609, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7497223681040273609, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7497223681040273609, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7497223681040273609, guid: ddc1b5dd628590a4084c1997dd102f62, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
|
||||
Reference in New Issue
Block a user