marcin/beyond
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Player prefab changes for wasteland and other chapters

Browse Source
This commit is contained in:
marcin
2025-04-04 11:13:05 +02:00
parent 8f963325f6
commit d40ae007f1
4 changed files with 2088 additions and 5015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3844
Assets/Prefabs/Input/vMeleeMobileControlsUI_NewInput.prefab
View File

File diff suppressed because it is too large Load Diff

162
Assets/Prefabs/PlayerWithUI.prefab
View File

@@ -11851,7 +11851,7 @@ PrefabInstance:
type: 3}
propertyPath: 'imagesToPulse.Array.data[0]'
value:
objectReference: {fileID: 8777606854772045178}
objectReference: {fileID: 0}
- target: {fileID: 1696645347204483499, guid: ae34cc9d1f0d3004bb83820c89ec7ce3,
type: 3}
propertyPath: 'gameObjectsToEnable.Array.data[0]'
@@ -16112,6 +16112,42 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e673785925c433840a8a84c4bc9241a4, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1979772586722938859 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1322085929885561165, guid: 62f5a4342bff4fc479aeeb8f946c8e59,
type: 3}
m_PrefabInstance: {fileID: 657928566586195622}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8db7ac4e6251e0342a88d8f24e30ebdb, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1979772586751385256 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1322085929991331854, guid: 62f5a4342bff4fc479aeeb8f946c8e59,
type: 3}
m_PrefabInstance: {fileID: 657928566586195622}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8db7ac4e6251e0342a88d8f24e30ebdb, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1979772586760647703 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1322085929982036657, guid: 62f5a4342bff4fc479aeeb8f946c8e59,
type: 3}
m_PrefabInstance: {fileID: 657928566586195622}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8db7ac4e6251e0342a88d8f24e30ebdb, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1979772586767270223 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1322085929940320233, guid: 62f5a4342bff4fc479aeeb8f946c8e59,
@@ -18720,7 +18756,7 @@ PrefabInstance:
type: 3}
propertyPath: powersSwitcher
value:
objectReference: {fileID: 7254450738688970460}
objectReference: {fileID: 0}
- target: {fileID: 8525611689884026115, guid: 60b79e23a507e0c48a94b7e3d5138383,
type: 3}
propertyPath: weaponsSwitcher
@@ -19690,17 +19726,17 @@ PrefabInstance:
type: 3}
propertyPath: 'imagesToPulse.Array.data[1]'
value:
objectReference: {fileID: 8777606854772045178}
objectReference: {fileID: 0}
- target: {fileID: 3122996088938853854, guid: ca2e5589fe5096c40b4e8174d6e3bd30,
type: 3}
propertyPath: 'imagesToPulse.Array.data[2]'
value:
objectReference: {fileID: 1135418756897597268}
objectReference: {fileID: 0}
- target: {fileID: 3122996088938853854, guid: ca2e5589fe5096c40b4e8174d6e3bd30,
type: 3}
propertyPath: 'imagesToPulse.Array.data[3]'
value:
objectReference: {fileID: 8934145235635439305}
objectReference: {fileID: 0}
- target: {fileID: 3122996088938853854, guid: ca2e5589fe5096c40b4e8174d6e3bd30,
type: 3}
propertyPath: gameObjectsToEnable.Array.size
@@ -20105,17 +20141,17 @@ PrefabInstance:
type: 3}
propertyPath: 'imagesToPulse.Array.data[1]'
value:
objectReference: {fileID: 8777606854772045178}
objectReference: {fileID: 0}
- target: {fileID: 5460798175957372567, guid: ca2e5589fe5096c40b4e8174d6e3bd30,
type: 3}
propertyPath: 'imagesToPulse.Array.data[2]'
value:
objectReference: {fileID: 1135418756897597268}
objectReference: {fileID: 0}
- target: {fileID: 5460798175957372567, guid: ca2e5589fe5096c40b4e8174d6e3bd30,
type: 3}
propertyPath: 'imagesToPulse.Array.data[3]'
value:
objectReference: {fileID: 8934145235635439305}
objectReference: {fileID: 0}
- target: {fileID: 5460798175957372567, guid: ca2e5589fe5096c40b4e8174d6e3bd30,
type: 3}
propertyPath: gameObjectsToEnable.Array.size
@@ -20165,17 +20201,17 @@ PrefabInstance:
type: 3}
propertyPath: 'imagesToPulse.Array.data[0]'
value:
objectReference: {fileID: 8777606854772045178}
objectReference: {fileID: 0}
- target: {fileID: 6068785289500192350, guid: ca2e5589fe5096c40b4e8174d6e3bd30,
type: 3}
propertyPath: 'imagesToPulse.Array.data[1]'
value:
objectReference: {fileID: 1135418756897597268}
objectReference: {fileID: 0}
- target: {fileID: 6068785289500192350, guid: ca2e5589fe5096c40b4e8174d6e3bd30,
type: 3}
propertyPath: 'imagesToPulse.Array.data[2]'
value:
objectReference: {fileID: 8934145235635439305}
objectReference: {fileID: 0}
- target: {fileID: 6068785289500192350, guid: ca2e5589fe5096c40b4e8174d6e3bd30,
type: 3}
propertyPath: 'gameObjectsToEnable.Array.data[0]'
@@ -23078,17 +23114,17 @@ PrefabInstance:
type: 3}
propertyPath: 'imagesToPulse.Array.data[0]'
value:
objectReference: {fileID: 8777606854772045178}
objectReference: {fileID: 0}
- target: {fileID: 3757701813447061082, guid: 2c3b22f0f63c4bf4da3ebdc4b7757d35,
type: 3}
propertyPath: 'imagesToPulse.Array.data[1]'
value:
objectReference: {fileID: 1135418756897597268}
objectReference: {fileID: 0}
- target: {fileID: 3757701813447061082, guid: 2c3b22f0f63c4bf4da3ebdc4b7757d35,
type: 3}
propertyPath: 'imagesToPulse.Array.data[2]'
value:
objectReference: {fileID: 8934145235635439305}
objectReference: {fileID: 0}
- target: {fileID: 3757701813447061082, guid: 2c3b22f0f63c4bf4da3ebdc4b7757d35,
type: 3}
propertyPath: 'gameObjectsToEnable.Array.data[0]'
@@ -23423,17 +23459,17 @@ PrefabInstance:
type: 3}
propertyPath: 'imagesToPulse.Array.data[1]'
value:
objectReference: {fileID: 8777606854772045178}
objectReference: {fileID: 0}
- target: {fileID: 5425075683468408282, guid: 2c3b22f0f63c4bf4da3ebdc4b7757d35,
type: 3}
propertyPath: 'imagesToPulse.Array.data[2]'
value:
objectReference: {fileID: 1135418756897597268}
objectReference: {fileID: 0}
- target: {fileID: 5425075683468408282, guid: 2c3b22f0f63c4bf4da3ebdc4b7757d35,
type: 3}
propertyPath: 'imagesToPulse.Array.data[3]'
value:
objectReference: {fileID: 8934145235635439305}
objectReference: {fileID: 0}
- target: {fileID: 6105018226803190835, guid: 2c3b22f0f63c4bf4da3ebdc4b7757d35,
type: 3}
propertyPath: m_Pivot.x
@@ -24265,7 +24301,7 @@ PrefabInstance:
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 7260723501686505163}
objectReference: {fileID: 0}
- target: {fileID: 1771614490565708014, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState
@@ -25469,6 +25505,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3933913939566849537, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
propertyPath: equipSlot
value:
objectReference: {fileID: 1979772586751385256}
- target: {fileID: 4008629534880549813, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
propertyPath: equipArea
@@ -26220,12 +26261,12 @@ PrefabInstance:
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[1].m_Target
value:
objectReference: {fileID: 7270444241320278693}
objectReference: {fileID: 0}
- target: {fileID: 5935458018235585421, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 7270444241320278693}
objectReference: {fileID: 0}
- target: {fileID: 5935458018235585421, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState
@@ -26623,6 +26664,11 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6873079659947345108, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
propertyPath: equipSlot
value:
objectReference: {fileID: 1979772586760647703}
- target: {fileID: 6893351110900700630, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
propertyPath: equipArea
@@ -26638,6 +26684,11 @@ PrefabInstance:
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7184058491231261718, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
propertyPath: equipSlot
value:
objectReference: {fileID: 1979772586722938859}
- target: {fileID: 7206908192520695755, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
propertyPath: m_SizeDelta.y
@@ -26783,7 +26834,7 @@ PrefabInstance:
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target
value:
objectReference: {fileID: 7533023426359449216}
objectReference: {fileID: 0}
- target: {fileID: 8093155784923858749, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_CallState
@@ -26919,7 +26970,8 @@ PrefabInstance:
propertyPath: m_Layer
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 6712289050083933417, guid: 38ca8b4bc26702b40a70a342950990ee, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 6801932090720815126, guid: 38ca8b4bc26702b40a70a342950990ee,
@@ -27010,12 +27062,6 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 7688096691329566824}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1135418756897597268 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7309423983776788284, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
m_PrefabInstance: {fileID: 7688096691329566824}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1299102853609397129 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8698364153252516833, guid: 38ca8b4bc26702b40a70a342950990ee,
@@ -27426,54 +27472,6 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 7688096691329566824}
m_PrefabAsset: {fileID: 0}
--- !u!114 &7254450738688970460 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1017083129848809140, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
m_PrefabInstance: {fileID: 7688096691329566824}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cb3f177048622e340a6c54d7ae8a6466, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &7260723501686505163 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1041139360089814691, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
m_PrefabInstance: {fileID: 7688096691329566824}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 85bf3be603548374ca46f521a3aa7fda, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &7270444241320278693 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1032544434457408205, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
m_PrefabInstance: {fileID: 7688096691329566824}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 85bf3be603548374ca46f521a3aa7fda, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &7533023426359449216 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 160783578619698920, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
m_PrefabInstance: {fileID: 7688096691329566824}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 85bf3be603548374ca46f521a3aa7fda, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &7688096692713820187 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 1839077491, guid: 38ca8b4bc26702b40a70a342950990ee,
@@ -27541,12 +27539,6 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 7688096691329566824}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8777606854772045178 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1396619291716402450, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
m_PrefabInstance: {fileID: 7688096691329566824}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8897900063391457930 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1281885164499217122, guid: 38ca8b4bc26702b40a70a342950990ee,
@@ -27559,12 +27551,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 773c190cc9d1095408e32d0fab6e152a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8934145235635439305 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1246915406413860513, guid: 38ca8b4bc26702b40a70a342950990ee,
type: 3}
m_PrefabInstance: {fileID: 7688096691329566824}
m_PrefabAsset: {fileID: 0}
--- !u!1 &9164926379149337896 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1549731741953142080, guid: 38ca8b4bc26702b40a70a342950990ee,

3093
Assets/Scenes/Land_01/Land_Of_Death_Demo.unity
View File

File diff suppressed because it is too large Load Diff

4
Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat vendored
View File

@@ -65,11 +65,11 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BlendOp: 0
- _BlendOp: 2
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 1
- _DstBlend: 10
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1