Merge branch 'master' into master_mapDev

This commit is contained in:
czbdw
2024-10-26 14:43:33 +08:00
85 changed files with 75380 additions and 227 deletions

View File

@@ -0,0 +1,138 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8497180972012339238
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3}
m_Name: Bloom
m_EditorClassIdentifier:
active: 1
skipIterations:
m_OverrideState: 0
m_Value: 1
threshold:
m_OverrideState: 1
m_Value: 0.9
intensity:
m_OverrideState: 1
m_Value: 7
scatter:
m_OverrideState: 1
m_Value: 0.6
clamp:
m_OverrideState: 0
m_Value: 65472
tint:
m_OverrideState: 0
m_Value: {r: 1, g: 1, b: 1, a: 1}
highQualityFiltering:
m_OverrideState: 0
m_Value: 0
downscale:
m_OverrideState: 0
m_Value: 0
maxIterations:
m_OverrideState: 0
m_Value: 6
dirtTexture:
m_OverrideState: 0
m_Value: {fileID: 0}
dimension: 1
dirtIntensity:
m_OverrideState: 0
m_Value: 0
--- !u!114 &-7508370275851667188
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 66f335fb1ffd8684294ad653bf1c7564, type: 3}
m_Name: ColorAdjustments
m_EditorClassIdentifier:
active: 1
postExposure:
m_OverrideState: 1
m_Value: 0
contrast:
m_OverrideState: 1
m_Value: 0
colorFilter:
m_OverrideState: 0
m_Value: {r: 1, g: 1, b: 1, a: 1}
hueShift:
m_OverrideState: 0
m_Value: 0
saturation:
m_OverrideState: 0
m_Value: 0
--- !u!114 &-6237668492243436351
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3}
m_Name: Vignette
m_EditorClassIdentifier:
active: 1
color:
m_OverrideState: 1
m_Value: {r: 0, g: 0.040178757, b: 0.4490565, a: 1}
center:
m_OverrideState: 0
m_Value: {x: 0.5, y: 0.5}
intensity:
m_OverrideState: 1
m_Value: 0.518
smoothness:
m_OverrideState: 1
m_Value: 0.312
rounded:
m_OverrideState: 0
m_Value: 0
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
m_Name: BossScene Volume Profile
m_EditorClassIdentifier:
components:
- {fileID: 4214174753672942582}
- {fileID: -7508370275851667188}
- {fileID: -6237668492243436351}
- {fileID: -8497180972012339238}
--- !u!114 &4214174753672942582
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 81180773991d8724ab7f2d216912b564, type: 3}
m_Name: ChromaticAberration
m_EditorClassIdentifier:
active: 1
intensity:
m_OverrideState: 1
m_Value: 0.15

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 81552d54f2910ff4a907972be8583fe5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -15,7 +15,7 @@ MonoBehaviour:
active: 0
intensity:
m_OverrideState: 1
m_Value: 0
m_Value: 1
--- !u!114 &-6361006316563811321
MonoBehaviour:
m_ObjectHideFlags: 3
@@ -44,204 +44,6 @@ MonoBehaviour:
rounded:
m_OverrideState: 0
m_Value: 0
--- !u!114 &-5099444214609539843
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3eb4b772797da9440885e8bd939e9560, type: 3}
m_Name: ColorCurves
m_EditorClassIdentifier:
active: 1
master:
m_OverrideState: 1
m_Value:
<length>k__BackingField: 3
m_Loop: 0
m_ZeroValue: 0
m_Range: 1
m_Curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 1
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 0.50526315
value: 0.60288477
inSlope: 1
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 1
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
red:
m_OverrideState: 0
m_Value:
<length>k__BackingField: 2
m_Loop: 0
m_ZeroValue: 0
m_Range: 1
m_Curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 1
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 1
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
green:
m_OverrideState: 0
m_Value:
<length>k__BackingField: 2
m_Loop: 0
m_ZeroValue: 0
m_Range: 1
m_Curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 1
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 1
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
blue:
m_OverrideState: 0
m_Value:
<length>k__BackingField: 2
m_Loop: 0
m_ZeroValue: 0
m_Range: 1
m_Curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 1
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 1
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
hueVsHue:
m_OverrideState: 0
m_Value:
<length>k__BackingField: 0
m_Loop: 1
m_ZeroValue: 0.5
m_Range: 1
m_Curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
hueVsSat:
m_OverrideState: 0
m_Value:
<length>k__BackingField: 0
m_Loop: 1
m_ZeroValue: 0.5
m_Range: 1
m_Curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
satVsSat:
m_OverrideState: 0
m_Value:
<length>k__BackingField: 0
m_Loop: 0
m_ZeroValue: 0.5
m_Range: 1
m_Curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
lumVsSat:
m_OverrideState: 0
m_Value:
<length>k__BackingField: 0
m_Loop: 0
m_ZeroValue: 0.5
m_Range: 1
m_Curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &-3686687427549578558
MonoBehaviour:
m_ObjectHideFlags: 3
@@ -289,7 +91,6 @@ MonoBehaviour:
- {fileID: -3686687427549578558}
- {fileID: -6721111963082353230}
- {fileID: 4696961010861712807}
- {fileID: -5099444214609539843}
--- !u!114 &4696961010861712807
MonoBehaviour:
m_ObjectHideFlags: 3

