Multiple improvements

- scrolling combat text
- updated inventory and stat panel UIs
- bugfix regens
- small changes to lighting in skellyard.
This commit is contained in:
Pedro Gomes 2025-09-18 17:40:08 +01:00
parent f899a383ee
commit f1bef2485d
28 changed files with 6320 additions and 3582 deletions

View File

@ -50,7 +50,7 @@ GameObject:
- component: {fileID: 2440268520765564492} - component: {fileID: 2440268520765564492}
- component: {fileID: 2440268520765574968} - component: {fileID: 2440268520765574968}
m_Layer: 5 m_Layer: 5
m_Name: Accessory Slot m_Name: Gloves Slot
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -70,10 +70,10 @@ RectTransform:
m_Children: [] m_Children: []
m_Father: {fileID: 886370065471730277} m_Father: {fileID: 886370065471730277}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 150, y: 150} m_SizeDelta: {x: -40, y: -40}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2440268520772204094 --- !u!222 &2440268520772204094
CanvasRenderer: CanvasRenderer:

View File

@ -64,9 +64,9 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 1.78} m_Offset: {x: 0, y: 1.78}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: c0d4c5efb683f654489ceb7d9444a4e7, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 1.78}
- _MetallicGlossMap: - _MetallicGlossMap:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
@ -133,7 +133,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 1, g: 0, b: 0, a: 1} - _BaseColor: {r: 1, g: 0, b: 0, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 2.9960785, g: 0, b: 0, a: 1} - _EmissionColor: {r: 2.9960785, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@ -50,7 +50,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: 77fccddf9f39c39479a911b1ef8f6f8c, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:

View File

@ -119,7 +119,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 1, g: 0.025052922, b: 0.118024625, a: 1} - _BaseColor: {r: 1, g: 0.025052922, b: 0.118024625, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 0.025052922, b: 0.11802458, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@ -121,7 +121,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.23255599, g: 0.236027, b: 0.24528295, a: 1} - _BaseColor: {r: 0.23255599, g: 0.236027, b: 0.24528295, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0.23255596, g: 0.23602697, b: 0.24528292, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}

View File

@ -32,11 +32,13 @@ Material:
m_LightmapFlags: 0 m_LightmapFlags: 0
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: 3000
stringTagMap: stringTagMap:
RenderType: Opaque RenderType: Transparent
disabledShaderPasses: disabledShaderPasses:
- GRABPASS - GRABPASS
- DepthOnly
- SHADOWCASTER
m_LockedProperties: m_LockedProperties:
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
@ -74,8 +76,8 @@ Material:
- _DistortionEnabled: 0 - _DistortionEnabled: 0
- _DistortionStrength: 1 - _DistortionStrength: 1
- _DistortionStrengthScaled: 0 - _DistortionStrengthScaled: 0
- _DstBlend: 0 - _DstBlend: 10
- _DstBlendAlpha: 0 - _DstBlendAlpha: 10
- _EmissionEnabled: 0 - _EmissionEnabled: 0
- _FlipbookBlending: 0 - _FlipbookBlending: 0
- _FlipbookMode: 0 - _FlipbookMode: 0
@ -86,10 +88,10 @@ Material:
- _SoftParticlesEnabled: 0 - _SoftParticlesEnabled: 0
- _SoftParticlesFarFadeDistance: 1 - _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0 - _SoftParticlesNearFadeDistance: 0
- _SrcBlend: 1 - _SrcBlend: 5
- _SrcBlendAlpha: 1 - _SrcBlendAlpha: 1
- _Surface: 1 - _Surface: 1
- _ZWrite: 1 - _ZWrite: 0
m_Colors: m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}

View File

