Merge branch 'final'

This commit is contained in:
jakszt 2023-01-17 17:41:49 +02:00
commit a4aa84e952
4 changed files with 20 additions and 4 deletions

View File

@ -206,6 +206,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 85ed5d06f443ff547aeb225e656c0e19, type: 3} m_Script: {fileID: 11500000, guid: 85ed5d06f443ff547aeb225e656c0e19, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
playerX: 0
BattleState: 1 BattleState: 1
defence: 0 defence: 0
maxHealth: 45 maxHealth: 45

View File

@ -1620,7 +1620,7 @@ MonoBehaviour:
Dialogue: {fileID: 0} Dialogue: {fileID: 0}
EndactionEventList: [] EndactionEventList: []
keyToOpen: 101 keyToOpen: 101
CanBeOpened: 1 CanBeOpened: 0
OpenInDefaultWay: 1 OpenInDefaultWay: 1
--- !u!114 &20695593 --- !u!114 &20695593
MonoBehaviour: MonoBehaviour:

View File

@ -16284,7 +16284,16 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1126efb434c50f446b49891f5584c786, type: 3} m_Script: {fileID: 11500000, guid: 1126efb434c50f446b49891f5584c786, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ElementsToBuildOnSceneList: [] ElementsToBuildOnSceneList:
- Key: 0
Value:
EquippableItem: {fileID: 11400000, guid: e76017225f130f3459860a42d4169494, type: 2}
- Key: 1
Value:
EquippableItem: {fileID: 11400000, guid: 74bb221206536b94caf425820b9d626d, type: 2}
- Key: 2
Value:
EquippableItem: {fileID: 11400000, guid: c96390ceb0786494db5919aaad6a06be, type: 2}
convertedData: [] convertedData: []
--- !u!1 &689787120 --- !u!1 &689787120
GameObject: GameObject:
@ -80409,6 +80418,10 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 4951012252775454729, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: attackValue
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4951012252775454729, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3} - target: {fileID: 4951012252775454729, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
propertyPath: MinionRespowner propertyPath: MinionRespowner
value: value:
@ -80481,5 +80494,6 @@ PrefabInstance:
propertyPath: m_Mass propertyPath: m_Mass
value: 3 value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents:
- {fileID: 4951012252775454728, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}

View File

@ -4972,7 +4972,8 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents:
- {fileID: 4951012252775454728, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 1dd9a631d03d51f4792b21f682af311d, type: 3}
--- !u!1 &610477486 --- !u!1 &610477486
GameObject: GameObject: