Reset packages to initial state to fix Tower Defence Turrets plugin

This commit is contained in:
Hurlu 2019-05-15 17:54:56 +09:00
parent 37002fe7e6
commit 2e71a2aff4
29 changed files with 507 additions and 2964 deletions

View File

@ -1,155 +0,0 @@
fileFormatVersion: 2
guid: 12dd80afd8659f84fb96311d7eb46ea1
ModelImporter:
serializedVersion: 23
fileIDToRecycleName:
100000: backlight
100002: body
100004: Car
100006: front_fender
100008: headlight
100010: lattice_1
100012: lights
100014: //RootNode
100016: platform
100018: rear_fender
100020: wheel1_1
100022: wheel_1
400000: backlight
400002: body
400004: Car
400006: front_fender
400008: headlight
400010: lattice_1
400012: lights
400014: //RootNode
400016: platform
400018: rear_fender
400020: wheel1_1
400022: wheel_1
2100000: Platform
2100002: car_body_1
2100004: wheels
2100006: car_body
2100008: glass
2100010: engine_grille
2100012: rear_lights
2100014: headlight
2300000: backlight
2300002: body
2300004: front_fender
2300006: headlight
2300008: lattice_1
2300010: platform
2300012: rear_fender
2300014: wheel1_1
2300016: wheel_1
2300018: //RootNode
3300000: backlight
3300002: body
3300004: front_fender
3300006: headlight
3300008: lattice_1
3300010: platform
3300012: rear_fender
3300014: wheel1_1
3300016: wheel_1
3300018: //RootNode
4300000: platform
4300002: wheel1_1
4300004: wheel_1
4300006: body
4300008: front_fender
4300010: rear_fender
4300012: lattice_1
4300014: backlight
4300016: headlight
7400000: Default Take
9500000: //RootNode
2186277476908879412: ImportLogs
externalObjects: {}
materials:
importMaterials: 1
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: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2
humanoidOversampling: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:73f30e4bdea5de1180722029149177d7c97f061aeb36dc7f1a626f24c8d32fd0 oid sha256:6af8463c246acd3a42aeb7f6885b6caa5b4e76db173b29ff0335b90210ef640c
size 817664 size 1350656

View File

@ -1,9 +1,8 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 409061a2e8974384988997c38739068e guid: 409061a2e8974384988997c38739068e
folderAsset: yes folderAsset: yes
timeCreated: 1483279444
licenseType: Store
DefaultImporter: DefaultImporter:
externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: a9be9abf31b080144a122df0cdd0a647
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,24 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 534831cd8970b4d44a0b9b0c1b40dcf2 guid: 534831cd8970b4d44a0b9b0c1b40dcf2
=======
guid: 41114f56c5f3b4847be6e9456f33fd0b
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels:
- Gun
- gatling
- machinegun
- tower
- turret
<<<<<<< HEAD
ModelImporter: ModelImporter:
serializedVersion: 23 serializedVersion: 23
=======
timeCreated: 1483280626
licenseType: Store
ModelImporter:
serializedVersion: 19
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
fileIDToRecycleName: fileIDToRecycleName:
100000: Basic1_gun 100000: Basic1_gun
100002: Basic1_turretLower 100002: Basic1_turretLower
@ -30,6 +13,7 @@ ModelImporter:
400004: Basic1_turretTop 400004: Basic1_turretTop
400006: //RootNode 400006: //RootNode
400008: shield_b1 400008: shield_b1
2100000: Basic_1
2300000: Basic1_gun 2300000: Basic1_gun
2300002: Basic1_turretLower 2300002: Basic1_turretLower
2300004: Basic1_turretTop 2300004: Basic1_turretTop
@ -45,265 +29,74 @@ ModelImporter:
4300004: Basic1_turretTop 4300004: Basic1_turretTop
4300006: Basic1_gun 4300006: Basic1_gun
4300008: shield_b1 4300008: shield_b1
7400000: Building 7400000: Take 001
7400002: Shooting
7400004: ShieldDown
7400006: ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD externalObjects: {}
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Basic_1
second: {fileID: 2100000, guid: ea1909320617464468e6af081a51ca64, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD materialLocation: 1
materialLocation: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animations: animations:
legacyGenerateAnimations: 4 legacyGenerateAnimations: 4
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
motionNodeName: motionNodeName:
<<<<<<< HEAD
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationImportErrors: animationImportErrors:
animationImportWarnings: animationImportWarnings:
animationRetargetingWarnings: animationRetargetingWarnings:
animationDoRetargetingWarnings: 0 animationDoRetargetingWarnings: 0
<<<<<<< HEAD
importAnimatedCustomProperties: 0 importAnimatedCustomProperties: 0
importConstraints: 0 importConstraints: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationCompression: 1 animationCompression: 1
animationRotationError: 0.5 animationRotationError: 0.5
animationPositionError: 0.5 animationPositionError: 0.5
animationScaleError: 0.5 animationScaleError: 0.5
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
<<<<<<< HEAD
extraUserProperties: [] extraUserProperties: []
======= clipAnimations: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations:
- serializedVersion: 16
name: Building
takeName: Take 001
firstFrame: 2
lastFrame: 34
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Basic1_turretLower
weight: 1
- path: Basic1_turretLower/Basic1_turretTop
weight: 1
- path: Basic1_turretLower/Basic1_turretTop/Basic1_gun
weight: 1
- path: shield_b1
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: Shooting
takeName: Take 001
firstFrame: 34
lastFrame: 44
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Basic1_turretLower
weight: 1
- path: Basic1_turretLower/Basic1_turretTop
weight: 1
- path: Basic1_turretLower/Basic1_turretTop/Basic1_gun
weight: 1
- path: shield_b1
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: ShieldDown
takeName: Take 001
firstFrame: 48
lastFrame: 70
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Basic1_turretLower
weight: 1
- path: Basic1_turretLower/Basic1_turretTop
weight: 1
- path: Basic1_turretLower/Basic1_turretTop/Basic1_gun
weight: 1
- path: shield_b1
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: ShieldUp
takeName: Take 001
firstFrame: 70
lastFrame: 90
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Basic1_turretLower
weight: 1
- path: Basic1_turretLower/Basic1_turretTop
weight: 1
- path: Basic1_turretLower/Basic1_turretTop/Basic1_gun
weight: 1
- path: shield_b1
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 1
importLights: 0 importLights: 1
=======
importBlendShapes: 1
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1 optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
<<<<<<< HEAD
preserveHierarchy: 0 preserveHierarchy: 0
indexFormat: 1 indexFormat: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
<<<<<<< HEAD
previousCalculatedGlobalScale: 1 previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
tangentImportMode: 3 tangentImportMode: 3
<<<<<<< HEAD normalCalculationMode: 4
normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
normalSmoothingSource: 0 normalSmoothingSource: 0
importAnimation: 1 importAnimation: 1
copyAvatar: 0 copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2 serializedVersion: 2
=======
importAnimation: 1
copyAvatar: 0
humanDescription:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
human: [] human: []
skeleton: [] skeleton: []
armTwist: 0.5 armTwist: 0.5
@ -315,11 +108,8 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

View File

@ -1,24 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 91ddc9ba03543444c853257a31abd52d guid: 91ddc9ba03543444c853257a31abd52d
=======
guid: 3a5d592d4c49e234a8ec599bf0e33656
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels:
- Gun
- gatling
- machinegun
- tower
- turret
<<<<<<< HEAD
ModelImporter: ModelImporter:
serializedVersion: 23 serializedVersion: 23
=======
timeCreated: 1483280625
licenseType: Store
ModelImporter:
serializedVersion: 19
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
fileIDToRecycleName: fileIDToRecycleName:
100000: Basic2_guns 100000: Basic2_guns
100002: Basic2_turretLower 100002: Basic2_turretLower
@ -30,6 +13,7 @@ ModelImporter:
400004: Basic2_turretTop 400004: Basic2_turretTop
400006: //RootNode 400006: //RootNode
400008: shield_b2 400008: shield_b2
2100000: Basic_2
2300000: Basic2_guns 2300000: Basic2_guns
2300002: Basic2_turretLower 2300002: Basic2_turretLower
2300004: Basic2_turretTop 2300004: Basic2_turretTop
@ -45,265 +29,74 @@ ModelImporter:
4300004: Basic2_turretTop 4300004: Basic2_turretTop
4300006: Basic2_guns 4300006: Basic2_guns
4300008: shield_b2 4300008: shield_b2
7400000: B2_Building 7400000: Take 001
7400002: B2_Shooting
7400004: B2_ShieldDown
7400006: B2_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD externalObjects: {}
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Basic_2
second: {fileID: 2100000, guid: 25d5edd4c091c544e9f5624821c66a72, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD materialLocation: 1
materialLocation: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animations: animations:
legacyGenerateAnimations: 4 legacyGenerateAnimations: 4
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
motionNodeName: motionNodeName:
<<<<<<< HEAD
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationImportErrors: animationImportErrors:
animationImportWarnings: animationImportWarnings:
animationRetargetingWarnings: animationRetargetingWarnings:
animationDoRetargetingWarnings: 0 animationDoRetargetingWarnings: 0
<<<<<<< HEAD
importAnimatedCustomProperties: 0 importAnimatedCustomProperties: 0
importConstraints: 0 importConstraints: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationCompression: 1 animationCompression: 1
animationRotationError: 0.5 animationRotationError: 0.5
animationPositionError: 0.5 animationPositionError: 0.5
animationScaleError: 0.5 animationScaleError: 0.5
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
<<<<<<< HEAD
extraUserProperties: [] extraUserProperties: []
======= clipAnimations: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations:
- serializedVersion: 16
name: B2_Building
takeName: Take 001
firstFrame: 2
lastFrame: 34
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Basic2_turretLower
weight: 1
- path: Basic2_turretLower/Basic2_turretTop
weight: 1
- path: Basic2_turretLower/Basic2_turretTop/Basic2_guns
weight: 1
- path: shield_b2
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: B2_Shooting
takeName: Take 001
firstFrame: 34
lastFrame: 44
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Basic2_turretLower
weight: 1
- path: Basic2_turretLower/Basic2_turretTop
weight: 1
- path: Basic2_turretLower/Basic2_turretTop/Basic2_guns
weight: 1
- path: shield_b2
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: B2_ShieldDown
takeName: Take 001
firstFrame: 48
lastFrame: 70
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Basic2_turretLower
weight: 1
- path: Basic2_turretLower/Basic2_turretTop
weight: 1
- path: Basic2_turretLower/Basic2_turretTop/Basic2_guns
weight: 1
- path: shield_b2
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: B2_ShieldUp
takeName: Take 001
firstFrame: 70
lastFrame: 90
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Basic2_turretLower
weight: 1
- path: Basic2_turretLower/Basic2_turretTop
weight: 1
- path: Basic2_turretLower/Basic2_turretTop/Basic2_guns
weight: 1
- path: shield_b2
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 1
importLights: 0 importLights: 1
=======
importBlendShapes: 1
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1 optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
<<<<<<< HEAD
preserveHierarchy: 0 preserveHierarchy: 0
indexFormat: 1 indexFormat: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
<<<<<<< HEAD
previousCalculatedGlobalScale: 1 previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
tangentImportMode: 3 tangentImportMode: 3
<<<<<<< HEAD normalCalculationMode: 4
normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
normalSmoothingSource: 0 normalSmoothingSource: 0
importAnimation: 1 importAnimation: 1
copyAvatar: 0 copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2 serializedVersion: 2
=======
importAnimation: 1
copyAvatar: 0
humanDescription:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
human: [] human: []
skeleton: [] skeleton: []
armTwist: 0.5 armTwist: 0.5
@ -315,11 +108,8 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

View File

@ -1,24 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: cc0dea20332a71d419956221115a31a5 guid: cc0dea20332a71d419956221115a31a5
=======
guid: 33ddf4a80a25baf419b7b1cfda300ee5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels:
- Gun
- gatling
- machinegun
- tower
- turret
<<<<<<< HEAD
ModelImporter: ModelImporter:
serializedVersion: 23 serializedVersion: 23
=======
timeCreated: 1483280625
licenseType: Store
ModelImporter:
serializedVersion: 19
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
fileIDToRecycleName: fileIDToRecycleName:
100000: Basic3_gunsLow 100000: Basic3_gunsLow
100002: Basic3_gunsUp 100002: Basic3_gunsUp
@ -32,6 +15,7 @@ ModelImporter:
400006: Basic3_upperTurret 400006: Basic3_upperTurret
400008: //RootNode 400008: //RootNode
400010: shield_b3 400010: shield_b3
2100000: Basic_3
2300000: Basic3_gunsLow 2300000: Basic3_gunsLow
2300002: Basic3_gunsUp 2300002: Basic3_gunsUp
2300004: Basic3_lowerTurret 2300004: Basic3_lowerTurret
@ -50,273 +34,74 @@ ModelImporter:
4300006: Basic3_gunsUp 4300006: Basic3_gunsUp
4300008: Basic3_gunsLow 4300008: Basic3_gunsLow
4300010: shield_b3 4300010: shield_b3
7400000: B3_Building 7400000: Take 001
7400002: B3_Shooting
7400004: B3_ShieldDown
7400006: B3_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD externalObjects: {}
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Basic_3
second: {fileID: 2100000, guid: b7e7195876436ef4b8ca5df5e0606c83, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD materialLocation: 1
materialLocation: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animations: animations:
legacyGenerateAnimations: 4 legacyGenerateAnimations: 4
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
motionNodeName: motionNodeName:
<<<<<<< HEAD
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationImportErrors: animationImportErrors:
animationImportWarnings: animationImportWarnings:
animationRetargetingWarnings: animationRetargetingWarnings:
animationDoRetargetingWarnings: 0 animationDoRetargetingWarnings: 0
<<<<<<< HEAD
importAnimatedCustomProperties: 0 importAnimatedCustomProperties: 0
importConstraints: 0 importConstraints: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationCompression: 1 animationCompression: 1
animationRotationError: 0.5 animationRotationError: 0.5
animationPositionError: 0.5 animationPositionError: 0.5
animationScaleError: 0.5 animationScaleError: 0.5
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
<<<<<<< HEAD
extraUserProperties: [] extraUserProperties: []
======= clipAnimations: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations:
- serializedVersion: 16
name: B3_Building
takeName: Take 001
firstFrame: 2
lastFrame: 34
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Basic3_lowerTurret
weight: 1
- path: Basic3_lowerTurret/Basic3_upperTurret
weight: 1
- path: Basic3_lowerTurret/Basic3_upperTurret/Basic3_gunsLow
weight: 1
- path: Basic3_lowerTurret/Basic3_upperTurret/Basic3_gunsUp
weight: 1
- path: shield_b3
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: B3_Shooting
takeName: Take 001
firstFrame: 34
lastFrame: 44
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Basic3_lowerTurret
weight: 1
- path: Basic3_lowerTurret/Basic3_upperTurret
weight: 1
- path: Basic3_lowerTurret/Basic3_upperTurret/Basic3_gunsLow
weight: 1
- path: Basic3_lowerTurret/Basic3_upperTurret/Basic3_gunsUp
weight: 1
- path: shield_b3
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: B3_ShieldDown
takeName: Take 001
firstFrame: 48
lastFrame: 70
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Basic3_lowerTurret
weight: 1
- path: Basic3_lowerTurret/Basic3_upperTurret
weight: 1
- path: Basic3_lowerTurret/Basic3_upperTurret/Basic3_gunsLow
weight: 1
- path: Basic3_lowerTurret/Basic3_upperTurret/Basic3_gunsUp
weight: 1
- path: shield_b3
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: B3_ShieldUp
takeName: Take 001
firstFrame: 70
lastFrame: 90
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Basic3_lowerTurret
weight: 1
- path: Basic3_lowerTurret/Basic3_upperTurret
weight: 1
- path: Basic3_lowerTurret/Basic3_upperTurret/Basic3_gunsLow
weight: 1
- path: Basic3_lowerTurret/Basic3_upperTurret/Basic3_gunsUp
weight: 1
- path: shield_b3
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 1
importLights: 0 importLights: 1
=======
importBlendShapes: 1
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1 optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
<<<<<<< HEAD
preserveHierarchy: 0 preserveHierarchy: 0
indexFormat: 1 indexFormat: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
<<<<<<< HEAD
previousCalculatedGlobalScale: 1 previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
tangentImportMode: 3 tangentImportMode: 3
<<<<<<< HEAD normalCalculationMode: 4
normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
normalSmoothingSource: 0 normalSmoothingSource: 0
importAnimation: 1 importAnimation: 1
copyAvatar: 0 copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2 serializedVersion: 2
=======
importAnimation: 1
copyAvatar: 0
humanDescription:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
human: [] human: []
skeleton: [] skeleton: []
armTwist: 0.5 armTwist: 0.5
@ -328,11 +113,8 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

View File

@ -1,24 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: b9a2d3052aa3c344bb14d635948d6b64 guid: b9a2d3052aa3c344bb14d635948d6b64
=======
guid: a68e661ad382e61479ba954ba7073351
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels:
- Gun
- laser
- lazer
- tower
- turret
<<<<<<< HEAD
ModelImporter: ModelImporter:
serializedVersion: 23 serializedVersion: 23
=======
timeCreated: 1483280627
licenseType: Store
ModelImporter:
serializedVersion: 19
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
fileIDToRecycleName: fileIDToRecycleName:
100000: laser1_gun 100000: laser1_gun
100002: laser1_platform 100002: laser1_platform
@ -32,6 +15,7 @@ ModelImporter:
400006: laser1_Yrotation 400006: laser1_Yrotation
400008: //RootNode 400008: //RootNode
400010: shield_L1 400010: shield_L1
2100000: Laser_1
2300000: laser1_gun 2300000: laser1_gun
2300002: laser1_platform 2300002: laser1_platform
2300004: laser1_Xrotation 2300004: laser1_Xrotation
@ -50,273 +34,74 @@ ModelImporter:
4300006: laser1_Xrotation 4300006: laser1_Xrotation
4300008: laser1_gun 4300008: laser1_gun
4300010: shield_L1 4300010: shield_L1
7400000: L1_Building 7400000: Take 001
7400002: L1_Shooting
7400004: L1_SheldDown
7400006: L1_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD externalObjects: {}
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Laser_1
second: {fileID: 2100000, guid: e4dbcb672f282fc4aba8f8871dfb109b, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD materialLocation: 1
materialLocation: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animations: animations:
legacyGenerateAnimations: 4 legacyGenerateAnimations: 4
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
motionNodeName: motionNodeName:
<<<<<<< HEAD
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationImportErrors: animationImportErrors:
animationImportWarnings: animationImportWarnings:
animationRetargetingWarnings: animationRetargetingWarnings:
animationDoRetargetingWarnings: 0 animationDoRetargetingWarnings: 0
<<<<<<< HEAD
importAnimatedCustomProperties: 0 importAnimatedCustomProperties: 0
importConstraints: 0 importConstraints: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationCompression: 1 animationCompression: 1
animationRotationError: 0.5 animationRotationError: 0.5
animationPositionError: 0.5 animationPositionError: 0.5
animationScaleError: 0.5 animationScaleError: 0.5
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
<<<<<<< HEAD
extraUserProperties: [] extraUserProperties: []
======= clipAnimations: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations:
- serializedVersion: 16
name: L1_Building
takeName: Take 001
firstFrame: 2
lastFrame: 34
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: laser1_platform
weight: 1
- path: laser1_platform/laser1_Yrotation
weight: 1
- path: laser1_platform/laser1_Yrotation/laser1_Xrotation
weight: 1
- path: laser1_platform/laser1_Yrotation/laser1_Xrotation/laser1_gun
weight: 1
- path: shield_L1
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: L1_Shooting
takeName: Take 001
firstFrame: 34
lastFrame: 46
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: laser1_platform
weight: 1
- path: laser1_platform/laser1_Yrotation
weight: 1
- path: laser1_platform/laser1_Yrotation/laser1_Xrotation
weight: 1
- path: laser1_platform/laser1_Yrotation/laser1_Xrotation/laser1_gun
weight: 1
- path: shield_L1
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: L1_SheldDown
takeName: Take 001
firstFrame: 54
lastFrame: 70
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: laser1_platform
weight: 1
- path: laser1_platform/laser1_Yrotation
weight: 1
- path: laser1_platform/laser1_Yrotation/laser1_Xrotation
weight: 1
- path: laser1_platform/laser1_Yrotation/laser1_Xrotation/laser1_gun
weight: 1
- path: shield_L1
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: L1_ShieldUp
takeName: Take 001
firstFrame: 70
lastFrame: 90
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: laser1_platform
weight: 1
- path: laser1_platform/laser1_Yrotation
weight: 1
- path: laser1_platform/laser1_Yrotation/laser1_Xrotation
weight: 1
- path: laser1_platform/laser1_Yrotation/laser1_Xrotation/laser1_gun
weight: 1
- path: shield_L1
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 1
importLights: 0 importLights: 1
=======
importBlendShapes: 1
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1 optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
<<<<<<< HEAD
preserveHierarchy: 0 preserveHierarchy: 0
indexFormat: 1 indexFormat: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
<<<<<<< HEAD
previousCalculatedGlobalScale: 1 previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
tangentImportMode: 3 tangentImportMode: 3
<<<<<<< HEAD normalCalculationMode: 4
normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
normalSmoothingSource: 0 normalSmoothingSource: 0
importAnimation: 1 importAnimation: 1
copyAvatar: 0 copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2 serializedVersion: 2
=======
importAnimation: 1
copyAvatar: 0
humanDescription:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
human: [] human: []
skeleton: [] skeleton: []
armTwist: 0.5 armTwist: 0.5
@ -328,11 +113,8 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

View File

@ -1,24 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: b945f9060b1567a4bb75bf3cf9c5345e guid: b945f9060b1567a4bb75bf3cf9c5345e
=======
guid: e23e25bfa369167479153b9f54ab4752
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels:
- Gun
- laser
- lazer
- tower
- turret
<<<<<<< HEAD
ModelImporter: ModelImporter:
serializedVersion: 23 serializedVersion: 23
=======
timeCreated: 1483280627
licenseType: Store
ModelImporter:
serializedVersion: 19
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
fileIDToRecycleName: fileIDToRecycleName:
100000: laser2_guns 100000: laser2_guns
100002: laser2_platform 100002: laser2_platform
@ -32,6 +15,7 @@ ModelImporter:
400006: laser2_Yrotation 400006: laser2_Yrotation
400008: //RootNode 400008: //RootNode
400010: shield_L2 400010: shield_L2
2100000: lambert15
2300000: laser2_guns 2300000: laser2_guns
2300002: laser2_platform 2300002: laser2_platform
2300004: laser2_Xrotation 2300004: laser2_Xrotation
@ -50,273 +34,74 @@ ModelImporter:
4300006: laser2_Xrotation 4300006: laser2_Xrotation
4300008: laser2_guns 4300008: laser2_guns
4300010: shield_L2 4300010: shield_L2
7400000: L2_Building 7400000: Take 001
7400002: L2_Shooting
7400004: L2_ShieldDown
7400006: L2_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD externalObjects: {}
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: lambert15
second: {fileID: 2100000, guid: 034a6be45c119ee438da4b3060a51dbe, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD materialLocation: 1
materialLocation: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animations: animations:
legacyGenerateAnimations: 4 legacyGenerateAnimations: 4
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
motionNodeName: motionNodeName:
<<<<<<< HEAD
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationImportErrors: animationImportErrors:
animationImportWarnings: animationImportWarnings:
animationRetargetingWarnings: animationRetargetingWarnings:
animationDoRetargetingWarnings: 0 animationDoRetargetingWarnings: 0
<<<<<<< HEAD
importAnimatedCustomProperties: 0 importAnimatedCustomProperties: 0
importConstraints: 0 importConstraints: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationCompression: 1 animationCompression: 1
animationRotationError: 0.5 animationRotationError: 0.5
animationPositionError: 0.5 animationPositionError: 0.5
animationScaleError: 0.5 animationScaleError: 0.5
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
<<<<<<< HEAD
extraUserProperties: [] extraUserProperties: []
======= clipAnimations: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations:
- serializedVersion: 16
name: L2_Building
takeName: Take 001
firstFrame: 2
lastFrame: 37
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: laser2_platform
weight: 1
- path: laser2_platform/laser2_Yrotation
weight: 1
- path: laser2_platform/laser2_Yrotation/laser2_Xrotation
weight: 1
- path: laser2_platform/laser2_Yrotation/laser2_Xrotation/laser2_guns
weight: 1
- path: shield_L2
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: L2_Shooting
takeName: Take 001
firstFrame: 34
lastFrame: 46
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: laser2_platform
weight: 1
- path: laser2_platform/laser2_Yrotation
weight: 1
- path: laser2_platform/laser2_Yrotation/laser2_Xrotation
weight: 1
- path: laser2_platform/laser2_Yrotation/laser2_Xrotation/laser2_guns
weight: 1
- path: shield_L2
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: L2_ShieldDown
takeName: Take 001
firstFrame: 54
lastFrame: 70
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: laser2_platform
weight: 1
- path: laser2_platform/laser2_Yrotation
weight: 1
- path: laser2_platform/laser2_Yrotation/laser2_Xrotation
weight: 1
- path: laser2_platform/laser2_Yrotation/laser2_Xrotation/laser2_guns
weight: 1
- path: shield_L2
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: L2_ShieldUp
takeName: Take 001
firstFrame: 70
lastFrame: 90
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: laser2_platform
weight: 1
- path: laser2_platform/laser2_Yrotation
weight: 1
- path: laser2_platform/laser2_Yrotation/laser2_Xrotation
weight: 1
- path: laser2_platform/laser2_Yrotation/laser2_Xrotation/laser2_guns
weight: 1
- path: shield_L2
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 1
importLights: 0 importLights: 1
=======
importBlendShapes: 1
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1 optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
<<<<<<< HEAD
preserveHierarchy: 0 preserveHierarchy: 0
indexFormat: 1 indexFormat: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
<<<<<<< HEAD
previousCalculatedGlobalScale: 1 previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
tangentImportMode: 3 tangentImportMode: 3
<<<<<<< HEAD normalCalculationMode: 4
normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
normalSmoothingSource: 0 normalSmoothingSource: 0
importAnimation: 1 importAnimation: 1
copyAvatar: 0 copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2 serializedVersion: 2
=======
importAnimation: 1
copyAvatar: 0
humanDescription:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
human: [] human: []
skeleton: [] skeleton: []
armTwist: 0.5 armTwist: 0.5
@ -328,11 +113,8 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

View File

@ -1,24 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: c45f084fafac6054ea0e2dfef27c4d96 guid: c45f084fafac6054ea0e2dfef27c4d96
=======
guid: 527bc2352328fe74c9110c2f52e3cb66
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels:
- Gun
- laser
- lazer
- tower
- turret
<<<<<<< HEAD
ModelImporter: ModelImporter:
serializedVersion: 23 serializedVersion: 23
=======
timeCreated: 1483280626
licenseType: Store
ModelImporter:
serializedVersion: 19
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
fileIDToRecycleName: fileIDToRecycleName:
100000: laser3_guns 100000: laser3_guns
100002: laser3_platform 100002: laser3_platform
@ -32,6 +15,7 @@ ModelImporter:
400006: laser3_Yrotation 400006: laser3_Yrotation
400008: //RootNode 400008: //RootNode
400010: shield_l3 400010: shield_l3
2100000: lambert16
2300000: laser3_guns 2300000: laser3_guns
2300002: laser3_platform 2300002: laser3_platform
2300004: laser3_Xrotation 2300004: laser3_Xrotation
@ -50,273 +34,74 @@ ModelImporter:
4300006: laser3_Xrotation 4300006: laser3_Xrotation
4300008: laser3_guns 4300008: laser3_guns
4300010: shield_l3 4300010: shield_l3
7400000: L3_Building 7400000: Take 001
7400002: L3_Shooting
7400004: L3_ShieldDown
7400006: L3_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD externalObjects: {}
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: lambert16
second: {fileID: 2100000, guid: 2f45eca49f3995741847717ffd33da3d, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD materialLocation: 1
materialLocation: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animations: animations:
legacyGenerateAnimations: 4 legacyGenerateAnimations: 4
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
motionNodeName: motionNodeName:
<<<<<<< HEAD
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationImportErrors: animationImportErrors:
animationImportWarnings: animationImportWarnings:
animationRetargetingWarnings: animationRetargetingWarnings:
animationDoRetargetingWarnings: 0 animationDoRetargetingWarnings: 0
<<<<<<< HEAD
importAnimatedCustomProperties: 0 importAnimatedCustomProperties: 0
importConstraints: 0 importConstraints: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationCompression: 1 animationCompression: 1
animationRotationError: 0.5 animationRotationError: 0.5
animationPositionError: 0.5 animationPositionError: 0.5
animationScaleError: 0.5 animationScaleError: 0.5
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
<<<<<<< HEAD
extraUserProperties: [] extraUserProperties: []
======= clipAnimations: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations:
- serializedVersion: 16
name: L3_Building
takeName: Take 001
firstFrame: 2
lastFrame: 34
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: laser3_platform
weight: 1
- path: laser3_platform/laser3_Yrotation
weight: 1
- path: laser3_platform/laser3_Yrotation/laser3_Xrotation
weight: 1
- path: laser3_platform/laser3_Yrotation/laser3_Xrotation/laser3_guns
weight: 1
- path: shield_l3
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: L3_Shooting
takeName: Take 001
firstFrame: 34
lastFrame: 46
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: laser3_platform
weight: 1
- path: laser3_platform/laser3_Yrotation
weight: 1
- path: laser3_platform/laser3_Yrotation/laser3_Xrotation
weight: 1
- path: laser3_platform/laser3_Yrotation/laser3_Xrotation/laser3_guns
weight: 1
- path: shield_l3
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: L3_ShieldDown
takeName: Take 001
firstFrame: 54
lastFrame: 70
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: laser3_platform
weight: 1
- path: laser3_platform/laser3_Yrotation
weight: 1
- path: laser3_platform/laser3_Yrotation/laser3_Xrotation
weight: 1
- path: laser3_platform/laser3_Yrotation/laser3_Xrotation/laser3_guns
weight: 1
- path: shield_l3
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: L3_ShieldUp
takeName: Take 001
firstFrame: 70
lastFrame: 90
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: laser3_platform
weight: 1
- path: laser3_platform/laser3_Yrotation
weight: 1
- path: laser3_platform/laser3_Yrotation/laser3_Xrotation
weight: 1
- path: laser3_platform/laser3_Yrotation/laser3_Xrotation/laser3_guns
weight: 1
- path: shield_l3
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 1
importLights: 0 importLights: 1
=======
importBlendShapes: 1
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1 optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
<<<<<<< HEAD
preserveHierarchy: 0 preserveHierarchy: 0
indexFormat: 1 indexFormat: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
<<<<<<< HEAD
previousCalculatedGlobalScale: 1 previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
tangentImportMode: 3 tangentImportMode: 3
<<<<<<< HEAD normalCalculationMode: 4
normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
normalSmoothingSource: 0 normalSmoothingSource: 0
importAnimation: 1 importAnimation: 1
copyAvatar: 0 copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2 serializedVersion: 2
=======
importAnimation: 1
copyAvatar: 0
humanDescription:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
human: [] human: []
skeleton: [] skeleton: []
armTwist: 0.5 armTwist: 0.5
@ -328,11 +113,8 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

View File

@ -1,23 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 5b884fceac83e384c85c9d94a325299c guid: 5b884fceac83e384c85c9d94a325299c
=======
guid: 64d97d559ee3c274882d59046ccd6781
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels:
- Gun
- rocket
- tower
- turret
<<<<<<< HEAD
ModelImporter: ModelImporter:
serializedVersion: 23 serializedVersion: 23
=======
timeCreated: 1483280626
licenseType: Store
ModelImporter:
serializedVersion: 19
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
fileIDToRecycleName: fileIDToRecycleName:
100000: Rocket1_Guns 100000: Rocket1_Guns
100002: Rocket1_Platform 100002: Rocket1_Platform
@ -29,6 +13,7 @@ ModelImporter:
400004: Rocket1_Turret 400004: Rocket1_Turret
400006: //RootNode 400006: //RootNode
400008: shield_r1 400008: shield_r1
2100000: Rocket_1
2300000: Rocket1_Guns 2300000: Rocket1_Guns
2300002: Rocket1_Platform 2300002: Rocket1_Platform
2300004: Rocket1_Turret 2300004: Rocket1_Turret
@ -44,265 +29,74 @@ ModelImporter:
4300004: Rocket1_Turret 4300004: Rocket1_Turret
4300006: Rocket1_Guns 4300006: Rocket1_Guns
4300008: shield_r1 4300008: shield_r1
7400000: R1_Building 7400000: Take 001
7400002: R1_Shooting
7400004: R1_ShieldDown
7400006: R1_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD externalObjects: {}
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Rocket_1
second: {fileID: 2100000, guid: 89b20baf85c7ee740a8c07cea17f5617, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD materialLocation: 1
materialLocation: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animations: animations:
legacyGenerateAnimations: 4 legacyGenerateAnimations: 4
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
motionNodeName: motionNodeName:
<<<<<<< HEAD
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationImportErrors: animationImportErrors:
animationImportWarnings: animationImportWarnings:
animationRetargetingWarnings: animationRetargetingWarnings:
animationDoRetargetingWarnings: 0 animationDoRetargetingWarnings: 0
<<<<<<< HEAD
importAnimatedCustomProperties: 0 importAnimatedCustomProperties: 0
importConstraints: 0 importConstraints: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationCompression: 1 animationCompression: 1
animationRotationError: 0.5 animationRotationError: 0.5
animationPositionError: 0.5 animationPositionError: 0.5
animationScaleError: 0.5 animationScaleError: 0.5
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
<<<<<<< HEAD
extraUserProperties: [] extraUserProperties: []
======= clipAnimations: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations:
- serializedVersion: 16
name: R1_Building
takeName: Take 001
firstFrame: 2
lastFrame: 34
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Rocket1_Platform
weight: 1
- path: Rocket1_Platform/Rocket1_Turret
weight: 1
- path: Rocket1_Platform/Rocket1_Turret/Rocket1_Guns
weight: 1
- path: shield_r1
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: R1_Shooting
takeName: Take 001
firstFrame: 35
lastFrame: 45
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Rocket1_Platform
weight: 1
- path: Rocket1_Platform/Rocket1_Turret
weight: 1
- path: Rocket1_Platform/Rocket1_Turret/Rocket1_Guns
weight: 1
- path: shield_r1
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: R1_ShieldDown
takeName: Take 001
firstFrame: 49
lastFrame: 70
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Rocket1_Platform
weight: 1
- path: Rocket1_Platform/Rocket1_Turret
weight: 1
- path: Rocket1_Platform/Rocket1_Turret/Rocket1_Guns
weight: 1
- path: shield_r1
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: R1_ShieldUp
takeName: Take 001
firstFrame: 70
lastFrame: 90
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Rocket1_Platform
weight: 1
- path: Rocket1_Platform/Rocket1_Turret
weight: 1
- path: Rocket1_Platform/Rocket1_Turret/Rocket1_Guns
weight: 1
- path: shield_r1
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 1
importLights: 0 importLights: 1
=======
importBlendShapes: 1
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1 optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
<<<<<<< HEAD
preserveHierarchy: 0 preserveHierarchy: 0
indexFormat: 1 indexFormat: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
<<<<<<< HEAD
previousCalculatedGlobalScale: 1 previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
tangentImportMode: 3 tangentImportMode: 3
<<<<<<< HEAD normalCalculationMode: 4
normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
normalSmoothingSource: 0 normalSmoothingSource: 0
importAnimation: 1 importAnimation: 1
copyAvatar: 0 copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2 serializedVersion: 2
=======
importAnimation: 1
copyAvatar: 0
humanDescription:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
human: [] human: []
skeleton: [] skeleton: []
armTwist: 0.5 armTwist: 0.5
@ -314,11 +108,8 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

View File

@ -1,23 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 0b8d3d266ef632341bc8314f3057e150 guid: 0b8d3d266ef632341bc8314f3057e150
=======
guid: d2dddbb88b2ff9b40bcfcf899a3b56a9
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels:
- Gun
- rocket
- tower
- turret
<<<<<<< HEAD
ModelImporter: ModelImporter:
serializedVersion: 23 serializedVersion: 23
=======
timeCreated: 1483280627
licenseType: Store
ModelImporter:
serializedVersion: 19
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
fileIDToRecycleName: fileIDToRecycleName:
100000: Rocket2_base 100000: Rocket2_base
100002: Rocket2_guns 100002: Rocket2_guns
@ -29,6 +13,7 @@ ModelImporter:
400004: Rocket2_Main 400004: Rocket2_Main
400006: //RootNode 400006: //RootNode
400008: shield_b6 400008: shield_b6
2100000: Rocket_2
2300000: Rocket2_base 2300000: Rocket2_base
2300002: Rocket2_guns 2300002: Rocket2_guns
2300004: Rocket2_Main 2300004: Rocket2_Main
@ -44,265 +29,74 @@ ModelImporter:
4300004: Rocket2_Main 4300004: Rocket2_Main
4300006: Rocket2_guns 4300006: Rocket2_guns
4300008: shield_b6 4300008: shield_b6
7400000: R2_Building 7400000: Take 001
7400002: R2_Shooting
7400004: R2_ShieldDown
7400006: R2_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD externalObjects: {}
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Rocket_2
second: {fileID: 2100000, guid: a68d994dad7316f458b439b9cae3a709, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD materialLocation: 1
materialLocation: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animations: animations:
legacyGenerateAnimations: 4 legacyGenerateAnimations: 4
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
motionNodeName: motionNodeName:
<<<<<<< HEAD
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationImportErrors: animationImportErrors:
animationImportWarnings: animationImportWarnings:
animationRetargetingWarnings: animationRetargetingWarnings:
animationDoRetargetingWarnings: 0 animationDoRetargetingWarnings: 0
<<<<<<< HEAD
importAnimatedCustomProperties: 0 importAnimatedCustomProperties: 0
importConstraints: 0 importConstraints: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationCompression: 1 animationCompression: 1
animationRotationError: 0.5 animationRotationError: 0.5
animationPositionError: 0.5 animationPositionError: 0.5
animationScaleError: 0.5 animationScaleError: 0.5
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
<<<<<<< HEAD
extraUserProperties: [] extraUserProperties: []
======= clipAnimations: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations:
- serializedVersion: 16
name: R2_Building
takeName: Take 001
firstFrame: 2
lastFrame: 34
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Rocket2_base
weight: 1
- path: Rocket2_base/Rocket2_Main
weight: 1
- path: Rocket2_base/Rocket2_Main/Rocket2_guns
weight: 1
- path: shield_b6
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: R2_Shooting
takeName: Take 001
firstFrame: 35
lastFrame: 45
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Rocket2_base
weight: 1
- path: Rocket2_base/Rocket2_Main
weight: 1
- path: Rocket2_base/Rocket2_Main/Rocket2_guns
weight: 1
- path: shield_b6
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: R2_ShieldDown
takeName: Take 001
firstFrame: 49
lastFrame: 70
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Rocket2_base
weight: 1
- path: Rocket2_base/Rocket2_Main
weight: 1
- path: Rocket2_base/Rocket2_Main/Rocket2_guns
weight: 1
- path: shield_b6
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: R2_ShieldUp
takeName: Take 001
firstFrame: 70
lastFrame: 90
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Rocket2_base
weight: 1
- path: Rocket2_base/Rocket2_Main
weight: 1
- path: Rocket2_base/Rocket2_Main/Rocket2_guns
weight: 1
- path: shield_b6
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 1
importLights: 0 importLights: 1
=======
importBlendShapes: 1
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1 optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
<<<<<<< HEAD
preserveHierarchy: 0 preserveHierarchy: 0
indexFormat: 1 indexFormat: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
<<<<<<< HEAD
previousCalculatedGlobalScale: 1 previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
tangentImportMode: 3 tangentImportMode: 3
<<<<<<< HEAD normalCalculationMode: 4
normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
normalSmoothingSource: 0 normalSmoothingSource: 0
importAnimation: 1 importAnimation: 1
copyAvatar: 0 copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2 serializedVersion: 2
=======
importAnimation: 1
copyAvatar: 0
humanDescription:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
human: [] human: []
skeleton: [] skeleton: []
armTwist: 0.5 armTwist: 0.5
@ -314,11 +108,8 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

View File

@ -1,23 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: e6f39ee1b1a64c14cb2afbbc60127caf guid: e6f39ee1b1a64c14cb2afbbc60127caf
=======
guid: a2fad7c5e55c0b640aa16b8bf0be7f18
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels:
- Gun
- rocket
- tower
- turret
<<<<<<< HEAD
ModelImporter: ModelImporter:
serializedVersion: 23 serializedVersion: 23
=======
timeCreated: 1483280626
licenseType: Store
ModelImporter:
serializedVersion: 19
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
fileIDToRecycleName: fileIDToRecycleName:
100000: Rocket3_Guns 100000: Rocket3_Guns
100002: Rocket3_Main 100002: Rocket3_Main
@ -29,6 +13,7 @@ ModelImporter:
400004: Rocket3_platform 400004: Rocket3_platform
400006: //RootNode 400006: //RootNode
400008: shield_r3 400008: shield_r3
2100000: Rocket_3
2300000: Rocket3_Guns 2300000: Rocket3_Guns
2300002: Rocket3_Main 2300002: Rocket3_Main
2300004: Rocket3_platform 2300004: Rocket3_platform
@ -44,265 +29,74 @@ ModelImporter:
4300004: Rocket3_Main 4300004: Rocket3_Main
4300006: Rocket3_Guns 4300006: Rocket3_Guns
4300008: shield_r3 4300008: shield_r3
7400000: R3_ShieldDown 7400000: Take 001
7400002: R3_Building
7400004: R3_Shooting
7400006: R3_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD externalObjects: {}
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Rocket_3
second: {fileID: 2100000, guid: d3d60ab4d164cc84d9c3d0b18649fdcf, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD materialLocation: 1
materialLocation: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animations: animations:
legacyGenerateAnimations: 4 legacyGenerateAnimations: 4
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
motionNodeName: motionNodeName:
<<<<<<< HEAD
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationImportErrors: animationImportErrors:
animationImportWarnings: animationImportWarnings:
animationRetargetingWarnings: animationRetargetingWarnings:
animationDoRetargetingWarnings: 0 animationDoRetargetingWarnings: 0
<<<<<<< HEAD
importAnimatedCustomProperties: 0 importAnimatedCustomProperties: 0
importConstraints: 0 importConstraints: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationCompression: 1 animationCompression: 1
animationRotationError: 0.5 animationRotationError: 0.5
animationPositionError: 0.5 animationPositionError: 0.5
animationScaleError: 0.5 animationScaleError: 0.5
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
<<<<<<< HEAD
extraUserProperties: [] extraUserProperties: []
======= clipAnimations: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations:
- serializedVersion: 16
name: R3_Building
takeName: Take 001
firstFrame: 2
lastFrame: 34
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Rocket3_platform
weight: 1
- path: Rocket3_platform/Rocket3_Main
weight: 1
- path: Rocket3_platform/Rocket3_Main/Rocket3_Guns
weight: 1
- path: shield_r3
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: R3_Shooting
takeName: Take 001
firstFrame: 35
lastFrame: 45
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Rocket3_platform
weight: 1
- path: Rocket3_platform/Rocket3_Main
weight: 1
- path: Rocket3_platform/Rocket3_Main/Rocket3_Guns
weight: 1
- path: shield_r3
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: R3_ShieldDown
takeName: Take 001
firstFrame: 49
lastFrame: 70
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Rocket3_platform
weight: 1
- path: Rocket3_platform/Rocket3_Main
weight: 1
- path: Rocket3_platform/Rocket3_Main/Rocket3_Guns
weight: 1
- path: shield_r3
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: R3_ShieldUp
takeName: Take 001
firstFrame: 70
lastFrame: 90
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Rocket3_platform
weight: 1
- path: Rocket3_platform/Rocket3_Main
weight: 1
- path: Rocket3_platform/Rocket3_Main/Rocket3_Guns
weight: 1
- path: shield_r3
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 1
importLights: 0 importLights: 1
=======
importBlendShapes: 1
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1 optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
<<<<<<< HEAD
preserveHierarchy: 0 preserveHierarchy: 0
indexFormat: 1 indexFormat: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
<<<<<<< HEAD
previousCalculatedGlobalScale: 1 previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
tangentImportMode: 3 tangentImportMode: 3
<<<<<<< HEAD normalCalculationMode: 4
normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
normalSmoothingSource: 0 normalSmoothingSource: 0
importAnimation: 1 importAnimation: 1
copyAvatar: 0 copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2 serializedVersion: 2
=======
importAnimation: 1
copyAvatar: 0
humanDescription:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
human: [] human: []
skeleton: [] skeleton: []
armTwist: 0.5 armTwist: 0.5
@ -314,11 +108,8 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

View File

@ -1,23 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: c9585c729aa432f469d2530887004ace guid: c9585c729aa432f469d2530887004ace
=======
guid: 1015ac51b01675443a133858969b5126
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels:
- Gun
- tesla
- tower
- turret
<<<<<<< HEAD
ModelImporter: ModelImporter:
serializedVersion: 23 serializedVersion: 23
=======
timeCreated: 1483280625
licenseType: Store
ModelImporter:
serializedVersion: 19
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
fileIDToRecycleName: fileIDToRecycleName:
100000: shield_b7 100000: shield_b7
100002: Tesla1_main 100002: Tesla1_main
@ -25,6 +9,7 @@ ModelImporter:
400000: shield_b7 400000: shield_b7
400002: Tesla1_main 400002: Tesla1_main
400004: //RootNode 400004: //RootNode
2100000: Tesla_1
2300000: shield_b7 2300000: shield_b7
2300002: Tesla1_main 2300002: Tesla1_main
2300004: //RootNode 2300004: //RootNode
@ -34,249 +19,74 @@ ModelImporter:
4300000: Tesla_Level1 4300000: Tesla_Level1
4300002: Tesla1_main 4300002: Tesla1_main
4300004: shield_b7 4300004: shield_b7
7400000: T1_Building 7400000: Take 001
7400002: T1_Shooting
7400004: T1_ShieldDown
7400006: T1_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD externalObjects: {}
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Tesla_1
second: {fileID: 2100000, guid: 0fcf534e621a6754e9da1e6c763b69db, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD materialLocation: 1
materialLocation: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animations: animations:
legacyGenerateAnimations: 4 legacyGenerateAnimations: 4
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
motionNodeName: <Root Transform> motionNodeName:
<<<<<<< HEAD
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationImportErrors: animationImportErrors:
animationImportWarnings: animationImportWarnings:
animationRetargetingWarnings: animationRetargetingWarnings:
animationDoRetargetingWarnings: 0 animationDoRetargetingWarnings: 0
<<<<<<< HEAD
importAnimatedCustomProperties: 0 importAnimatedCustomProperties: 0
importConstraints: 0 importConstraints: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationCompression: 1 animationCompression: 1
animationRotationError: 0.5 animationRotationError: 0.5
animationPositionError: 0.5 animationPositionError: 0.5
animationScaleError: 0.5 animationScaleError: 0.5
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
<<<<<<< HEAD
extraUserProperties: [] extraUserProperties: []
======= clipAnimations: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations:
- serializedVersion: 16
name: T1_Building
takeName: Take 001
firstFrame: 2
lastFrame: 34
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: shield_b7
weight: 1
- path: Tesla1_main
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: T1_Shooting
takeName: Take 001
firstFrame: 34
lastFrame: 44
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: shield_b7
weight: 1
- path: Tesla1_main
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: T1_ShieldDown
takeName: Take 001
firstFrame: 55
lastFrame: 70
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: shield_b7
weight: 1
- path: Tesla1_main
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: T1_ShieldUp
takeName: Take 001
firstFrame: 70
lastFrame: 90
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: shield_b7
weight: 1
- path: Tesla1_main
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 1
importLights: 0 importLights: 1
=======
importBlendShapes: 1
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1 optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
<<<<<<< HEAD
preserveHierarchy: 0 preserveHierarchy: 0
indexFormat: 1 indexFormat: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
<<<<<<< HEAD
previousCalculatedGlobalScale: 1 previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
tangentImportMode: 3 tangentImportMode: 3
<<<<<<< HEAD normalCalculationMode: 4
normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
normalSmoothingSource: 0 normalSmoothingSource: 0
importAnimation: 1 importAnimation: 1
copyAvatar: 0 copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2 serializedVersion: 2
=======
importAnimation: 1
copyAvatar: 0
humanDescription:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
human: [] human: []
skeleton: [] skeleton: []
armTwist: 0.5 armTwist: 0.5
@ -288,11 +98,8 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

View File

@ -1,23 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: de4fbb42e6e048e4aaa51ee411eb9388 guid: de4fbb42e6e048e4aaa51ee411eb9388
=======
guid: d1422c96a8703674498bc10f2661c792
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels:
- Gun
- tesla
- tower
- turret
<<<<<<< HEAD
ModelImporter: ModelImporter:
serializedVersion: 23 serializedVersion: 23
=======
timeCreated: 1483280627
licenseType: Store
ModelImporter:
serializedVersion: 19
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
fileIDToRecycleName: fileIDToRecycleName:
100000: shield_t2 100000: shield_t2
100002: Tesla2_orb 100002: Tesla2_orb
@ -27,6 +11,7 @@ ModelImporter:
400002: Tesla2_orb 400002: Tesla2_orb
400004: Tesla2_turret 400004: Tesla2_turret
400006: //RootNode 400006: //RootNode
2100000: Tesla_2
2300000: shield_t2 2300000: shield_t2
2300002: Tesla2_orb 2300002: Tesla2_orb
2300004: Tesla2_turret 2300004: Tesla2_turret
@ -39,257 +24,74 @@ ModelImporter:
4300002: Tesla2_turret 4300002: Tesla2_turret
4300004: Tesla2_orb 4300004: Tesla2_orb
4300006: shield_t2 4300006: shield_t2
7400000: T2_Building 7400000: Take 001
7400002: T2_Shooting
7400004: T2_ShieldDown
7400006: T2_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD externalObjects: {}
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Tesla_2
second: {fileID: 2100000, guid: 854cbc5f3f050774ebe5b736bfe753b3, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD materialLocation: 1
materialLocation: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animations: animations:
legacyGenerateAnimations: 4 legacyGenerateAnimations: 4
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
motionNodeName: motionNodeName:
<<<<<<< HEAD
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationImportErrors: animationImportErrors:
animationImportWarnings: animationImportWarnings:
animationRetargetingWarnings: animationRetargetingWarnings:
animationDoRetargetingWarnings: 0 animationDoRetargetingWarnings: 0
<<<<<<< HEAD
importAnimatedCustomProperties: 0 importAnimatedCustomProperties: 0
importConstraints: 0 importConstraints: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationCompression: 1 animationCompression: 1
animationRotationError: 0.5 animationRotationError: 0.5
animationPositionError: 0.5 animationPositionError: 0.5
animationScaleError: 0.5 animationScaleError: 0.5
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
<<<<<<< HEAD
extraUserProperties: [] extraUserProperties: []
======= clipAnimations: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations:
- serializedVersion: 16
name: T2_Building
takeName: Take 001
firstFrame: 2
lastFrame: 34
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: shield_t2
weight: 1
- path: Tesla2_turret
weight: 1
- path: Tesla2_turret/Tesla2_orb
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: T2_Shooting
takeName: Take 001
firstFrame: 34
lastFrame: 44
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: shield_t2
weight: 1
- path: Tesla2_turret
weight: 1
- path: Tesla2_turret/Tesla2_orb
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: T2_ShieldDown
takeName: Take 001
firstFrame: 56
lastFrame: 70
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: shield_t2
weight: 1
- path: Tesla2_turret
weight: 1
- path: Tesla2_turret/Tesla2_orb
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: T2_ShieldUp
takeName: Take 001
firstFrame: 70
lastFrame: 90
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: shield_t2
weight: 1
- path: Tesla2_turret
weight: 1
- path: Tesla2_turret/Tesla2_orb
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 1
importLights: 0 importLights: 1
=======
importBlendShapes: 1
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1 optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
<<<<<<< HEAD
preserveHierarchy: 0 preserveHierarchy: 0
indexFormat: 1 indexFormat: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
<<<<<<< HEAD
previousCalculatedGlobalScale: 1 previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
tangentImportMode: 3 tangentImportMode: 3
<<<<<<< HEAD normalCalculationMode: 4
normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
normalSmoothingSource: 0 normalSmoothingSource: 0
importAnimation: 1 importAnimation: 1
copyAvatar: 0 copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2 serializedVersion: 2
=======
importAnimation: 1
copyAvatar: 0
humanDescription:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
human: [] human: []
skeleton: [] skeleton: []
armTwist: 0.5 armTwist: 0.5
@ -301,11 +103,8 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

View File

@ -1,23 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 668cfe22fc83ac24abe6a8e67544c4e6 guid: 668cfe22fc83ac24abe6a8e67544c4e6
=======
guid: c18131c0ca144db42a2bb106d0115544
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels:
- Gun
- tesla
- tower
- turret
<<<<<<< HEAD
ModelImporter: ModelImporter:
serializedVersion: 23 serializedVersion: 23
=======
timeCreated: 1483279398
licenseType: Store
ModelImporter:
serializedVersion: 19
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
fileIDToRecycleName: fileIDToRecycleName:
100000: shield_t3 100000: shield_t3
100002: tesla3_orbLeft 100002: tesla3_orbLeft
@ -29,6 +13,7 @@ ModelImporter:
400004: Tesla3_orbRight 400004: Tesla3_orbRight
400006: Tesla3_turret 400006: Tesla3_turret
400008: //RootNode 400008: //RootNode
2100000: Tesla_3
2300000: shield_t3 2300000: shield_t3
2300002: tesla3_orbLeft 2300002: tesla3_orbLeft
2300004: Tesla3_orbRight 2300004: Tesla3_orbRight
@ -44,265 +29,74 @@ ModelImporter:
4300004: Tesla3_orbRight 4300004: Tesla3_orbRight
4300006: tesla3_orbLeft 4300006: tesla3_orbLeft
4300008: shield_t3 4300008: shield_t3
7400000: T3_Building 7400000: Take 001
7400002: T3_Shooting
7400004: T3_ShieldDown
7400006: T3_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD externalObjects: {}
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: Tesla_3
second: {fileID: 2100000, guid: a15e6f3f5f1ec9a489d4930fc5a7b923, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD materialLocation: 1
materialLocation: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animations: animations:
legacyGenerateAnimations: 4 legacyGenerateAnimations: 4
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
motionNodeName: motionNodeName:
<<<<<<< HEAD
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationImportErrors: animationImportErrors:
animationImportWarnings: animationImportWarnings:
animationRetargetingWarnings: animationRetargetingWarnings:
animationDoRetargetingWarnings: 0 animationDoRetargetingWarnings: 0
<<<<<<< HEAD
importAnimatedCustomProperties: 0 importAnimatedCustomProperties: 0
importConstraints: 0 importConstraints: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
animationCompression: 1 animationCompression: 1
animationRotationError: 0.5 animationRotationError: 0.5
animationPositionError: 0.5 animationPositionError: 0.5
animationScaleError: 0.5 animationScaleError: 0.5
animationWrapMode: 0 animationWrapMode: 0
extraExposedTransformPaths: [] extraExposedTransformPaths: []
<<<<<<< HEAD
extraUserProperties: [] extraUserProperties: []
======= clipAnimations: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations:
- serializedVersion: 16
name: T3_Building
takeName: Take 001
firstFrame: 2
lastFrame: 34
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: shield_t3
weight: 1
- path: Tesla3_turret
weight: 1
- path: Tesla3_turret/tesla3_orbLeft
weight: 1
- path: Tesla3_turret/Tesla3_orbRight
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: T3_Shooting
takeName: Take 001
firstFrame: 34
lastFrame: 44
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: shield_t3
weight: 1
- path: Tesla3_turret
weight: 1
- path: Tesla3_turret/tesla3_orbLeft
weight: 1
- path: Tesla3_turret/Tesla3_orbRight
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: T3_ShieldDown
takeName: Take 001
firstFrame: 54
lastFrame: 70
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: shield_t3
weight: 1
- path: Tesla3_turret
weight: 1
- path: Tesla3_turret/tesla3_orbLeft
weight: 1
- path: Tesla3_turret/Tesla3_orbRight
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
- serializedVersion: 16
name: T3_ShieldUp
takeName: Take 001
firstFrame: 70
lastFrame: 86
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 0
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: shield_t3
weight: 1
- path: Tesla3_turret
weight: 1
- path: Tesla3_turret/tesla3_orbLeft
weight: 1
- path: Tesla3_turret/Tesla3_orbRight
weight: 1
maskType: 0
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 1
importLights: 0 importLights: 1
=======
importBlendShapes: 1
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1 optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
<<<<<<< HEAD
preserveHierarchy: 0 preserveHierarchy: 0
indexFormat: 1 indexFormat: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
<<<<<<< HEAD
previousCalculatedGlobalScale: 1 previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
tangentImportMode: 3 tangentImportMode: 3
<<<<<<< HEAD normalCalculationMode: 4
normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
normalSmoothingSource: 0 normalSmoothingSource: 0
importAnimation: 1 importAnimation: 1
copyAvatar: 0 copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2 serializedVersion: 2
=======
importAnimation: 1
copyAvatar: 0
humanDescription:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
human: [] human: []
skeleton: [] skeleton: []
armTwist: 0.5 armTwist: 0.5
@ -314,11 +108,8 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 1
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 11820194b6bcc6344b488d0bff870fea guid: 687465781237140468bf8260666deae7
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@ -1,7 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 731f1baa9d144a9897cb1d341c2092b8 guid: 11820194b6bcc6344b488d0bff870fea
folderAsset: yes PrefabImporter:
DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:

View File

@ -1,9 +1,8 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 409061a2e8974384988997c38739068e guid: 9864bf5f1cf6fad4bb3d7997cb106319
folderAsset: yes folderAsset: yes
timeCreated: 1483279444
licenseType: Store
DefaultImporter: DefaultImporter:
externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -1,17 +1,18 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: a8538e37515da8c4d82ba6bbb90c9037 guid: 398ff41a1c1bc21439cf6d6333361140
timeCreated: 1483280684
licenseType: Store
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
serializedVersion: 2 externalObjects: {}
serializedVersion: 9
mipmaps: mipmaps:
mipMapMode: 0 mipMapMode: 0
enableMipMap: 1 enableMipMap: 1
sRGBTexture: 1
linearTexture: 0 linearTexture: 0
correctGamma: 0
fadeOut: 0 fadeOut: 0
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -20,40 +21,68 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 0 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
mipBias: -1 mipBias: -100
wrapMode: -1 wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
rGBM: 0
compressionQuality: 50 compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 0 spriteMode: 0
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0 alphaIsTransparency: 0
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: -1 textureType: 0
buildTargetSettings: [] textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -1,9 +1,8 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 6aa47978d58f83c4db289fab198c6a06 guid: ed379de3bc0c8504f975ebe425a41aad
folderAsset: yes folderAsset: yes
timeCreated: 1483280676
licenseType: Store
DefaultImporter: DefaultImporter:
externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -1,17 +1,18 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 9caf5463874a8b24e96bdcc98aa0186f guid: 5ca1c007f2eaa7a44917c60f0581a1e2
timeCreated: 1483280684
licenseType: Store
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
serializedVersion: 2 externalObjects: {}
serializedVersion: 9
mipmaps: mipmaps:
mipMapMode: 0 mipMapMode: 0
enableMipMap: 1 enableMipMap: 1
sRGBTexture: 1
linearTexture: 0 linearTexture: 0
correctGamma: 0
fadeOut: 0 fadeOut: 0
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -20,40 +21,68 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 0 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
mipBias: -1 mipBias: -100
wrapMode: -1 wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
rGBM: 0
compressionQuality: 50 compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 0 spriteMode: 0
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0 alphaIsTransparency: 0
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: -1 textureType: 0
buildTargetSettings: [] textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -1,17 +1,18 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: d02a63368f3be5f488a83d4a37d271c7 guid: e34ba0ff4d526a84b80448bac9745ad3
timeCreated: 1483308139
licenseType: Store
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
serializedVersion: 2 externalObjects: {}
serializedVersion: 9
mipmaps: mipmaps:
mipMapMode: 0 mipMapMode: 0
enableMipMap: 1 enableMipMap: 1
sRGBTexture: 1
linearTexture: 0 linearTexture: 0
correctGamma: 0
fadeOut: 0 fadeOut: 0
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -20,40 +21,68 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 0 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
mipBias: -1 mipBias: -100
wrapMode: -1 wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
rGBM: 0
compressionQuality: 50 compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 0 spriteMode: 0
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0 alphaIsTransparency: 0
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: -1 textureType: 0
buildTargetSettings: [] textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -1,17 +1,18 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: c15c630d1d7af4c48878a3a999bef25b guid: 0475e687af39f444f8cd91e559ce5353
timeCreated: 1483308139
licenseType: Store
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
serializedVersion: 2 externalObjects: {}
serializedVersion: 9
mipmaps: mipmaps:
mipMapMode: 0 mipMapMode: 0
enableMipMap: 1 enableMipMap: 1
sRGBTexture: 1
linearTexture: 0 linearTexture: 0
correctGamma: 0
fadeOut: 0 fadeOut: 0
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -20,40 +21,68 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 0 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
mipBias: -1 mipBias: -100
wrapMode: -1 wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
rGBM: 0
compressionQuality: 50 compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 0 spriteMode: 0
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0 alphaIsTransparency: 0
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: -1 textureType: 0
buildTargetSettings: [] textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -1,17 +1,18 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 8e8d39ca1ef13574da35c26fe0725579 guid: b196838ecd0d96741957e4125b145014
timeCreated: 1483308138
licenseType: Store
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
serializedVersion: 2 externalObjects: {}
serializedVersion: 9
mipmaps: mipmaps:
mipMapMode: 0 mipMapMode: 0
enableMipMap: 1 enableMipMap: 1
sRGBTexture: 1
linearTexture: 0 linearTexture: 0
correctGamma: 0
fadeOut: 0 fadeOut: 0
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -20,40 +21,68 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 0 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
mipBias: -1 mipBias: -100
wrapMode: -1 wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
rGBM: 0
compressionQuality: 50 compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 0 spriteMode: 0
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0 alphaIsTransparency: 0
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: -1 textureType: 0
buildTargetSettings: [] textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -1,17 +1,18 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 91ef49a20de008547b73de106c88f08c guid: 14ed819e0e55002439cd2d16bf8eee31
timeCreated: 1483308138
licenseType: Store
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
serializedVersion: 2 externalObjects: {}
serializedVersion: 9
mipmaps: mipmaps:
mipMapMode: 0 mipMapMode: 0
enableMipMap: 1 enableMipMap: 1
sRGBTexture: 1
linearTexture: 0 linearTexture: 0
correctGamma: 0
fadeOut: 0 fadeOut: 0
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -20,40 +21,68 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 0 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
mipBias: -1 mipBias: -100
wrapMode: -1 wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
rGBM: 0
compressionQuality: 50 compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 0 spriteMode: 0
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0 alphaIsTransparency: 0
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: -1 textureType: 0
buildTargetSettings: [] textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -1,17 +1,18 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 3304d597ff157c94bb78db1ffc52b3d3 guid: d5fa2f91aaff3b645b8cfc35d820f360
timeCreated: 1483308138
licenseType: Store
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
serializedVersion: 2 externalObjects: {}
serializedVersion: 9
mipmaps: mipmaps:
mipMapMode: 0 mipMapMode: 0
enableMipMap: 1 enableMipMap: 1
sRGBTexture: 1
linearTexture: 0 linearTexture: 0
correctGamma: 0
fadeOut: 0 fadeOut: 0
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -20,40 +21,68 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 0 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
mipBias: -1 mipBias: -100
wrapMode: -1 wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
rGBM: 0
compressionQuality: 50 compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 0 spriteMode: 0
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0 alphaIsTransparency: 0
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: -1 textureType: 0
buildTargetSettings: [] textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -1,17 +1,18 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 8c795f0e4bbb74a4b97f2f56d8f9cced guid: 7e1147243a1f0b747bb09a3809f1ffa5
timeCreated: 1483280683
licenseType: Store
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
serializedVersion: 2 externalObjects: {}
serializedVersion: 9
mipmaps: mipmaps:
mipMapMode: 0 mipMapMode: 0
enableMipMap: 1 enableMipMap: 1
sRGBTexture: 1
linearTexture: 0 linearTexture: 0
correctGamma: 0
fadeOut: 0 fadeOut: 0
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -20,40 +21,68 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 0 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
mipBias: -1 mipBias: -100
wrapMode: -1 wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
rGBM: 0
compressionQuality: 50 compressionQuality: 50
allowsAlphaSplitting: 0
spriteMode: 0 spriteMode: 0
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0 alphaIsTransparency: 0
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: -1 textureType: 0
buildTargetSettings: [] textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant: