Commit 8c4bd5d5 authored by JEthan's avatar JEthan
Browse files

Merge branch 'Jonas-Ethan'

parents c6e4af79 52fffd7e
...@@ -120,40 +120,6 @@ NavMeshSettings: ...@@ -120,40 +120,6 @@ NavMeshSettings:
debug: debug:
m_Flags: 0 m_Flags: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!84 &20368930
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1407
m_Height: 789
m_AntiAliasing: 1
m_DepthFormat: 0
m_ColorFormat: 21
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1001 &23939330 --- !u!1001 &23939330
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -281,7 +247,7 @@ Transform: ...@@ -281,7 +247,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 155252411} m_GameObject: {fileID: 155252411}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 20.444618, y: -2.5615084, z: 90.09141} m_LocalPosition: {x: 13.59, y: -3.82, z: -2}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 944033166} m_Father: {fileID: 944033166}
...@@ -445,7 +411,7 @@ PrefabInstance: ...@@ -445,7 +411,7 @@ PrefabInstance:
type: 3} type: 3}
propertyPath: m_TargetTexture propertyPath: m_TargetTexture
value: value:
objectReference: {fileID: 20368930} objectReference: {fileID: 1911394222}
- target: {fileID: 8811539149977030266, guid: 388a7af523fdebaafad4a5d1ae1a896b, - target: {fileID: 8811539149977030266, guid: 388a7af523fdebaafad4a5d1ae1a896b,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
...@@ -1233,12 +1199,12 @@ Transform: ...@@ -1233,12 +1199,12 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705392616} m_GameObject: {fileID: 705392616}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 60.95, y: -6.57, z: -2} m_LocalPosition: {x: 60.95, y: -6.57, z: -2}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 944033166}
m_RootOrder: 13 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &721263643 --- !u!1 &721263643
GameObject: GameObject:
...@@ -1362,13 +1328,18 @@ PrefabInstance: ...@@ -1362,13 +1328,18 @@ PrefabInstance:
- target: {fileID: 1611726988538008501, guid: 5916f00562e9cb5eb97b95a471c1ef03, - target: {fileID: 1611726988538008501, guid: 5916f00562e9cb5eb97b95a471c1ef03,
type: 3} type: 3}
propertyPath: pauseDuration propertyPath: pauseDuration
value: 4 value: 5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1611726988538008501, guid: 5916f00562e9cb5eb97b95a471c1ef03, - target: {fileID: 1611726988538008501, guid: 5916f00562e9cb5eb97b95a471c1ef03,
type: 3} type: 3}
propertyPath: transitionDuration propertyPath: transitionDuration
value: 1.5 value: 1.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1611726988538008501, guid: 5916f00562e9cb5eb97b95a471c1ef03,
type: 3}
propertyPath: strength
value: 80
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5916f00562e9cb5eb97b95a471c1ef03, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 5916f00562e9cb5eb97b95a471c1ef03, type: 3}
--- !u!4 &833453656 stripped --- !u!4 &833453656 stripped
...@@ -1449,12 +1420,12 @@ Transform: ...@@ -1449,12 +1420,12 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 839515403} m_GameObject: {fileID: 839515403}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 29.07, y: -4.4, z: -2} m_LocalPosition: {x: 29.07, y: -4.4, z: -2}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 944033166}
m_RootOrder: 12 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &920318159 stripped --- !u!4 &920318159 stripped
Transform: Transform:
...@@ -1492,6 +1463,8 @@ Transform: ...@@ -1492,6 +1463,8 @@ Transform:
- {fileID: 1297873716} - {fileID: 1297873716}
- {fileID: 1384728258} - {fileID: 1384728258}
- {fileID: 155252412} - {fileID: 155252412}
- {fileID: 839515405}
- {fileID: 705392618}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 11 m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -2224,6 +2197,40 @@ PrefabInstance: ...@@ -2224,6 +2197,40 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 504d671a4858dbe4cb1f3c567bb881b4, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 504d671a4858dbe4cb1f3c567bb881b4, type: 3}
--- !u!84 &1911394222
RenderTexture:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 3
m_Width: 1305
m_Height: 787
m_AntiAliasing: 1
m_DepthFormat: 0
m_ColorFormat: 21
m_MipMap: 0
m_GenerateMips: 1
m_SRGB: 0
m_UseDynamicScale: 0
m_BindMS: 0
m_EnableCompatibleFormat: 1
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
m_Aniso: 1
m_MipBias: 0
m_WrapU: 1
m_WrapV: 1
m_WrapW: 1
m_Dimension: 2
m_VolumeDepth: 1
--- !u!1 &1955150071 --- !u!1 &1955150071
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
...@@ -33,6 +33,7 @@ GraphicsSettings: ...@@ -33,6 +33,7 @@ GraphicsSettings:
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: [] m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0} type: 0}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment