ktyl
/
revival
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rocks-in-the-sky' into 'main' 

yeeted rocks into the sky

See merge request kernel-panic/revival!109
This commit is contained in:
Cat Flynn 2021-05-18 18:17:43 +00:00
parent aede9ca14b e8815b43da
commit cf2e753dc9
3 changed files with 3311 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3212
game/Assets/Prefabs/RocksInTheSky.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
game/Assets/Prefabs/RocksInTheSky.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f94c8d6c631a4a14bbbcc77a75a5e7d8
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

119
game/Assets/Scenes/Main.unity
View File

@ -1878,19 +1878,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: 0.651364
value: 0.6512092
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: -0.74512863
value: -0.7450898
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.12156138
value: 0.12232116
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.075704075
value: 0.076192856
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223330, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_RendererIndex
@ -1902,7 +1902,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0.06264305
value: 0.06260109
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
@ -1910,23 +1910,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: 0.014015436
value: 0.0135195255
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.14673053
value: -0.14762793
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.12058892
value: 0.12145287
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.75850874
value: 0.758004
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.6233724
value: 0.6236066
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_Name
@ -2046,31 +2046,31 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: 0.78704333
value: 0.78697556
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: -0.61647433
value: -0.61656094
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: -0.021313503
value: -0.02131227
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: -0.00824248
value: -0.008244702
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0.06264305
value: 0.06260109
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: -1.2534504
value: -1.2571499
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: 0.014015436
value: 0.0135195255
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
@ -2106,19 +2106,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7171143
value: 0.7170212
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: -0.6945532
value: -0.6946101
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.05144466
value: 0.051858354
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.026389401
value: 0.026608538
objectReference: {fileID: 0}
- target: {fileID: 4676633833077728950, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_XAxis.Value
@ -2150,7 +2150,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0.06264305
value: 0.06260109
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
@ -2158,23 +2158,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: 0.014015436
value: 0.0135195255
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.14673065
value: -0.14762793
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.120589025
value: 0.12145287
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.75850856
value: 0.75800395
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.6233723
value: 0.6236066
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
@ -2183,6 +2183,63 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 4676633831945762664, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
m_PrefabInstance: {fileID: 2069078696}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &998576333259080846
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 998576333244823442, guid: f94c8d6c631a4a14bbbcc77a75a5e7d8, type: 3}
propertyPath: m_Name
value: RocksInTheSky
objectReference: {fileID: 0}
- target: {fileID: 998576333244823443, guid: f94c8d6c631a4a14bbbcc77a75a5e7d8, type: 3}
propertyPath: m_RootOrder
value: 14
objectReference: {fileID: 0}
- target: {fileID: 998576333244823443, guid: f94c8d6c631a4a14bbbcc77a75a5e7d8, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 998576333244823443, guid: f94c8d6c631a4a14bbbcc77a75a5e7d8, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 998576333244823443, guid: f94c8d6c631a4a14bbbcc77a75a5e7d8, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 998576333244823443, guid: f94c8d6c631a4a14bbbcc77a75a5e7d8, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 998576333244823443, guid: f94c8d6c631a4a14bbbcc77a75a5e7d8, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 998576333244823443, guid: f94c8d6c631a4a14bbbcc77a75a5e7d8, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 998576333244823443, guid: f94c8d6c631a4a14bbbcc77a75a5e7d8, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 998576333244823443, guid: f94c8d6c631a4a14bbbcc77a75a5e7d8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 998576333244823443, guid: f94c8d6c631a4a14bbbcc77a75a5e7d8, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 998576333244823443, guid: f94c8d6c631a4a14bbbcc77a75a5e7d8, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f94c8d6c631a4a14bbbcc77a75a5e7d8, type: 3}
--- !u!1001 &1238586027780063751
PrefabInstance:
m_ObjectHideFlags: 0
@ -2980,6 +3037,10 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 18
objectReference: {fileID: 0}
- target: {fileID: 2371641019760348108, guid: 2d949926f63a2554584336b07085202b, type: 3}
propertyPath: m_LocalPosition.y
value: 10.044
objectReference: {fileID: 0}
- target: {fileID: 2637069503737353848, guid: 2d949926f63a2554584336b07085202b, type: 3}
propertyPath: m_RootOrder
value: 14
@ -2996,6 +3057,10 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 10
objectReference: {fileID: 0}
- target: {fileID: 3150096022114898604, guid: 2d949926f63a2554584336b07085202b, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3265664433818830916, guid: 2d949926f63a2554584336b07085202b, type: 3}
propertyPath: m_RootOrder
value: 22