Merge branch 'fix/arrow-trap-scale' into 'main'

Fix/arrow trap scale

See merge request kernel-panic/revival!87
This commit is contained in:
Cat Flynn 2021-05-12 13:49:44 +00:00
commit 3b81ef62aa
9 changed files with 3811 additions and 617 deletions

BIN
game/Assets/3D Assets/TRAPS/simplarrow.fbx (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,102 @@
fileFormatVersion: 2
guid: 7c6beae261940bf4d841149e72b8dca1
ModelImporter:
serializedVersion: 20200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 10
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 0.099999994
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -2224,6 +2224,7 @@ Transform:
- {fileID: 7537993601227460088}
- {fileID: 8337625530736280110}
- {fileID: 3812746617565256764}
- {fileID: 4518148453861701402}
m_Father: {fileID: 3735992581812067225}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2953,6 +2954,19 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &4665046824083547391
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3888964622569991584}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 0
serializedVersion: 2
m_Size: {x: 0.0099956095, y: 0.04649781, z: 0.010708005}
m_Center: {x: 0.0020173425, y: 0.023248905, z: -0.0053540035}
--- !u!65 &260044845052097733
BoxCollider:
m_ObjectHideFlags: 0
@ -5073,16 +5087,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!4 &389812872219035097 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 207831614439350834}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1018715190143606627 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 207831614439350834}
m_PrefabAsset: {fileID: 0}
--- !u!4 &389812872219035097 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 207831614439350834}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &263653311527926211
PrefabInstance:
m_ObjectHideFlags: 0
@ -5313,16 +5327,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!1 &706506112105402413 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 364626923179109756}
m_PrefabAsset: {fileID: 0}
--- !u!4 &181783615856642711 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 364626923179109756}
m_PrefabAsset: {fileID: 0}
--- !u!1 &706506112105402413 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 364626923179109756}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &505333310098796162
PrefabInstance:
m_ObjectHideFlags: 0
@ -5396,16 +5410,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!1 &847279426559366099 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 505333310098796162}
m_PrefabAsset: {fileID: 0}
--- !u!4 &38830948155984233 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 505333310098796162}
m_PrefabAsset: {fileID: 0}
--- !u!1 &847279426559366099 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 505333310098796162}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &572670284588375842
PrefabInstance:
m_ObjectHideFlags: 0
@ -6610,16 +6624,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!4 &1429641547351363788 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 1467507263944652583}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1773516401063283318 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 1467507263944652583}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1429641547351363788 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 1467507263944652583}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1653631852884122384
PrefabInstance:
m_ObjectHideFlags: 0
@ -7200,16 +7214,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!4 &2195944210748949396 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 1869898595167708287}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1527387731443063086 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 1869898595167708287}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2195944210748949396 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 1869898595167708287}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1959016249829456973
PrefabInstance:
m_ObjectHideFlags: 0
@ -7279,16 +7293,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3}
--- !u!1 &1724521554445877532 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3}
m_PrefabInstance: {fileID: 1959016249829456973}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2064174318202395558 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3}
m_PrefabInstance: {fileID: 1959016249829456973}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1724521554445877532 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3}
m_PrefabInstance: {fileID: 1959016249829456973}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2057536472493637327
PrefabInstance:
m_ObjectHideFlags: 0
@ -8256,16 +8270,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!4 &2765842944036326594 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 2443351221607803689}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3254395180114908792 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 2443351221607803689}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2765842944036326594 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 2443351221607803689}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2443612431070454336
PrefabInstance:
m_ObjectHideFlags: 0
@ -9115,16 +9129,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!4 &3282472559101062540 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 3028413583014939239}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2794061125138773814 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 3028413583014939239}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3282472559101062540 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 3028413583014939239}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3059435887425425800
PrefabInstance:
m_ObjectHideFlags: 0
@ -10240,7 +10254,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8768409224895496785, guid: 55fadb9f11c9ea74fb586631ce45bd14, type: 3}
propertyPath: m_LocalPosition.z
value: 0.87
value: 1.081
objectReference: {fileID: 0}
- target: {fileID: 8768409224895496785, guid: 55fadb9f11c9ea74fb586631ce45bd14, type: 3}
propertyPath: m_LocalRotation.w
@ -11937,16 +11951,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!4 &4553995037394627223 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 4087495115800644988}
m_PrefabAsset: {fileID: 0}
--- !u!1 &3781012643087396909 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 4087495115800644988}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4553995037394627223 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 4087495115800644988}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4120233452646101777
PrefabInstance:
m_ObjectHideFlags: 0
@ -12021,6 +12035,89 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f73d020fede261d4bac919488c8a778d, type: 3}
m_PrefabInstance: {fileID: 4120233452646101777}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4123337284107194609
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 3735992582968959505}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
propertyPath: m_RootOrder
value: 150
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
propertyPath: m_LocalScale.x
value: -5.8822923
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
propertyPath: m_LocalScale.y
value: 69.2738
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
propertyPath: m_LocalScale.z
value: 373.55234
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
propertyPath: m_LocalPosition.x
value: 2.732
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
propertyPath: m_LocalPosition.y
value: 18.171
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
propertyPath: m_LocalPosition.z
value: 0.095
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
propertyPath: m_LocalRotation.w
value: 0.00000018372522
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
propertyPath: m_LocalRotation.x
value: 0.5009355
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
propertyPath: m_LocalRotation.y
value: 0.00000010576537
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
propertyPath: m_LocalRotation.z
value: -0.8654846
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -180
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 119.876
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 22a733893c7f0bc48b61d6a462964442, type: 2}
- target: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
propertyPath: m_Name
value: Wall_A (242)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!1 &3888964622569991584 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 4123337284107194609}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4518148453861701402 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 4123337284107194609}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4141935737782562248
PrefabInstance:
m_ObjectHideFlags: 0
@ -12897,16 +12994,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!1 &5578870907654092324 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 4732518333452553077}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5055274247170813086 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 4732518333452553077}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5578870907654092324 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 4732518333452553077}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4733362998894895998
PrefabInstance:
m_ObjectHideFlags: 0
@ -13646,16 +13743,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!1 &4905508969338062923 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 5247458530229646618}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5717335972078883569 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 5247458530229646618}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4905508969338062923 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 5247458530229646618}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5286224148450983570
PrefabInstance:
m_ObjectHideFlags: 0
@ -13729,16 +13826,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!1 &5016193095525336003 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 5286224148450983570}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5680949701306636665 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 5286224148450983570}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5016193095525336003 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 5286224148450983570}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5351621157055183058
PrefabInstance:
m_ObjectHideFlags: 0
@ -14052,16 +14149,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!1 &4638220899602708781 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 5521180616085832828}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5410395427997279127 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 5521180616085832828}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4638220899602708781 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 5521180616085832828}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5578011621029874035
PrefabInstance:
m_ObjectHideFlags: 0
@ -14564,16 +14661,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!4 &5980068795569254619 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 6158603907232749360}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6464539369691540065 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 6158603907232749360}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5980068795569254619 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 6158603907232749360}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6170408950410720396
PrefabInstance:
m_ObjectHideFlags: 0
@ -15091,16 +15188,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!4 &6545985007328021179 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 6724643712362392912}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5878272844686790657 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 6724643712362392912}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6545985007328021179 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 6724643712362392912}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6808361302215918571
PrefabInstance:
m_ObjectHideFlags: 0
@ -15322,16 +15419,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!1 &5992147902236877187 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 6911067288374566098}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6369130459537750841 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 6911067288374566098}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5992147902236877187 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 6911067288374566098}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6947359978250633159
PrefabInstance:
m_ObjectHideFlags: 0
@ -16069,16 +16166,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!4 &7271432892574190268 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 7161823803226762583}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8044133842556653574 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 7161823803226762583}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7271432892574190268 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 7161823803226762583}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7223765156567938848
PrefabInstance:
m_ObjectHideFlags: 0
@ -17130,16 +17227,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!1 &6983986964261573511 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 7795012930076421846}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7757392671138990397 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 7795012930076421846}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6983986964261573511 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 7795012930076421846}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7795899876547246621
PrefabInstance:
m_ObjectHideFlags: 0
@ -17440,16 +17537,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!4 &7649777915534107928 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 7900370405481022195}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7017356812793528226 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 7900370405481022195}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7649777915534107928 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 7900370405481022195}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7919690513787949503
PrefabInstance:
m_ObjectHideFlags: 0
@ -18487,16 +18584,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!4 &9191870937324020927 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 8654419401821520724}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8420540833322712581 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 8654419401821520724}
m_PrefabAsset: {fileID: 0}
--- !u!4 &9191870937324020927 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 8654419401821520724}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8688450194702412261
PrefabInstance:
m_ObjectHideFlags: 0
@ -18884,16 +18981,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
--- !u!4 &8942201324196993924 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 8904651947722112111}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8598150234762789182 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 8904651947722112111}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8942201324196993924 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e20114b5c13a067488940c5cc8e13b60, type: 3}
m_PrefabInstance: {fileID: 8904651947722112111}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8940518268771904850
PrefabInstance:
m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: addbcdcfabe760b43859bd23019c97e5
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -396,6 +396,14 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3921543470788661068, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
propertyPath: m_LocalPosition.x
value: -1.332
objectReference: {fileID: 0}
- target: {fileID: 3921543470788661068, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4200954845503136239, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
propertyPath: m_RootOrder
value: 146
@ -500,6 +508,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 25.108
objectReference: {fileID: 0}
- target: {fileID: 6378903312458380931, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
propertyPath: m_LocalScale.x
value: 2.482082
objectReference: {fileID: 0}
- target: {fileID: 6417349562068914581, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
propertyPath: m_RootOrder
value: 153

View File

@ -223,6 +223,18 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 212376063282797762, guid: b359f8f07dc0cc84d9caa48d6aaac4b6, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 212376063282797762, guid: b359f8f07dc0cc84d9caa48d6aaac4b6, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 212376063282797762, guid: b359f8f07dc0cc84d9caa48d6aaac4b6, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 785084129938486692, guid: b359f8f07dc0cc84d9caa48d6aaac4b6, type: 3}
propertyPath: m_IsActive
value: 1
@ -365,48 +377,60 @@ PrefabInstance:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7073223
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.17980677
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.6679428
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: -0.14566113
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.6712961
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.030941222
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.73815805
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.059387997
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0.3776703
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: 0.25224686
value: -0.4675026
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: -2.720001
value: -0.014760256
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: 0.9724168
value: -0.21575788
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.22955652
value: 0.0012456367
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.040237267
value: 0.9764299
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: -0.009498731
value: 0.0056372304
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_Name
@ -458,39 +482,43 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: -0.0143024465
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: -0.44891226
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: -0.016304847
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7215616
value: -0.82848763
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.10947207
value: -0.14275612
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.67901915
value: 0.5364758
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: -0.079358906
value: -0.0736388
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: 0.3776703
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: -0.4675026
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: -2.720001
value: -0.014760256
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
@ -510,19 +538,47 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: 0.6793248
value: -0.8249521
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.1726896
value: -0.009353599
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.6968519
value: 0.5649772
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: -0.15196545
value: 0.012931396
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0.3776703
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: -0.4675026
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: -0.014760256
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.21575788
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.0012456367
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.9764299
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.0056372304
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}