@ -32,11 +32,13 @@ Material:
m_LightmapFlags: 0 m_LightmapFlags: 0
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1 m_DoubleSidedGI: 1
m_CustomRenderQueue: -1 m_CustomRenderQueue: 3000
stringTagMap: stringTagMap:
RenderType: Opaque RenderType: Transparent
disabledShaderPasses: disabledShaderPasses:
- GRABPASS - GRABPASS
- DepthOnly
- SHADOWCASTER
m_LockedProperties: m_LockedProperties:
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
@ -99,8 +101,8 @@ Material:
- _DistortionEnabled: 0 - _DistortionEnabled: 0
- _DistortionStrength: 1 - _DistortionStrength: 1
- _DistortionStrengthScaled: 0 - _DistortionStrengthScaled: 0
- _DstBlend: 0 - _DstBlend: 10
- _DstBlendAlpha: 0 - _DstBlendAlpha: 10
- _EmissionEnabled: 0 - _EmissionEnabled: 0
- _FlipbookBlending: 0 - _FlipbookBlending: 0
- _FlipbookMode: 0 - _FlipbookMode: 0
@ -118,16 +120,16 @@ Material:
- _SoftParticlesFarFadeDistance: 1 - _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0 - _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 5
- _SrcBlendAlpha: 1 - _SrcBlendAlpha: 1
- _Surface: 1 - _Surface: 1
- _UVSec: 0 - _UVSec: 0
- _ZWrite: 1 - _ZWrite: 0
m_Colors: m_Colors:
- _BaseColor: {r: 6.347921, g: 6.347921, b: 6.347921, a: 1} - _BaseColor: {r: 6.347921, g: 6.347921, b: 6.347921, a: 1}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 6.3479214, g: 6.3479214, b: 6.3479214, a: 1}
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}

View File

@ -78,7 +78,7 @@ Material:
- _Mode: 0 - _Mode: 0
- _OcclusionStrength: 1 - _OcclusionStrength: 1
- _Parallax: 0.02 - _Parallax: 0.02
- _Rotation: 411.15506 - _Rotation: 1622.4393
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 1

View File

@ -35,8 +35,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 8, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 200, y: 50} m_SizeDelta: {x: 350, y: 50}
m_Pivot: {x: 0, y: 1} m_Pivot: {x: 0, y: 1}
--- !u!222 &7891751392981135478 --- !u!222 &7891751392981135478
CanvasRenderer: CanvasRenderer:
@ -182,12 +182,13 @@ RectTransform:
m_Children: m_Children:
- {fileID: 5414108859605080114} - {fileID: 5414108859605080114}
- {fileID: 1268642920165990596} - {fileID: 1268642920165990596}
- {fileID: 555979570866431174}
m_Father: {fileID: 6118383127323394301} m_Father: {fileID: 6118383127323394301}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5} m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -5, y: 0} m_AnchoredPosition: {x: -5, y: 0}
m_SizeDelta: {x: 27, y: 27} m_SizeDelta: {x: 40, y: 40}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!222 &4525523244919885807 --- !u!222 &4525523244919885807
CanvasRenderer: CanvasRenderer:
@ -210,7 +211,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0.24528301, g: 0.15146883, b: 0, a: 0.9098039} m_Color: {r: 0.24528301, g: 0.15146883, b: 0, a: 0}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -271,6 +272,81 @@ MonoBehaviour:
m_OnClick: m_OnClick:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
--- !u!1 &2432857112928150569
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 555979570866431174}
- component: {fileID: 8056973388759057251}
- component: {fileID: 4551137932147562721}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &555979570866431174
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2432857112928150569}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7186769231828271392}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 32, y: 32}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8056973388759057251
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2432857112928150569}
m_CullTransparentMesh: 1
--- !u!114 &4551137932147562721
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2432857112928150569}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: ce4ebd1f8f685ab46baca8f806ce1f28, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6118383127301468953 --- !u!1 &6118383127301468953
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -444,7 +520,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 0, g: 0.11764717, b: 1, a: 1} m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
@ -495,7 +571,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -40, y: 0} m_AnchoredPosition: {x: -80, y: 0}
m_SizeDelta: {x: 20, y: 50} m_SizeDelta: {x: 20, y: 50}
m_Pivot: {x: 1, y: 1} m_Pivot: {x: 1, y: 1}
--- !u!222 &4739614468492038557 --- !u!222 &4739614468492038557
@ -614,7 +690,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &1268642920165990596 --- !u!224 &1268642920165990596
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -827,7 +903,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7387994330305630517, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} - target: {fileID: 7387994330305630517, guid: 38b21aa92abc114499271f1eeca0a417, type: 3}
propertyPath: m_PixelsPerUnitMultiplier propertyPath: m_PixelsPerUnitMultiplier
value: 1.5 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7914226979756260339, guid: 38b21aa92abc114499271f1eeca0a417, type: 3} - target: {fileID: 7914226979756260339, guid: 38b21aa92abc114499271f1eeca0a417, type: 3}
propertyPath: m_Name propertyPath: m_Name

View File

@ -67,6 +67,7 @@ namespace Kryz.CharacterStats.Examples
public Dictionary<string, CharacterStat> secondaryStatsDictionary = new Dictionary<string, CharacterStat>(); public Dictionary<string, CharacterStat> secondaryStatsDictionary = new Dictionary<string, CharacterStat>();
public UnityEvent onUpdateStatValues = new UnityEvent(); public UnityEvent onUpdateStatValues = new UnityEvent();
public UnityEvent onAllStatsUpdated = new UnityEvent();
protected virtual void Awake() protected virtual void Awake()
{ {
@ -153,6 +154,8 @@ namespace Kryz.CharacterStats.Examples
Debug.Log(this.gameObject.name + " has relative power level of: " + GetRelativePowerLevel()); Debug.Log(this.gameObject.name + " has relative power level of: " + GetRelativePowerLevel());
onAllStatsUpdated.Invoke();
} }
public float GetRelativePowerLevel() public float GetRelativePowerLevel()

View File

@ -5,11 +5,17 @@ namespace Kryz.CharacterStats.Examples
public enum EquipmentType public enum EquipmentType
{ {
Helmet, Helmet,
Shoulder,
Chest, Chest,
Belt,
Legs,
Bracers,
Gloves, Gloves,
Boots, Boots,
MainWeapon, MainWeapon,
OffWeapon, OffWeapon,
Accessory, Accessory,
Amulet, Amulet,
} }

View File

@ -113,7 +113,7 @@ namespace Kryz.CharacterStats.Examples
statPanel.UpdateStatValues(); statPanel.UpdateStatValues();
statPanel.SetCharacterInfo(PlayerDataHandler.Instance.currentCharacterName.Value, level.currentLevel.ToString(), reputationLevel.currentLevel.ToString()); statPanel.SetCharacterInfo(PlayerDataHandler.Instance.currentCharacterName.Value, level.currentLevel.ToString(), reputationLevel.currentLevel.ToString());
statPanel.ToggleAllocateButtonsInteractable(AvailablePointsToAllocate > 0); statPanel.ToggleAllocateButtonsInteractable(AvailablePointsToAllocate > 0);
onUpdateStatValues.AddListener(statPanel.UpdateStatValues); onAllStatsUpdated.AddListener(statPanel.UpdateStatValues);
onUpdateStatValues.Invoke(); onUpdateStatValues.Invoke();
if (inventory == null) if (inventory == null)

View File

@ -29,7 +29,7 @@ namespace Kryz.CharacterStats.Examples
const string almost = "≈"; const string almost = "≈";
private void OnValidate() /* private void OnValidate()
{ {
if (statDisplaysParent != null) if (statDisplaysParent != null)
{ {
@ -38,8 +38,15 @@ namespace Kryz.CharacterStats.Examples
UpdateStatNames(); UpdateStatNames();
UpdateSecondaryStatNames(); UpdateSecondaryStatNames();
} }
} }*/
[ContextMenu("UpdateNames")]
private void UpdateNames()
{
UpdateStatNames();
UpdateSecondaryStatNames();
}
public void SetPlayerStats(PlayerCharacterStats playerStats) public void SetPlayerStats(PlayerCharacterStats playerStats)
{ {
this.playerStats = playerStats; this.playerStats = playerStats;
@ -163,7 +170,9 @@ namespace Kryz.CharacterStats.Examples
relativePowerLevel = Mathf.RoundToInt(playerStats.GetRelativePowerLevel()); relativePowerLevel = Mathf.RoundToInt(playerStats.GetRelativePowerLevel());
if (rankText != null)
rankText.text = GameConstants.CharacterBalancing.GetRankBasedOnRelativeTotalPowerLevel(relativePowerLevel) + " Rank"; rankText.text = GameConstants.CharacterBalancing.GetRankBasedOnRelativeTotalPowerLevel(relativePowerLevel) + " Rank";
if (powerLevelText != null)
powerLevelText.text = almost + relativePowerLevel.ToString(); powerLevelText.text = almost + relativePowerLevel.ToString();
} }
public void ToggleAllocateButtonsInteractable(bool interactable) public void ToggleAllocateButtonsInteractable(bool interactable)

File diff suppressed because it is too large Load Diff

View File

@ -78,7 +78,7 @@ Material:
- _Mode: 0 - _Mode: 0
- _OcclusionStrength: 1 - _OcclusionStrength: 1
- _Parallax: 0.02 - _Parallax: 0.02
- _Rotation: 16.234444 - _Rotation: 7.5066214
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 1

View File

@ -301,7 +301,7 @@ MonoBehaviour:
onResourceChanged: onResourceChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
scrollingTextPrefab: {fileID: 0} scrollingTextPrefab: {fileID: 677595231222924942, guid: abe5cfbb1d6d9454aa835afceb136dcf, type: 3}
onMaxHealthChanged: onMaxHealthChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
@ -427,6 +427,9 @@ MonoBehaviour:
onUpdateStatValues: onUpdateStatValues:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
onAllStatsUpdated:
m_PersistentCalls:
m_Calls: []
--- !u!136 &2365405228662859796 --- !u!136 &2365405228662859796
CapsuleCollider: CapsuleCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -401,7 +401,7 @@ MonoBehaviour:
onResourceChanged: onResourceChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
scrollingTextPrefab: {fileID: 0} scrollingTextPrefab: {fileID: 677595231222924942, guid: abe5cfbb1d6d9454aa835afceb136dcf, type: 3}
onMaxHealthChanged: onMaxHealthChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
@ -527,6 +527,9 @@ MonoBehaviour:
onUpdateStatValues: onUpdateStatValues:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
onAllStatsUpdated:
m_PersistentCalls:
m_Calls: []
--- !u!114 &195415824371084160 --- !u!114 &195415824371084160
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -666,6 +666,9 @@ MonoBehaviour:
onUpdateStatValues: onUpdateStatValues:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
onAllStatsUpdated:
m_PersistentCalls:
m_Calls: []
experienceOnNPCDeath: {fileID: 7486622550161333616} experienceOnNPCDeath: {fileID: 7486622550161333616}
onJobCompleted: {fileID: 5840855798241641169} onJobCompleted: {fileID: 5840855798241641169}
inventory: {fileID: 0} inventory: {fileID: 0}
@ -707,10 +710,10 @@ MonoBehaviour:
currentValue: 0 currentValue: 0
maxValue: 100 maxValue: 100
baseMaxValue: 100 baseMaxValue: 100
flatRegen: 1 flatRegen: 0
baseRegenValue: 0 baseRegenValue: 0
percentRegen: 1 percentRegen: 0
timeBetweenRegens: 3 timeBetweenRegens: 1
onResourceChanged: onResourceChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
@ -743,9 +746,9 @@ MonoBehaviour:
currentValue: 0 currentValue: 0
maxValue: 100 maxValue: 100
baseMaxValue: 100 baseMaxValue: 100
flatRegen: 1 flatRegen: 0
baseRegenValue: 0 baseRegenValue: 0
percentRegen: 1 percentRegen: 0
timeBetweenRegens: 1 timeBetweenRegens: 1
onResourceChanged: onResourceChanged:
m_PersistentCalls: m_PersistentCalls:

File diff suppressed because it is too large Load Diff

View File

