PBG2H23ABR/PBG2H23ABR_PBG2H23AKL_PMC_Projekt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.bib.de/PBG2H23ABR/PBG2H23ABR_PBG2H23AKL_PMC_Projekt

Browse Source
This commit is contained in:
Jan Breitkreuz 2024-07-03 12:51:18 +02:00
commit f05feed498
1 changed files with 83 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
Plunderblock/Assets/PrefabsJan/Player.prefab
View File

@ -14,7 +14,7 @@ GameObject:
- component: {fileID: 3666105254736337792} - component: {fileID: 3666105254736337792}
- component: {fileID: 4388674863496844361} - component: {fileID: 4388674863496844361}
- component: {fileID: 8630772403149418534} - component: {fileID: 8630772403149418534}
m_Layer: 0 m_Layer: 10
m_Name: Player m_Name: Player
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -170,7 +170,7 @@ GameObject:
- component: {fileID: 2185328643417196317} - component: {fileID: 2185328643417196317}
- component: {fileID: 867329417011563282} - component: {fileID: 867329417011563282}
- component: {fileID: 7794986653153333048} - component: {fileID: 7794986653153333048}
m_Layer: 0 m_Layer: 10
m_Name: Cube m_Name: Cube
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -274,7 +274,7 @@ GameObject:
- component: {fileID: 5950832400214244271} - component: {fileID: 5950832400214244271}
- component: {fileID: 689352146329584273} - component: {fileID: 689352146329584273}
- component: {fileID: 1269826207237336938} - component: {fileID: 1269826207237336938}
m_Layer: 0 m_Layer: 10
m_Name: PlayerView m_Name: PlayerView
m_TagString: MainCamera m_TagString: MainCamera
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -365,6 +365,18 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 5950832400214244271} m_TransformParent: {fileID: 5950832400214244271}
m_Modifications: m_Modifications:
- target: {fileID: 95360399556382469, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3}
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
- target: {fileID: 2052943883049938302, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3}
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
- target: {fileID: 3852534801679810867, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3}
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
- target: {fileID: 5727695039551963900, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - target: {fileID: 5727695039551963900, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 357 value: 357
@ -413,10 +425,18 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7027964462908259073, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3}
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
- target: {fileID: 8142714974886293319, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - target: {fileID: 8142714974886293319, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: UI_Manager value: UI_Manager
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8142714974886293319, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3}
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
- target: {fileID: 8625755030761962559, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3} - target: {fileID: 8625755030761962559, guid: abb3f2146f967be4e9dfd6069915f42c, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: 458 value: 458
@ -443,52 +463,94 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 5950832400214244271} m_TransformParent: {fileID: 5950832400214244271}
m_Modifications: m_Modifications:
- target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0.5520002 value: -0.06001303
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: -0.357 value: 0.68006015
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.5700001 value: -0.1801692
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalRotation.w
value: -0.6270118
objectReference: {fileID: 0}
- target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1313371464610265781, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2494636701005268105, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
- target: {fileID: 3929927056536112425, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
- target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalPosition.x
value: 0.55560887
objectReference: {fileID: 0}
- target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalPosition.y
value: -0.403
objectReference: {fileID: 0}
- target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalPosition.z
value: 0.60068274
objectReference: {fileID: 0}
- target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalRotation.w
value: -0.6547129
objectReference: {fileID: 0}
- target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalRotation.x
value: 0.042114396
objectReference: {fileID: 0}
- target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0.7790098 value: 0.753147
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: -0 value: -0.048446175
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x propertyPath: m_LocalEulerAnglesHint.x
value: 0 value: 1.022
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y propertyPath: m_LocalEulerAnglesHint.y
value: 257.66 value: 262.066
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - target: {fileID: 6798321073873421098, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 7.29
objectReference: {fileID: 0}
- target: {fileID: 7971593296632072563, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8363807481264483936, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} - target: {fileID: 8363807481264483936, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Gun value: Gun
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] - target: {fileID: 8363807481264483936, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
m_RemovedGameObjects: [] propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 3410127534591597247, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
m_RemovedGameObjects:
- {fileID: 6867957792503530889, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}
m_AddedGameObjects: [] m_AddedGameObjects: []
m_AddedComponents: [] m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4d3459d3c81134641b756c0c5205d59e, type: 3}