View File

@@ -1184,7 +1184,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
length: 20
lineRend: {fileID: 8494799120774102195}
targetDist: 0.5
targetDist: 0.8
_smoothSpeed: 0
trailSpeed: 100
wiggle: 1
@@ -1257,7 +1257,7 @@ LineRenderer:
- {x: 20.428371, y: 19.04856, z: 0}
m_Parameters:
serializedVersion: 3
widthMultiplier: 4
widthMultiplier: 5
widthCurve:
serializedVersion: 2
m_Curve:
@@ -2175,7 +2175,8 @@ MonoBehaviour:
m_AnimatedTarget: {fileID: 6555429748334898973}
m_LayerIndex: 0
m_ShowDebugText: 0
m_ChildCameras: []
m_ChildCameras:
- {fileID: 8402593591323444239}
m_Instructions: []
m_DefaultBlend:
m_Style: 1
@@ -4750,8 +4751,8 @@ Transform:
m_GameObject: {fileID: 3999955974394175140}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.6, y: 1.5000005, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: -2.1, y: 1.5000005, z: 0}
m_LocalScale: {x: 1.1086, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6214417439961590429}
@@ -4855,7 +4856,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
length: 20
lineRend: {fileID: 8868515708370005523}
targetDist: 0.5
targetDist: 0.8
_smoothSpeed: 0
trailSpeed: 100
wiggle: 1
@@ -4928,7 +4929,7 @@ LineRenderer:
- {x: 20.428371, y: 19.04856, z: 0}
m_Parameters:
serializedVersion: 3
widthMultiplier: 4
widthMultiplier: 5
widthCurve:
serializedVersion: 2
m_Curve:
@@ -6977,7 +6978,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
length: 20
lineRend: {fileID: 8597935398576987416}
targetDist: 0.5
targetDist: 0.8
_smoothSpeed: 0
trailSpeed: 100
wiggle: 1
@@ -7050,7 +7051,7 @@ LineRenderer:
- {x: 20.428371, y: 19.04856, z: 0}
m_Parameters:
serializedVersion: 3
widthMultiplier: 4
widthMultiplier: 5
widthCurve:
serializedVersion: 2
m_Curve:
@@ -7869,8 +7870,8 @@ Transform:
m_GameObject: {fileID: 6178086276278350990}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.6, y: 1.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalPosition: {x: 1.5596, y: 1.5, z: 0}
m_LocalScale: {x: 0.9889, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6214417439961590429}
@@ -8205,8 +8206,8 @@ Transform:
m_GameObject: {fileID: 6307004253568769282}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 17.95, z: -36}
m_LocalScale: {x: 5.8154974, y: 7.6938996, z: 1}
m_LocalPosition: {x: 0, y: 17.95, z: -34.7}
m_LocalScale: {x: 7.7773523, y: 7.6938996, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3249631952573675461}
@@ -8251,7 +8252,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: -5
m_Sprite: {fileID: 21300000, guid: 6813fff00cffacc4db63ae636a083d87, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.21568628}
m_FlipX: 0

View File

@@ -0,0 +1,48 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 36baaa8bdcb9d8b49b9199833965d2c3, type: 3}
m_Name: boss cameraVcams Blends
m_EditorClassIdentifier:
m_CustomBlends:
- m_From: CM vcam1_c1
m_To: CM vcam1_c2
m_Blend:
m_Style: 3
m_Time: 7
m_CustomCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 0
m_PostInfinity: 0
m_RotationOrder: 0
- m_From: CM vcam1_c2
m_To: CM vcam1_c3
m_Blend:
m_Style: 1
m_Time: 5
m_CustomCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 0
m_PostInfinity: 0
m_RotationOrder: 0
- m_From: CM vcam1_c3
m_To: CM vcam1_c1
m_Blend:
m_Style: 1
m_Time: 0
m_CustomCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 0
m_PostInfinity: 0
m_RotationOrder: 0

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 940d3fbecea61a447a33fdeff7742a10
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant: