helar/Heroes_of_Hiis
1
0
Fork 0
Code Issues 8 Pull Requests 2 Projects Releases Wiki Activity

Merge branch 'staging2' into combatscene

Browse Source
This commit is contained in:
jonasty
2022-04-25 12:49:24 +00:00
parent b51388d292 036fa40b82
commit f82cfa297e
5 changed files with 302 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
Assets/Scenes/Arlo/Playground.unity
View File

@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994}
m_IndirectSpecularColor: {r: 0.09674972, g: 0.35171852, b: 0.7160277, a: 1}
m_IndirectSpecularColor: {r: 0.097786635, g: 0.3520055, b: 0.71981287, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -519,75 +519,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 196031885}
m_CullTransparentMesh: 1
--- !u!1001 &421701411
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8437010424349675124, guid: 288eb0a3190dc75419059ff7b4b70aa0,
type: 3}
propertyPath: m_Name
value: SlimePBR
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 288eb0a3190dc75419059ff7b4b70aa0,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 288eb0a3190dc75419059ff7b4b70aa0,
type: 3}
propertyPath: m_LocalPosition.x
value: 3.546007
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 288eb0a3190dc75419059ff7b4b70aa0,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.00000047683716
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 288eb0a3190dc75419059ff7b4b70aa0,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.44001675
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 288eb0a3190dc75419059ff7b4b70aa0,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 288eb0a3190dc75419059ff7b4b70aa0,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 288eb0a3190dc75419059ff7b4b70aa0,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 288eb0a3190dc75419059ff7b4b70aa0,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 288eb0a3190dc75419059ff7b4b70aa0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 288eb0a3190dc75419059ff7b4b70aa0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 288eb0a3190dc75419059ff7b4b70aa0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 288eb0a3190dc75419059ff7b4b70aa0, type: 3}
--- !u!1 &492689958
GameObject:
m_ObjectHideFlags: 0
@@ -1160,7 +1091,7 @@ PrefabInstance:
- target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
type: 3}
propertyPath: m_RootOrder
value: 6
value: 12
objectReference: {fileID: 0}
- target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
type: 3}
@@ -1229,7 +1160,7 @@ PrefabInstance:
- target: {fileID: 553484814939433779, guid: dbc6a20437aec3141aaf8a552c1bc24f,
type: 3}
propertyPath: m_RootOrder
value: 3
value: 6
objectReference: {fileID: 0}
- target: {fileID: 553484814939433779, guid: dbc6a20437aec3141aaf8a552c1bc24f,
type: 3}
@@ -1479,7 +1410,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &599916906
MonoBehaviour:
@@ -1807,7 +1738,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!114 &705507996
MonoBehaviour:
@@ -2050,7 +1981,7 @@ PrefabInstance:
- target: {fileID: 988253026175434765, guid: 1931b899d98ae8543a827f11728cabe4,
type: 3}
propertyPath: m_RootOrder
value: 2
value: 4
objectReference: {fileID: 0}
- target: {fileID: 988253026175434765, guid: 1931b899d98ae8543a827f11728cabe4,
type: 3}
@@ -2283,7 +2214,7 @@ Transform:
- {fileID: 1738326077}
- {fileID: 1713108173}
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 115.775, z: 0}
--- !u!1 &1520828248
GameObject:
@@ -2435,7 +2366,7 @@ GameObject:
- component: {fileID: 1578543177}
m_Layer: 0
m_Name: XR Origin
m_TagString: Untagged
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -2471,7 +2402,7 @@ Transform:
m_Children:
- {fileID: 508810528}
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1578543177
MonoBehaviour:
@@ -2485,6 +2416,75 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f121a54614abe5f4990620bfd6a1c96c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1585303305
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8437010424349675124, guid: 28785ec045ec00946ab767b14c8f4c6d,
type: 3}
propertyPath: m_Name
value: SlimePBR
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 28785ec045ec00946ab767b14c8f4c6d,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 28785ec045ec00946ab767b14c8f4c6d,
type: 3}
propertyPath: m_LocalPosition.x
value: 5.33
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 28785ec045ec00946ab767b14c8f4c6d,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.00000023841858
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 28785ec045ec00946ab767b14c8f4c6d,
type: 3}
propertyPath: m_LocalPosition.z
value: 11.57
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 28785ec045ec00946ab767b14c8f4c6d,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 28785ec045ec00946ab767b14c8f4c6d,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 28785ec045ec00946ab767b14c8f4c6d,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 28785ec045ec00946ab767b14c8f4c6d,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 28785ec045ec00946ab767b14c8f4c6d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 28785ec045ec00946ab767b14c8f4c6d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8439413668953451466, guid: 28785ec045ec00946ab767b14c8f4c6d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 28785ec045ec00946ab767b14c8f4c6d, type: 3}
--- !u!4 &1636948867 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6178336183725213671, guid: d424f1b7b8f6a784c95e4f2d5872728e,
@@ -2595,7 +2595,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1651537456
MonoBehaviour:
@@ -3379,7 +3379,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 13
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1841330314
PrefabInstance:
@@ -3391,7 +3391,7 @@ PrefabInstance:
- target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
type: 3}
propertyPath: m_RootOrder
value: 4
value: 8
objectReference: {fileID: 0}
- target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
type: 3}
@@ -3705,7 +3705,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1993143051
PrefabInstance:
@@ -3717,7 +3717,7 @@ PrefabInstance:
- target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
type: 3}
propertyPath: m_RootOrder
value: 5
value: 10
objectReference: {fileID: 0}
- target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
type: 3}
@@ -3821,7 +3821,7 @@ PrefabInstance:
- target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
type: 3}
propertyPath: m_RootOrder
value: 7
value: 11
objectReference: {fileID: 0}
- target: {fileID: 6028983200900377696, guid: c89fd30ca0b56fb41a415d285d87b219,
type: 3}