Merge remote-tracking branch 'origin/YuYang'

# Conflicts:
#	SteelBall/Assets/Res/Prefabs/Levels/Level05.prefab

SteelBall/Assets/0A3_Prefabs/Cube_root.prefab.meta

+fileFormatVersion: 2
+guid: fb7700af962f30f43b631f395ded8d4c
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SteelBall/Assets/0C1_Models/Cube.meta

+fileFormatVersion: 2
+guid: a794e39a2487e404ba488025ff3687ed
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SteelBall/Assets/0C1_Models/Cube/Cube_frags.asset.meta

+fileFormatVersion: 2
+guid: 3ffc7c4f5098fb74eac859a56ca60b7b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SteelBall/Assets/Res/Prefabs/Levels/Level04.prefab

@@ -197,7 +197,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4681400716611840026
 Transform:
   m_ObjectHideFlags: 0
@@ -345,7 +345,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4681400717236029440
 Transform:
   m_ObjectHideFlags: 0
@@ -449,6 +449,7 @@ GameObject:
   - component: {fileID: 4681400717269551358}
   - component: {fileID: 4681400717269551359}
   - component: {fileID: 4681400717269551356}
+  - component: {fileID: 1211555375}
   m_Layer: 0
   m_Name: Cube (92)
   m_TagString: Untagged
@@ -464,8 +465,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4681400717269551354}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.075, y: 0.075, z: 0.445}
-  m_LocalScale: {x: 0.4, y: 0.4, z: 1.5}
+  m_LocalPosition: {x: 0.2, y: 0.76351, z: 0.418}
+  m_LocalScale: {x: 0.21256001, y: 1.7770101, z: 1.5}
   m_Children: []
   m_Father: {fileID: 4681400716781441395}
   m_RootOrder: 7
@@ -538,7 +539,7 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4681400717269551354}
   serializedVersion: 2
-  m_Mass: 0.005
+  m_Mass: 1
   m_Drag: 0
   m_AngularDrag: 0.05
   m_UseGravity: 1
@@ -546,6 +547,172 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
+--- !u!114 &1211555375
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4681400717269551354}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: eb6e52f37bca2404fac00b69fd8d21f8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  initialization: 1
+  initialized: 0
+  simulationType: 1
+  objectType: 0
+  demolitionType: 3
+  physics:
+    materialType: 4
+    material: {fileID: 0}
+    massBy: 0
+    mass: 1
+    colliderType: 0
+    useGravity: 1
+    dampening: 0.8
+    recorder: 0
+    exclude: 0
+    destructible: 0
+    materialSolidity: 1
+    rotation: {x: 0, y: 0, z: 0, w: 1}
+    position: {x: 0, y: 0, z: 0}
+    velocity: {x: 0, y: 0, z: 0}
+    initScale: {x: 1, y: 1, z: 1}
+    initPosition: {x: 0, y: 0, z: 0}
+    initRotation: {x: 0, y: 0, z: 0, w: 1}
+    rigidBody: {fileID: 0}
+    meshCollider: {fileID: 0}
+    clusterColliders: []
+  activation:
+    byVelocity: 0
+    byOffset: 0
+    byDamage: 0
+    byActivator: 0
+    byImpact: 0
+    byConnectivity: 0
+    unyielding: 0
+    activated: 0
+  restriction:
+    enable: 0
+    breakAction: 9
+    actionDelay: 0
+    checkInterval: 5
+    distance: 30
+    position: 0
+    target: {fileID: 0}
+    collider: {fileID: 0}
+    region: 0
+    broke: 0
+  limitations:
+    solidity: 0.1
+    depth: 1
+    time: 0.2
+    size: 0.1
+    sliceByBlade: 0
+    slicePlanes: []
+    contactPoint: {x: 0, y: 0, z: 0}
+    demolitionShould: 0
+    demolished: 0
+    birthTime: 0
+    bboxSize: 0
+    currentDepth: 0
+    bound:
+      m_Center: {x: 0, y: 0, z: 0}
+      m_Extent: {x: 0, y: 0, z: 0}
+    ancestor: {fileID: 0}
+    descendants: []
+  meshDemolition:
+    amount: 30
+    variation: 0
+    depthFade: 0.5
+    contactBias: 0
+    seed: 1
+    useShatter: 0
+    meshInput: 9
+    properties:
+      colliderType: 0
+      sizeFilter: 0
+      decompose: 0
+      removeCollinear: 1
+      layer: 
+    runtimeCaching:
+      type: 0
+      frames: 3
+      fragments: 4
+      skipFirstDemolition: 0
+      inProgress: 0
+      wasUsed: 0
+      stop: 0
+    badMesh: 0
+    shatterMode: 1
+    totalAmount: 0
+    innerSubId: 0
+    compressPrefab: 1
+    cacheRotationStart: {x: 0, y: 0, z: 0, w: 1}
+    mesh: {fileID: 0}
+    scrShatter: {fileID: 0}
+  clusterDemolition:
+    meshDemolition: 0
+    connectivity: 0
+    contactRadius: 15
+    cluster:
+      id: 0
+      tm: {fileID: 0}
+      rootParent: {fileID: 0}
+      depth: 0
+    damageRadius: 0
+  referenceDemolition:
+    reference: {fileID: 0}
+    randomList: []
+    addRigid: 1
+  materials:
+    innerMaterial: {fileID: 0}
+    mappingScale: 0.1
+    outerMaterial: {fileID: 0}
+    needNewMat: 0
+  damage:
+    enable: 0
+    maxDamage: 100
+    currentDamage: 0
+    collect: 0
+    multiplier: 1
+  fading:
+    onDemolition: 1
+    onActivation: 1
+    lifeType: 4
+    lifeTime: 2
+    lifeVariation: 0
+    fadeType: 3
+    fadeTime: 1
+    sizeFilter: 0
+    state: 0
+    stop: 0
+    position: {x: 0, y: 0, z: 0}
+  reset:
+    transform: 1
+    damage: 1
+    action: 0
+    destroyDelay: 1
+    mesh: 4
+    fragments: 0
+    toBeDestroyed: 0
+    counter: 0
+  meshes: []
+  pivots: []
+  rfMeshes: []
+  subIds: []
+  fragments: []
+  cacheRotation: {x: 0, y: 0, z: 0, w: 0}
+  transForm: {fileID: 0}
+  rootChild: {fileID: 0}
+  rootParent: {fileID: 0}
+  meshFilter: {fileID: 0}
+  meshRenderer: {fileID: 0}
+  skinnedMeshRend: {fileID: 0}
+  debrisList: []
+  dustList: []
 --- !u!1 &4681400717455122977
 GameObject:
   m_ObjectHideFlags: 0
@@ -565,7 +732,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4681400717455122976
 Transform:
   m_ObjectHideFlags: 0
@@ -754,7 +921,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4681400718127583989
 Transform:
   m_ObjectHideFlags: 0
@@ -864,7 +1031,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4681400718181783775
 Transform:
   m_ObjectHideFlags: 0
@@ -974,7 +1141,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &4681400718266396764
 Transform:
   m_ObjectHideFlags: 0
@@ -2666,7 +2833,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &7421100814882302376
 Transform:
   m_ObjectHideFlags: 0