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

Merge remote-tracking branch 'origin/NewStory' into NewStory

Browse Source
This commit is contained in:
szczuras4
2026-01-19 15:15:48 +01:00
parent e099448732 b345a8cca1
commit 5be4bfa163
35 changed files with 60438 additions and 59651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Assets/Scenes/00_Fight_Arena/Fight_Arena.unity
View File

@@ -19978,12 +19978,12 @@ PrefabInstance:
- target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 8313224
value: 13310657
objectReference: {fileID: 0}
- target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -1330118.2
value: -2129729.5
objectReference: {fileID: 0}
- target: {fileID: 5265345828117443429, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
@@ -20530,6 +20530,36 @@ PrefabInstance:
propertyPath: startItems.Array.data[28].addToEquipArea
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: startItems.Array.data[3].changeAttributes
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: startItems.Array.data[3].attributes.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: startItems.Array.data[3].attributes.Array.data[0].name
value: 12
objectReference: {fileID: 0}
- target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: startItems.Array.data[3].attributes.Array.data[1].name
value: 11
objectReference: {fileID: 0}
- target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: startItems.Array.data[3].attributes.Array.data[0].value
value: 30
objectReference: {fileID: 0}
- target: {fileID: 5582921900280934274, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: startItems.Array.data[3].attributes.Array.data[1].value
value: 200
objectReference: {fileID: 0}
- target: {fileID: 5613825752652024524, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_Layer

54
Assets/Scenes/Old_Levels!/TestHub.unity
View File

@@ -14059,42 +14059,42 @@ PrefabInstance:
- target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 210
value: 0
objectReference: {fileID: 0}
- target: {fileID: 564995907207171390, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -135
value: 0
objectReference: {fileID: 0}
- target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 210.00003
value: 0
objectReference: {fileID: 0}
- target: {fileID: 616128472424357225, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -45
value: 0
objectReference: {fileID: 0}
- target: {fileID: 703778627114599771, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
@@ -15165,22 +15165,22 @@ PrefabInstance:
- target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 210
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4202610206940879906, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -225
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4204595259268909078, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
@@ -15420,22 +15420,22 @@ PrefabInstance:
- target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 210
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4796023216948086302, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -315
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4907318199456855652, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
@@ -15905,12 +15905,12 @@ PrefabInstance:
- target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 2239812
value: 2272933.2
objectReference: {fileID: 0}
- target: {fileID: 5234664790783380194, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -358369.6
value: -363668.97
objectReference: {fileID: 0}
- target: {fileID: 5265345828117443429, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
@@ -16820,22 +16820,22 @@ PrefabInstance:
- target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 210
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7465903852046106667, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -405
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7534046934194550914, guid: 851e8e61247888340bdec90fc8aa37f5,
type: 3}
@@ -18158,21 +18158,11 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1203476819518978270, guid: cd8f9cb3aae974fbc9aedcaba4d732ef,
type: 3}
propertyPath: fireOnce
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4356717714091686263, guid: cd8f9cb3aae974fbc9aedcaba4d732ef,
type: 3}
propertyPath: m_Name
value: PORTAL universal
objectReference: {fileID: 0}
- target: {fileID: 5236832152036474326, guid: cd8f9cb3aae974fbc9aedcaba4d732ef,
type: 3}
propertyPath: m_text
value: Universal
objectReference: {fileID: 0}
- target: {fileID: 8055236590161711561, guid: cd8f9cb3aae974fbc9aedcaba4d732ef,
type: 3}
propertyPath: m_LocalPosition.x