Working on quests, moved to CineMachine for camera and started to build out areas, started combat system

This commit is contained in:
2026-02-12 17:30:04 +00:00
parent c08d7d8830
commit d564c5f44e
50 changed files with 21700 additions and 10726 deletions

View File

@@ -24,6 +24,7 @@ Material:
disabledShaderPasses:
- MOTIONVECTORS
- DepthOnly
- SHADOWCASTER
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
@@ -57,7 +58,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: cf19d52271177d0428e56c9b5bca279a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -129,7 +130,7 @@ Material:
- _ZWrite: 0
m_Colors:
- _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}
- _DiffuseColor: {r: 1, g: 0.47586206, b: 0, a: 1}
- _EmissionColor: {r: 60, g: 1.2413799, b: 0, a: 60}
- _EmissionColorUI: {r: 1, g: 0.020689664, b: 0, a: 1}

View File

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

View File

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

View File

@@ -64,7 +64,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 98cf3250d96197d4d8188a96526fffc1, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:

View File

@@ -3348,6 +3348,9 @@ AnimatorStateTransition:
- m_ConditionMode: 6
m_ConditionEvent: MeleeType_int
m_EventTreshold: 2
- m_ConditionMode: 1
m_ConditionEvent: Shoot_b
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110240064}
m_Solo: 0
@@ -5320,6 +5323,9 @@ AnimatorStateTransition:
- m_ConditionMode: 6
m_ConditionEvent: MeleeType_int
m_EventTreshold: 1
- m_ConditionMode: 1
m_ConditionEvent: Shoot_b
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110277130}
m_Solo: 0
@@ -6903,6 +6909,9 @@ AnimatorStateTransition:
- m_ConditionMode: 6
m_ConditionEvent: MeleeType_int
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: Shoot_b
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110207262}
m_Solo: 0