Skip to content

B
BoomMaster
Commit dd6f256d authored by xujr's avatar xujr
Browse files
Options

Merge remote-tracking branch 'origin/YuYang' into xjr 

# Conflicts:
#	BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab
#	BoomMaster/Assets/Res/Prefabs/Levels/Level9.prefab
parents 76c4ce9b 00b6b638
Hide whitespace changes
Inline Side-by-side
Showing with 11617 additions and 12756 deletions
BoomMaster/Assets/#A1_Scenes/关卡编辑.unity
View file @ dd6f256d
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.43965602, g: 0.48805714, b: 0.5682822, a: 1}
m_IndirectSpecularColor: {r: 0.43965653, g: 0.48805767, b: 0.5682828, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -2669,6 +2669,90 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 39832811}
m_Mesh: {fileID: 1716789804}
--- !u!1001 &46419576
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5765396706313039230, guid: ef7be189413111e4b974eaf395cde588,
type: 3}
propertyPath: m_LocalPosition.x
value: 14.76
objectReference: {fileID: 0}
- target: {fileID: 5765396706313039230, guid: ef7be189413111e4b974eaf395cde588,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.52
objectReference: {fileID: 0}
- target: {fileID: 5765396706313039230, guid: ef7be189413111e4b974eaf395cde588,
type: 3}
propertyPath: m_LocalPosition.z
value: -1.02
objectReference: {fileID: 0}
- target: {fileID: 5765396706313039230, guid: ef7be189413111e4b974eaf395cde588,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5765396706313039230, guid: ef7be189413111e4b974eaf395cde588,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5765396706313039230, guid: ef7be189413111e4b974eaf395cde588,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5765396706313039230, guid: ef7be189413111e4b974eaf395cde588,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5765396706313039230, guid: ef7be189413111e4b974eaf395cde588,
type: 3}
propertyPath: m_RootOrder
value: 23
objectReference: {fileID: 0}
- target: {fileID: 5765396706313039230, guid: ef7be189413111e4b974eaf395cde588,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5765396706313039230, guid: ef7be189413111e4b974eaf395cde588,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5765396706313039230, guid: ef7be189413111e4b974eaf395cde588,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5765396706313039230, guid: ef7be189413111e4b974eaf395cde588,
type: 3}
propertyPath: m_LocalScale.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5765396706313039230, guid: ef7be189413111e4b974eaf395cde588,
type: 3}
propertyPath: m_LocalScale.y
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5765396706313039230, guid: ef7be189413111e4b974eaf395cde588,
type: 3}
propertyPath: m_LocalScale.z
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5765396706313039231, guid: ef7be189413111e4b974eaf395cde588,
type: 3}
propertyPath: m_Name
value: Props3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ef7be189413111e4b974eaf395cde588, type: 3}
--- !u!1 &50870407
GameObject:
m_ObjectHideFlags: 0
......@@ -57347,75 +57431,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1282103257}
m_Mesh: {fileID: 43579514553638724, guid: 297fb281d5890b8478cf5828f2b01ad2, type: 2}
--- !u!1001 &1282118768
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3451800651537292260, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_Name
value: Level8
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_RootOrder
value: 20
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 31f084bd887ce134099cf3e3a2d8fdfe, type: 3}
--- !u!1 &1283929836
GameObject:
m_ObjectHideFlags: 0
......@@ -69240,6 +69255,75 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1525888130}
m_Mesh: {fileID: 1722133876}
--- !u!1001 &1533151463
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5442833753317127627, guid: e0ab4bcfef0648e4a9a08c17dbc1316c,
type: 3}
propertyPath: m_Name
value: Props3Parent
objectReference: {fileID: 0}
- target: {fileID: 7976174714960084501, guid: e0ab4bcfef0648e4a9a08c17dbc1316c,
type: 3}
propertyPath: m_LocalPosition.x
value: 15.24
objectReference: {fileID: 0}
- target: {fileID: 7976174714960084501, guid: e0ab4bcfef0648e4a9a08c17dbc1316c,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.8
objectReference: {fileID: 0}
- target: {fileID: 7976174714960084501, guid: e0ab4bcfef0648e4a9a08c17dbc1316c,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.82
objectReference: {fileID: 0}
- target: {fileID: 7976174714960084501, guid: e0ab4bcfef0648e4a9a08c17dbc1316c,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7976174714960084501, guid: e0ab4bcfef0648e4a9a08c17dbc1316c,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7976174714960084501, guid: e0ab4bcfef0648e4a9a08c17dbc1316c,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 7976174714960084501, guid: e0ab4bcfef0648e4a9a08c17dbc1316c,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7976174714960084501, guid: e0ab4bcfef0648e4a9a08c17dbc1316c,
type: 3}
propertyPath: m_RootOrder
value: 22
objectReference: {fileID: 0}
- target: {fileID: 7976174714960084501, guid: e0ab4bcfef0648e4a9a08c17dbc1316c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7976174714960084501, guid: e0ab4bcfef0648e4a9a08c17dbc1316c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7976174714960084501, guid: e0ab4bcfef0648e4a9a08c17dbc1316c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e0ab4bcfef0648e4a9a08c17dbc1316c, type: 3}
--- !u!1 &1534144514
GameObject:
m_ObjectHideFlags: 0
......@@ -102709,6 +102793,75 @@ Transform:
m_Father: {fileID: 1844020788844769042}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!1001 &2194716044469897680
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3451800651537292260, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_Name
value: Level8
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_RootOrder
value: 20
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3451800651537292263, guid: 31f084bd887ce134099cf3e3a2d8fdfe,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 31f084bd887ce134099cf3e3a2d8fdfe, type: 3}
--- !u!1 &2198141025577438073
GameObject:
m_ObjectHideFlags: 0
BoomMaster/Assets/#C2_Animations/Porps3_Attack.anim
View file @ dd6f256d
......@@ -55,9 +55,9 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.56666666
value: {x: 73.971, y: -73.97, z: 5.9830003}
inSlope: {x: -58.95533, y: 0, z: -42.23295}
outSlope: {x: -58.95533, y: 0, z: -42.23295}
value: {x: 73.971, y: -73.97, z: 7.0390005}
inSlope: {x: -58.95533, y: 0, z: -49.68707}
outSlope: {x: -58.95533, y: 0, z: -49.68707}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
......@@ -75,7 +75,41 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_PositionCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.33333334
value: {x: -3.69, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_ScaleCurves:
- curve:
serializedVersion: 2
......@@ -138,6 +172,13 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 4
......@@ -343,9 +384,9 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.56666666
value: 5.9830003
inSlope: -42.23295
outSlope: -42.23295
value: 7.0390005
inSlope: -49.68707
outSlope: -49.68707
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
......@@ -531,6 +572,117 @@ AnimationClip:
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: -3.69
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.33333334
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
......
BoomMaster/Assets/#C2_Animations/Porps3_Idle.anim
View file @ dd6f256d
......@@ -39,7 +39,41 @@ AnimationClip:
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_PositionCurves: []
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: -0.52, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.51666665
value: {x: 0, y: -0.65, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 1
value: {x: 0, y: -0.52, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_ScaleCurves:
- curve:
serializedVersion: 2
......@@ -75,6 +109,13 @@ AnimationClip:
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
- serializedVersion: 2
path: 0
attribute: 4
......@@ -279,6 +320,43 @@ AnimationClip:
path:
classID: 4
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.52
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.51666665
value: -0.65
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: -0.52
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path:
classID: 4
script: {fileID: 0}
m_EulerEditorCurves:
- curve:
serializedVersion: 2
......
BoomMaster/Assets/#C2_Animations/Props3.controller
View file @ dd6f256d
......@@ -11,7 +11,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 4979349218807356032}
m_Position: {x: 270, y: 90, z: 0}
m_Position: {x: 270, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: 1249685987117816153}
m_Position: {x: 260, y: 220, z: 0}
......@@ -64,7 +64,7 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
......
BoomMaster/Assets/Res/Prefabs/Levels/Level8.prefab
View file @ dd6f256d
This source diff could not be displayed because it is too large. You can view the blob instead.
BoomMaster/Assets/Res/Prefabs/Levels/Level9.prefab
View file @ dd6f256d
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
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