Commit cb736f37 authored by wanqing's avatar wanqing

修改场景预制体

parent ba059853
...@@ -51,10 +51,14 @@ public class GlobalConfig ...@@ -51,10 +51,14 @@ public class GlobalConfig
num = 4; num = 4;
} }
else if (varLevel == LevelEnum.levelSixIndex || varLevel == LevelEnum.levelSevenIndex else if (varLevel == LevelEnum.levelSixIndex || varLevel == LevelEnum.levelSevenIndex
|| varLevel == LevelEnum.levelEightIndex || varLevel == LevelEnum.levelNineIndex) || varLevel == LevelEnum.levelEightIndex)
{ {
num = 6; num = 6;
} }
else if(varLevel == LevelEnum.levelNineIndex)
{
num = 5;
}
return num; return num;
} }
//通过当前关卡返回盒子高度 //通过当前关卡返回盒子高度
......
...@@ -31,7 +31,7 @@ ModelImporter: ...@@ -31,7 +31,7 @@ ModelImporter:
extraExposedTransformPaths: [] extraExposedTransformPaths: []
extraUserProperties: [] extraUserProperties: []
clipAnimations: [] clipAnimations: []
isReadable: 0 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: 1 globalScale: 1
......
...@@ -4904,7 +4904,7 @@ Rigidbody: ...@@ -4904,7 +4904,7 @@ Rigidbody:
m_Interpolate: 0 m_Interpolate: 0
m_Constraints: 0 m_Constraints: 0
m_CollisionDetection: 0 m_CollisionDetection: 0
--- !u!65 &1885665398186280252 --- !u!65 &293448964352072782
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -4915,9 +4915,9 @@ BoxCollider: ...@@ -4915,9 +4915,9 @@ BoxCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 0.9989025, y: 0.82183737, z: 1.9252231} m_Size: {x: 0.9989025, y: 1.9420743, z: 0.9887016}
m_Center: {x: -0.00000013059116, y: 0.5221656, z: 0.5368396} m_Center: {x: -0.00000019373749, y: -0.027874129, z: 1.0051005}
--- !u!65 &293448964352072782 --- !u!65 &1885665398186280252
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
...@@ -4928,8 +4928,8 @@ BoxCollider: ...@@ -4928,8 +4928,8 @@ BoxCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 0.9989025, y: 1.9420743, z: 0.9887016} m_Size: {x: 0.9989025, y: 0.82183737, z: 1.9252231}
m_Center: {x: -0.00000019373749, y: -0.027874129, z: 1.0051005} m_Center: {x: -0.00000013059116, y: 0.5221656, z: 0.5368396}
--- !u!1 &1024120038621772286 --- !u!1 &1024120038621772286
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -50684,20 +50684,8 @@ Rigidbody: ...@@ -50684,20 +50684,8 @@ Rigidbody:
m_Interpolate: 0 m_Interpolate: 0
m_Constraints: 112 m_Constraints: 112
m_CollisionDetection: 3 m_CollisionDetection: 3
--- !u!114 &5773235011476033957 --- !u!64 &4048414559974033003
MonoBehaviour: MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3150740576833673954}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!65 &395232932989836511
BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
...@@ -50706,22 +50694,22 @@ BoxCollider: ...@@ -50706,22 +50694,22 @@ BoxCollider:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 4
m_Size: {x: 0.9994513, y: 0.9411861, z: 1.9953508} m_Convex: 1
m_Center: {x: 0.00027452907, y: -0.52885777, z: -0.501236} m_CookingOptions: 30
--- !u!65 &1597897419340932125 m_Mesh: {fileID: -3762033253158803613, guid: ca98f1c956b47fa4baeaa0f18403194c, type: 3}
BoxCollider: --- !u!114 &5773235011476033957
MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3150740576833673954} m_GameObject: {fileID: 3150740576833673954}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 m_EditorHideFlags: 0
m_Size: {x: 0.9994513, y: 0.99407864, z: 1.9389333} m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3}
m_Center: {x: 0.00027452904, y: 0.5024115, z: 0.49534658} m_Name:
m_EditorClassIdentifier:
--- !u!1 &3159638510092659113 --- !u!1 &3159638510092659113
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -51166,20 +51154,8 @@ Rigidbody: ...@@ -51166,20 +51154,8 @@ Rigidbody:
m_Interpolate: 0 m_Interpolate: 0
m_Constraints: 112 m_Constraints: 112
m_CollisionDetection: 3 m_CollisionDetection: 3
--- !u!114 &5599684638181743838 --- !u!64 &7055638506804243532
MonoBehaviour: MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3357986293201791622}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!65 &5306958602857001300
BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
...@@ -51188,22 +51164,22 @@ BoxCollider: ...@@ -51188,22 +51164,22 @@ BoxCollider:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 4
m_Size: {x: 0.99945086, y: 0.9693932, z: 1.9767764} m_Convex: 1
m_Center: {x: 0.00027452898, y: -0.5147556, z: -0.51052487} m_CookingOptions: 30
--- !u!65 &4527768936770319164 m_Mesh: {fileID: -3762033253158803613, guid: ca98f1c956b47fa4baeaa0f18403194c, type: 3}
BoxCollider: --- !u!114 &5599684638181743838
MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3357986293201791622} m_GameObject: {fileID: 3357986293201791622}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 m_EditorHideFlags: 0
m_Size: {x: 0.99945086, y: 1.0026494, z: 1.9967017} m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3}
m_Center: {x: 0.00027452898, y: 0.4981277, z: 0.5005624} m_Name:
m_EditorClassIdentifier:
--- !u!54 &2544683003701323312 --- !u!54 &2544683003701323312
Rigidbody: Rigidbody:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -94227,7 +94203,7 @@ MonoBehaviour: ...@@ -94227,7 +94203,7 @@ MonoBehaviour:
ModeOverride: 0 ModeOverride: 0
LensShift: {x: 0, y: 0} LensShift: {x: 0, y: 0}
GateFit: 2 GateFit: 2
m_SensorSize: {x: 0.8, y: 1} m_SensorSize: {x: 0.5625, y: 1}
m_Transitions: m_Transitions:
m_BlendHint: 0 m_BlendHint: 0
m_InheritPosition: 0 m_InheritPosition: 0
...@@ -190186,21 +190162,8 @@ MonoBehaviour: ...@@ -190186,21 +190162,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3} m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!65 &7709168792941174326 --- !u!64 &6776786757161148145
BoxCollider: MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8667816101904303460}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.9989018, y: 1.9983622, z: 0.9379653}
m_Center: {x: 0, y: 0.00026982118, z: 1.0304677}
--- !u!65 &5609358562502136050
BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
...@@ -190209,9 +190172,10 @@ BoxCollider: ...@@ -190209,9 +190172,10 @@ BoxCollider:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 4
m_Size: {x: 0.9989018, y: 0.9152528, z: 2.9088652} m_Convex: 1
m_Center: {x: 0, y: 0.493292, z: 0.005644321} m_CookingOptions: 30
m_Mesh: {fileID: -8115195092956357391, guid: e5b826e8cccdcb44ba8f973963955bd0, type: 3}
--- !u!1 &8704944201271449672 --- !u!1 &8704944201271449672
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -213953,18 +213917,18 @@ PrefabInstance: ...@@ -213953,18 +213917,18 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 74345e650be006046bdb1823b5713571, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 74345e650be006046bdb1823b5713571, type: 3}
--- !u!1 &8328758332286512928 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 74345e650be006046bdb1823b5713571,
type: 3}
m_PrefabInstance: {fileID: 50767223015110185}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5030213245719665971 stripped --- !u!4 &5030213245719665971 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 74345e650be006046bdb1823b5713571, m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 74345e650be006046bdb1823b5713571,
type: 3} type: 3}
m_PrefabInstance: {fileID: 50767223015110185} m_PrefabInstance: {fileID: 50767223015110185}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &8328758332286512928 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 74345e650be006046bdb1823b5713571,
type: 3}
m_PrefabInstance: {fileID: 50767223015110185}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &822938018257411181 --- !u!1001 &822938018257411181
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -214240,18 +214204,18 @@ PrefabInstance: ...@@ -214240,18 +214204,18 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 74345e650be006046bdb1823b5713571, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 74345e650be006046bdb1823b5713571, type: 3}
--- !u!4 &438863537908981111 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 74345e650be006046bdb1823b5713571,
type: 3}
m_PrefabInstance: {fileID: 4858712052454536813}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3480281719858884452 stripped --- !u!1 &3480281719858884452 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 74345e650be006046bdb1823b5713571, m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 74345e650be006046bdb1823b5713571,
type: 3} type: 3}
m_PrefabInstance: {fileID: 4858712052454536813} m_PrefabInstance: {fileID: 4858712052454536813}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!4 &438863537908981111 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 74345e650be006046bdb1823b5713571,
type: 3}
m_PrefabInstance: {fileID: 4858712052454536813}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6383923708454224875 --- !u!1001 &6383923708454224875
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -214452,18 +214416,18 @@ PrefabInstance: ...@@ -214452,18 +214416,18 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8a628f088386abc49b86747b337f3393, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 8a628f088386abc49b86747b337f3393, type: 3}
--- !u!4 &1845198702332928302 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 8a628f088386abc49b86747b337f3393,
type: 3}
m_PrefabInstance: {fileID: 6692844646995413556}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3440802519935488829 stripped --- !u!1 &3440802519935488829 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 8a628f088386abc49b86747b337f3393, m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 8a628f088386abc49b86747b337f3393,
type: 3} type: 3}
m_PrefabInstance: {fileID: 6692844646995413556} m_PrefabInstance: {fileID: 6692844646995413556}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!4 &1845198702332928302 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 8a628f088386abc49b86747b337f3393,
type: 3}
m_PrefabInstance: {fileID: 6692844646995413556}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6753178051370234767 --- !u!1001 &6753178051370234767
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -114343,6 +114343,11 @@ PrefabInstance: ...@@ -114343,6 +114343,11 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: SM_PROP_food_sausage_01 value: SM_PROP_food_sausage_01
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: ea37fe222b889bb4592140b1796846d7,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ea37fe222b889bb4592140b1796846d7, type: 3} m_SourcePrefab: {fileID: 100100000, guid: ea37fe222b889bb4592140b1796846d7, type: 3}
--- !u!4 &834074545980664983 stripped --- !u!4 &834074545980664983 stripped
...@@ -114367,12 +114372,12 @@ PrefabInstance: ...@@ -114367,12 +114372,12 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: deefe880c75e0414fa3af6671d4ed142, - target: {fileID: -4216859302048453862, guid: deefe880c75e0414fa3af6671d4ed142,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -0.08 value: -0.98
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: deefe880c75e0414fa3af6671d4ed142, - target: {fileID: -4216859302048453862, guid: deefe880c75e0414fa3af6671d4ed142,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 1.1 value: 0.1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: deefe880c75e0414fa3af6671d4ed142, - target: {fileID: -4216859302048453862, guid: deefe880c75e0414fa3af6671d4ed142,
type: 3} type: 3}
...@@ -114737,6 +114742,11 @@ PrefabInstance: ...@@ -114737,6 +114742,11 @@ PrefabInstance:
propertyPath: m_TagString propertyPath: m_TagString
value: Target value: Target
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: c25cd00dc29de5245a5697723b2b2051,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c25cd00dc29de5245a5697723b2b2051, type: 3} m_SourcePrefab: {fileID: 100100000, guid: c25cd00dc29de5245a5697723b2b2051, type: 3}
--- !u!1 &1005501633206904774 stripped --- !u!1 &1005501633206904774 stripped
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