@ -13,20 +13,20 @@ OcclusionCullingSettings:
--- !u!104 &2 --- !u!104 &2
RenderSettings: RenderSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 9 serializedVersion: 10
m_Fog: 0 m_Fog: 1
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3 m_FogMode: 3
m_FogDensity: 0.01 m_FogDensity: 0.025
m_LinearFogStart: 0 m_LinearFogStart: 0
m_LinearFogEnd: 300 m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1 m_AmbientIntensity: 0.5
m_AmbientMode: 0 m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} m_SkyboxMaterial: {fileID: 2100000, guid: d1fdb8e44b28da34d9e922cca0bc740e, type: 2}
m_HaloStrength: 0.5 m_HaloStrength: 0.5
m_FlareStrength: 1 m_FlareStrength: 1
m_FlareFadeSpeed: 3 m_FlareFadeSpeed: 3
@ -35,15 +35,15 @@ RenderSettings:
m_DefaultReflectionMode: 0 m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128 m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1 m_ReflectionBounces: 1
m_ReflectionIntensity: 1 m_ReflectionIntensity: 0.5
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994} m_Sun: {fileID: 0}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 12 serializedVersion: 13
m_GIWorkflowMode: 1 m_BakeOnSceneLoad: 0
m_GISettings: m_GISettings:
serializedVersion: 2 serializedVersion: 2
m_BounceScale: 1 m_BounceScale: 1
@ -66,9 +66,6 @@ LightmapSettings:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1 m_LightmapsBakeMode: 1
m_TextureCompression: 1 m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2 m_ReflectionCompression: 2
m_MixedBakeMode: 2 m_MixedBakeMode: 2
m_BakeBackend: 1 m_BakeBackend: 1
@ -96,7 +93,7 @@ LightmapSettings:
m_ExportTrainingData: 0 m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4 m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0} m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
m_LightingSettings: {fileID: 4890085278179872738, guid: 557123e127a9db346bf9751306c23f5b, type: 2} m_LightingSettings: {fileID: 4890085278179872738, guid: 557123e127a9db346bf9751306c23f5b, type: 2}
--- !u!196 &4 --- !u!196 &4
NavMeshSettings: NavMeshSettings:
@ -122,6 +119,35 @@ NavMeshSettings:
debug: debug:
m_Flags: 0 m_Flags: 0
m_NavMeshData: {fileID: 23800000, guid: c186647283f70964d8c956be629a64df, type: 2} m_NavMeshData: {fileID: 23800000, guid: c186647283f70964d8c956be629a64df, type: 2}
--- !u!114 &75815623
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1670377911}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_CustomShadowLayers: 0
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
m_RenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_ShadowRenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_Version: 4
m_LightLayerMask: 1
m_ShadowLayerMask: 1
m_RenderingLayers: 1
m_ShadowRenderingLayers: 1
--- !u!1001 &119152358 --- !u!1001 &119152358
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -291,6 +317,11 @@ MeshRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 2 m_RayTracingMode: 2
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@ -312,6 +343,7 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
@ -397,6 +429,11 @@ MeshRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 2 m_RayTracingMode: 2
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@ -418,6 +455,7 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
@ -493,13 +531,14 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 705507995} - component: {fileID: 705507995}
- component: {fileID: 705507994} - component: {fileID: 705507994}
- component: {fileID: 705507996}
m_Layer: 0 m_Layer: 0
m_Name: Directional Light m_Name: Directional Light
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!108 &705507994 --- !u!108 &705507994
Light: Light:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -508,11 +547,10 @@ Light:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705507993} m_GameObject: {fileID: 705507993}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 10 serializedVersion: 11
m_Type: 1 m_Type: 1
m_Shape: 0 m_Color: {r: 0.7019608, g: 0.90196085, b: 0.9607844, a: 1}
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 0.1
m_Intensity: 1
m_Range: 10 m_Range: 10
m_SpotAngle: 30 m_SpotAngle: 30
m_InnerSpotAngle: 21.80208 m_InnerSpotAngle: 21.80208
@ -551,7 +589,7 @@ Light:
serializedVersion: 2 serializedVersion: 2
m_Bits: 4294967295 m_Bits: 4294967295
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_Lightmapping: 1 m_Lightmapping: 4
m_LightShadowCasterMode: 0 m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1} m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1 m_BounceIntensity: 1
@ -560,8 +598,12 @@ Light:
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0 m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1 m_UseViewFrustumForShadowCasterCull: 1
m_ForceVisible: 0
m_ShadowRadius: 0 m_ShadowRadius: 0
m_ShadowAngle: 0 m_ShadowAngle: 0
m_LightUnit: 1
m_LuxAtDistance: 1
m_EnableSpotReflector: 1
--- !u!4 &705507995 --- !u!4 &705507995
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -570,13 +612,42 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705507993} m_GameObject: {fileID: 705507993}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalRotation: {x: 0, y: 0.9659258, z: -0.2588191, w: 0}
m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} m_LocalEulerAnglesHint: {x: 30, y: 180, z: 0}
--- !u!114 &705507996
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705507993}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_CustomShadowLayers: 0
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
m_RenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_ShadowRenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_Version: 4
m_LightLayerMask: 1
m_ShadowLayerMask: 1
m_RenderingLayers: 1
m_ShadowRenderingLayers: 1
--- !u!1001 &820281663 --- !u!1001 &820281663
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -715,6 +786,11 @@ MeshRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 2 m_RayTracingMode: 2
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@ -736,6 +812,7 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
@ -882,6 +959,11 @@ MeshRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 2 m_RayTracingMode: 2
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@ -903,6 +985,7 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
@ -1019,6 +1102,11 @@ MeshRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 2 m_RayTracingMode: 2
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@ -1040,6 +1128,7 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
@ -1121,7 +1210,7 @@ Mesh:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: m_Name:
serializedVersion: 11 serializedVersion: 12
m_SubMeshes: m_SubMeshes:
- serializedVersion: 2 - serializedVersion: 2
firstByte: 0 firstByte: 0
@ -1271,14 +1360,27 @@ Mesh:
m_CookingOptions: 30 m_CookingOptions: 30
m_BakedConvexCollisionMesh: m_BakedConvexCollisionMesh:
m_BakedTriangleCollisionMesh: m_BakedTriangleCollisionMesh:
m_MeshMetrics[0]: 1 'm_MeshMetrics[0]': 1
m_MeshMetrics[1]: 1 'm_MeshMetrics[1]': 1
m_MeshOptimizationFlags: 1 m_MeshOptimizationFlags: 1
m_StreamData: m_StreamData:
serializedVersion: 2 serializedVersion: 2
offset: 0 offset: 0
size: 0 size: 0
path: path:
m_MeshLodInfo:
serializedVersion: 2
m_LodSelectionCurve:
serializedVersion: 1
m_LodSlope: 0
m_LodBias: 0
m_NumLevels: 1
m_SubMeshes:
- serializedVersion: 2
m_Levels:
- serializedVersion: 1
m_IndexStart: 0
m_IndexCount: 0
--- !u!1 &1359858233 --- !u!1 &1359858233
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1337,6 +1439,11 @@ MeshRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 2 m_RayTracingMode: 2
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@ -1358,6 +1465,7 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
@ -1458,6 +1566,11 @@ MeshRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 2 m_RayTracingMode: 2
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@ -1479,6 +1592,7 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
@ -1584,8 +1698,209 @@ PrefabInstance:
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []
m_AddedComponents: [] m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 5522025452598077946, guid: 0adad741209f574499c301afb4817e98, type: 3}
insertIndex: -1
addedObject: {fileID: 1670377921}
- targetCorrespondingSourceObject: {fileID: 5522025451419916780, guid: 0adad741209f574499c301afb4817e98, type: 3}
insertIndex: -1
addedObject: {fileID: 1670377920}
- targetCorrespondingSourceObject: {fileID: 5522025451264183521, guid: 0adad741209f574499c301afb4817e98, type: 3}
insertIndex: -1
addedObject: {fileID: 1670377919}
- targetCorrespondingSourceObject: {fileID: 5522025452750523883, guid: 0adad741209f574499c301afb4817e98, type: 3}
insertIndex: -1
addedObject: {fileID: 1670377918}
- targetCorrespondingSourceObject: {fileID: 5522025452713121579, guid: 0adad741209f574499c301afb4817e98, type: 3}
insertIndex: -1
addedObject: {fileID: 1670377917}
- targetCorrespondingSourceObject: {fileID: 5522025452902236869, guid: 0adad741209f574499c301afb4817e98, type: 3}
insertIndex: -1
addedObject: {fileID: 75815623}
- targetCorrespondingSourceObject: {fileID: 5522025452680869733, guid: 0adad741209f574499c301afb4817e98, type: 3}
insertIndex: -1
addedObject: {fileID: 2000623524}
m_SourcePrefab: {fileID: 100100000, guid: 0adad741209f574499c301afb4817e98, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 0adad741209f574499c301afb4817e98, type: 3}
--- !u!1 &1670377910 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5522025452680869733, guid: 0adad741209f574499c301afb4817e98, type: 3}
m_PrefabInstance: {fileID: 1670377909}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1670377911 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5522025452902236869, guid: 0adad741209f574499c301afb4817e98, type: 3}
m_PrefabInstance: {fileID: 1670377909}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1670377912 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5522025452713121579, guid: 0adad741209f574499c301afb4817e98, type: 3}
m_PrefabInstance: {fileID: 1670377909}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1670377913 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5522025452750523883, guid: 0adad741209f574499c301afb4817e98, type: 3}
m_PrefabInstance: {fileID: 1670377909}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1670377914 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5522025451264183521, guid: 0adad741209f574499c301afb4817e98, type: 3}
m_PrefabInstance: {fileID: 1670377909}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1670377915 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5522025451419916780, guid: 0adad741209f574499c301afb4817e98, type: 3}
m_PrefabInstance: {fileID: 1670377909}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1670377916 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5522025452598077946, guid: 0adad741209f574499c301afb4817e98, type: 3}
m_PrefabInstance: {fileID: 1670377909}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1670377917
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1670377912}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_CustomShadowLayers: 0
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
m_RenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_ShadowRenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_Version: 4
m_LightLayerMask: 1
m_ShadowLayerMask: 1
m_RenderingLayers: 1
m_ShadowRenderingLayers: 1
--- !u!114 &1670377918
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1670377913}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_CustomShadowLayers: 0
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
m_RenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_ShadowRenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_Version: 4
m_LightLayerMask: 1
m_ShadowLayerMask: 1
m_RenderingLayers: 1
m_ShadowRenderingLayers: 1
--- !u!114 &1670377919
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1670377914}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_CustomShadowLayers: 0
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
m_RenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_ShadowRenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_Version: 4
m_LightLayerMask: 1
m_ShadowLayerMask: 1
m_RenderingLayers: 1
m_ShadowRenderingLayers: 1
--- !u!114 &1670377920
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1670377915}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_CustomShadowLayers: 0
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
m_RenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_ShadowRenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_Version: 4
m_LightLayerMask: 1
m_ShadowLayerMask: 1
m_RenderingLayers: 1
m_ShadowRenderingLayers: 1
--- !u!114 &1670377921
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1670377916}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_CustomShadowLayers: 0
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
m_RenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_ShadowRenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_Version: 4
m_LightLayerMask: 1
m_ShadowLayerMask: 1
m_RenderingLayers: 1
m_ShadowRenderingLayers: 1
--- !u!1 &1707409587 --- !u!1 &1707409587
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1726,6 +2041,11 @@ MeshRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 2 m_RayTracingMode: 2
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@ -1747,6 +2067,7 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
@ -1894,6 +2215,11 @@ MeshRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 2 m_RayTracingMode: 2
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@ -1915,6 +2241,7 @@ MeshRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
@ -1927,6 +2254,35 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1837129068} m_GameObject: {fileID: 1837129068}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &2000623524
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1670377910}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_CustomShadowLayers: 0
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
m_RenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_ShadowRenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_Version: 4
m_LightLayerMask: 1
m_ShadowLayerMask: 1
m_RenderingLayers: 1
m_ShadowRenderingLayers: 1
--- !u!1 &2039545540 --- !u!1 &2039545540
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2067,6 +2423,10 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 3251821988823392336, guid: 797a23835fc71fa4a9ba1b749b439f55, type: 3}
propertyPath: m_ClearFlags
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3251821988823392337, guid: 797a23835fc71fa4a9ba1b749b439f55, type: 3} - target: {fileID: 3251821988823392337, guid: 797a23835fc71fa4a9ba1b749b439f55, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 0 value: 0

View File

@ -185,7 +185,7 @@ public static class GameConstants
public const int StatPointsPerLevel = 3; public const int StatPointsPerLevel = 3;
public const int StatPointsPerReputationLevel = 3; public const int StatPointsPerReputationLevel = 0;
} }
public static class CharacterBalancing public static class CharacterBalancing
@ -387,7 +387,7 @@ public static class GameConstants
public static class Sizes public static class Sizes
{ {
public const int TotalEquipmentSlots = 6; public const int TotalEquipmentSlots = 6;
public const int TotalInventorySlots = 18; public const int TotalInventorySlots = 32;
public const int TotalBuildSlots = 3; public const int TotalBuildSlots = 3;
} }

View File

@ -48,7 +48,7 @@ public class Health : Resource
baseMaxValue = character.MaxHealth.BaseValue; baseMaxValue = character.MaxHealth.BaseValue;
character.onUpdateStatValues.AddListener(CalculateMaxValueBasedOnStat); character.onAllStatsUpdated.AddListener(CalculateMaxValueBasedOnStat);
} }
protected override void Start() protected override void Start()

View File

@ -24,7 +24,7 @@ public class Mana : Resource
baseMaxValue = character.MaxMana.BaseValue; baseMaxValue = character.MaxMana.BaseValue;
character.onUpdateStatValues.AddListener(CalculateMaxValueBasedOnStat); character.onAllStatsUpdated.AddListener(CalculateMaxValueBasedOnStat);
} }
protected override void Start() protected override void Start()
@ -73,6 +73,7 @@ public class Mana : Resource
public void CalculateRegenValueBasedOnStat() public void CalculateRegenValueBasedOnStat()
{ {
flatRegen = character.ManaRegen.Value; flatRegen = character.ManaRegen.Value;
//Debug.Log("MAna Regen: " + flatRegen);
//percentRegen = (character.Spirit.Value - character.Spirit.BaseValue) * GameConstants.CharacterBalancing.BonusSpiritToPercentRegenRate; //percentRegen = (character.Spirit.Value - character.Spirit.BaseValue) * GameConstants.CharacterBalancing.BonusSpiritToPercentRegenRate;
} }

View File

@ -21,7 +21,7 @@ public class Resource : MonoBehaviour
protected virtual void Start() protected virtual void Start()
{ {
currentValue = maxValue; currentValue = maxValue;
flatRegen = baseRegenValue; //flatRegen = baseRegenValue;
onResourceChanged.Invoke(currentValue); onResourceChanged.Invoke(currentValue);
} }

View File

@ -54,8 +54,8 @@ MonoBehaviour:
m_ReflectionProbeBlending: 0 m_ReflectionProbeBlending: 0
m_ReflectionProbeBoxProjection: 0 m_ReflectionProbeBoxProjection: 0
m_ReflectionProbeAtlas: 0 m_ReflectionProbeAtlas: 0
m_ShadowDistance: 50 m_ShadowDistance: 25
m_ShadowCascadeCount: 1 m_ShadowCascadeCount: 2
m_Cascade2Split: 0.25 m_Cascade2Split: 0.25
m_Cascade3Split: {x: 0.1, y: 0.3} m_Cascade3Split: {x: 0.1, y: 0.3}
m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467}

View File

@ -62,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - {fileID: -1192090701822111264, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
@ -107,8 +107,8 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_text: 50 m_text: 50
m_isRightToLeft: 0 m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontAsset: {fileID: 11400000, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: -1192090701822111264, guid: 41f9368fce25cb44ba223ac55f4e69e1, type: 2}
m_fontSharedMaterials: [] m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0} m_fontMaterial: {fileID: 0}
m_fontMaterials: [] m_fontMaterials: []
@ -189,7 +189,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 6207018735683416805} - component: {fileID: 6207018735683416805}
- component: {fileID: 677595231222924942} - component: {fileID: 677595231222924942}
- component: {fileID: 8419876189813547190} - component: {fileID: 573897098464692910}
m_Layer: 0 m_Layer: 0
m_Name: 3DScrollingText m_Name: 3DScrollingText
m_TagString: Untagged m_TagString: Untagged
@ -492,7 +492,7 @@ MonoBehaviour:
sizeMultiplier: 1 sizeMultiplier: 1
tmpText: {fileID: 7246904886069132037} tmpText: {fileID: 7246904886069132037}
moveSpeed: 1 moveSpeed: 1
--- !u!114 &8419876189813547190 --- !u!114 &573897098464692910
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -501,6 +501,6 @@ MonoBehaviour:
m_GameObject: {fileID: 4042808676909982747} m_GameObject: {fileID: 4042808676909982747}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 46c33abd058b3c449a82ead76e422095, type: 3} m_Script: {fileID: 11500000, guid: 87393fb2d4590af49ac87f2009030407, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Billboard m_EditorClassIdentifier: Assembly-CSharp::Billboard

View File

@ -141,7 +141,7 @@ PlayerSettings:
loadStoreDebugModeEnabled: 0 loadStoreDebugModeEnabled: 0
visionOSBundleVersion: 1.0 visionOSBundleVersion: 1.0
tvOSBundleVersion: 1.0 tvOSBundleVersion: 1.0
bundleVersion: 0.16.0 bundleVersion: 0.17.0
preloadedAssets: preloadedAssets:
- {fileID: 947724257692438902, guid: cd9921cbc21600a45b5c842c4e6ef004, type: 3} - {fileID: 947724257692438902, guid: cd9921cbc21600a45b5c842c4e6ef004, type: 3}
- {fileID: 753911528859556811, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3} - {fileID: 753911528859556811, guid: bc291c869c1aa9744be1f56806b8c99d, type: 3}