Hurlu/carnage
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge aie aie aie

Browse Source
This commit is contained in:
Alexandre Saubusse 2019-05-14 06:19:25 +02:00
commit a676a64317
269 changed files with 7074 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/GameManagerNetwork.cs
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e22a060a662253117aa8dfff72d1962bc54bb4623bb7d81d74cbc69da48f90f3
size 1578

8
Assets/Menus/Lobby/CarCustomImages.meta Normal file
View File

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

11
Assets/Menus/Lobby/CarDynamicModel.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0354b86fff9ce024cb2eb2dd6d6d92a0
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

3
Assets/Menus/Lobby/CarPlatform.blend
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d41bde724b5c18f31a0def11b706ce6ef87725e4e7dd956acbd91d04cfcd344b
size 496184

4
Assets/Menus/Lobby/ChoiceButton.cs
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:61634b40d6110adf40ae021516b422d525e4fb903cf9df3721d4576e7b4a965c oid sha256:0b0d70a5afe43fcda053fafe055c261b20b0cae0ff939894555ff164fd29b8cf
size 4871 size 4913

11
Assets/Menus/Lobby/EnsureTMPTextSize.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 7ac9a571c4fdbf04eb9fec7913e8292b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

4
Assets/Menus/Lobby/LobbyObjectiveInit.cs
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:b6693d0c7e75b4a65a94ccaa311cc67a6901b3267249a9e8e931f81c05929c1e oid sha256:fbb44214db84fec54c71848e6279fb456a92ce92ae8249727272af4aaa446407
size 987 size 951

11
Assets/Menus/Lobby/LobbyObjectiveInit.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 7ec8fdf72720193439ec155ce00f34a7
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Menus/Lobby/Models.meta Normal file
View File

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

0
Assets/Menus/Lobby/CarPlatform.blend.meta → Assets/Menus/Lobby/Models/CarPlatform.blend.meta~79efbfab432e0c255acb32491eb3e34efae6dc94
View File

0
Assets/Menus/Lobby/Models/CarPlatform.blend.meta → Assets/Menus/Lobby/Models/CarPlatform.blend.meta~HEAD
View File

3
Assets/Menus/Lobby/Models/Shotgun Model.prefab
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3c11e49457f39294501840815bbe30fa84cfe327f02270561574473feab08ec4
size 11875

7
Assets/Menus/Lobby/Objective Content.prefab.meta Normal file
View File

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

3
Assets/Menus/Lobby/PlayerIdentity.cs
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:07aef50acf6f1207dd84240943bcf8e9460aa37feceb72cad01acd3315cfd1f3
size 437

0
Assets/Menus/Lobby/PlayerIdentity.cs.meta → Assets/Menus/Network/PlayerIdentity.cs.meta
View File

4
Assets/Menus/WaitingRoom/WaitingRoomManager.cs
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:2d96b8f3fcf8890ed7e7b21534c6cf2f70dfa34f493fef04fee555aca1f2dcf1 oid sha256:a50b2f57cdcd926893fae1975ce5146e15b43e7029e3db050272bfc43aa4be5f
size 4490 size 4482

4
Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Outline.mat
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:ba1e8761abe2c6fda2a4370f06dc8855b367a2e47703d235f96b09d565c5fc77 oid sha256:b451ff7ac81663553c5e29fee6df9a4a7e1956503f80283fabf8795f608f750a
size 2977 size 3033

4
Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Glow.mat
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:a657a32bc4982fd8f94142b306e0fe8a521b24191c80b2c15df67a14688490ca oid sha256:fac16b3fad465d8eb18ad93697df54cc58e30e7dc5452bd708c2f4f08ae1f647
size 3137 size 3193

4
Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Logo.mat
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:f6423063be2b52536761c1954bf9bac46c4e7de31fe4fe498c83b390ca2917a7 oid sha256:65637bfac25a72e90c76abf26c0b056b9292e973b9e1a7b28705605801c3104d
size 2968 size 3024

4
Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:63d1c7ee93150949af21ddcc99a4b258c25115545cb781611145b8f87a641e39 oid sha256:1cdb708c57e4b37aedd69e865044b44bb0cf83d172d25485d2f2c73e1a763e3b
size 2155817 size 2155837

8
Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta Normal file
View File

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

8
Assets/Plugins/Tower Defence Turrets.meta Normal file
View File

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

9
Assets/Plugins/Tower Defence Turrets/FBXs.meta~79efbfab432e0c255acb32491eb3e34efae6dc94 Normal file
View File

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

0
Assets/Plugins/Tower Defence Turrets/FBXs.meta → Assets/Plugins/Tower Defence Turrets/FBXs.meta~HEAD
View File

45
Assets/Plugins/Tower Defence Turrets/FBXs/Basic_Level1.fbx.meta
View File

@ -1,13 +1,24 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 534831cd8970b4d44a0b9b0c1b40dcf2 guid: 534831cd8970b4d44a0b9b0c1b40dcf2
=======
guid: 41114f56c5f3b4847be6e9456f33fd0b
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels: labels:
- Gun - Gun
- gatling - gatling
- machinegun - machinegun
- tower - tower
- turret - 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
@ -39,38 +50,53 @@ ModelImporter:
7400004: ShieldDown 7400004: ShieldDown
7400006: ShieldUp 7400006: ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD
externalObjects: externalObjects:
- first: - first:
type: UnityEngine:Material type: UnityEngine:Material
assembly: UnityEngine.CoreModule assembly: UnityEngine.CoreModule
name: Basic_1 name: Basic_1
second: {fileID: 2100000, guid: ea1909320617464468e6af081a51ca64, type: 2} second: {fileID: 2100000, guid: ea1909320617464468e6af081a51ca64, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD
materialLocation: 0 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: []
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations: clipAnimations:
- serializedVersion: 16 - serializedVersion: 16
name: Building name: Building
@ -230,30 +256,41 @@ ModelImporter:
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 0
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 0
importLights: 0 importLights: 0
=======
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: 1
=======
>>>>>>> 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: 0 normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
@ -262,6 +299,11 @@ ModelImporter:
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
@ -273,8 +315,11 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

45
Assets/Plugins/Tower Defence Turrets/FBXs/Basic_Level2.fbx.meta
View File

@ -1,13 +1,24 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 91ddc9ba03543444c853257a31abd52d guid: 91ddc9ba03543444c853257a31abd52d
=======
guid: 3a5d592d4c49e234a8ec599bf0e33656
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels: labels:
- Gun - Gun
- gatling - gatling
- machinegun - machinegun
- tower - tower
- turret - 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
@ -39,38 +50,53 @@ ModelImporter:
7400004: B2_ShieldDown 7400004: B2_ShieldDown
7400006: B2_ShieldUp 7400006: B2_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD
externalObjects: externalObjects:
- first: - first:
type: UnityEngine:Material type: UnityEngine:Material
assembly: UnityEngine.CoreModule assembly: UnityEngine.CoreModule
name: Basic_2 name: Basic_2
second: {fileID: 2100000, guid: 25d5edd4c091c544e9f5624821c66a72, type: 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: 0 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: []
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations: clipAnimations:
- serializedVersion: 16 - serializedVersion: 16
name: B2_Building name: B2_Building
@ -230,30 +256,41 @@ ModelImporter:
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 0
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 0
importLights: 0 importLights: 0
=======
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: 1
=======
>>>>>>> 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: 0 normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
@ -262,6 +299,11 @@ ModelImporter:
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
@ -273,8 +315,11 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

45
Assets/Plugins/Tower Defence Turrets/FBXs/Basic_Level3.fbx.meta
View File

@ -1,13 +1,24 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: cc0dea20332a71d419956221115a31a5 guid: cc0dea20332a71d419956221115a31a5
=======
guid: 33ddf4a80a25baf419b7b1cfda300ee5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels: labels:
- Gun - Gun
- gatling - gatling
- machinegun - machinegun
- tower - tower
- turret - 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
@ -44,38 +55,53 @@ ModelImporter:
7400004: B3_ShieldDown 7400004: B3_ShieldDown
7400006: B3_ShieldUp 7400006: B3_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD
externalObjects: externalObjects:
- first: - first:
type: UnityEngine:Material type: UnityEngine:Material
assembly: UnityEngine.CoreModule assembly: UnityEngine.CoreModule
name: Basic_3 name: Basic_3
second: {fileID: 2100000, guid: b7e7195876436ef4b8ca5df5e0606c83, type: 2} second: {fileID: 2100000, guid: b7e7195876436ef4b8ca5df5e0606c83, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD
materialLocation: 0 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: []
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations: clipAnimations:
- serializedVersion: 16 - serializedVersion: 16
name: B3_Building name: B3_Building
@ -243,30 +269,41 @@ ModelImporter:
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 0
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 0
importLights: 0 importLights: 0
=======
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: 1
=======
>>>>>>> 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: 0 normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
@ -275,6 +312,11 @@ ModelImporter:
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
@ -286,8 +328,11 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

45
Assets/Plugins/Tower Defence Turrets/FBXs/Laser_Level1.fbx.meta
View File

@ -1,13 +1,24 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: b9a2d3052aa3c344bb14d635948d6b64 guid: b9a2d3052aa3c344bb14d635948d6b64
=======
guid: a68e661ad382e61479ba954ba7073351
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels: labels:
- Gun - Gun
- laser - laser
- lazer - lazer
- tower - tower
- turret - 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
@ -44,38 +55,53 @@ ModelImporter:
7400004: L1_SheldDown 7400004: L1_SheldDown
7400006: L1_ShieldUp 7400006: L1_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD
externalObjects: externalObjects:
- first: - first:
type: UnityEngine:Material type: UnityEngine:Material
assembly: UnityEngine.CoreModule assembly: UnityEngine.CoreModule
name: Laser_1 name: Laser_1
second: {fileID: 2100000, guid: e4dbcb672f282fc4aba8f8871dfb109b, type: 2} second: {fileID: 2100000, guid: e4dbcb672f282fc4aba8f8871dfb109b, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD
materialLocation: 0 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: []
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations: clipAnimations:
- serializedVersion: 16 - serializedVersion: 16
name: L1_Building name: L1_Building
@ -243,30 +269,41 @@ ModelImporter:
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 0
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 0
importLights: 0 importLights: 0
=======
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: 1
=======
>>>>>>> 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: 0 normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
@ -275,6 +312,11 @@ ModelImporter:
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
@ -286,8 +328,11 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

45
Assets/Plugins/Tower Defence Turrets/FBXs/Laser_Level2.fbx.meta
View File

@ -1,13 +1,24 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: b945f9060b1567a4bb75bf3cf9c5345e guid: b945f9060b1567a4bb75bf3cf9c5345e
=======
guid: e23e25bfa369167479153b9f54ab4752
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels: labels:
- Gun - Gun
- laser - laser
- lazer - lazer
- tower - tower
- turret - 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
@ -44,38 +55,53 @@ ModelImporter:
7400004: L2_ShieldDown 7400004: L2_ShieldDown
7400006: L2_ShieldUp 7400006: L2_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD
externalObjects: externalObjects:
- first: - first:
type: UnityEngine:Material type: UnityEngine:Material
assembly: UnityEngine.CoreModule assembly: UnityEngine.CoreModule
name: lambert15 name: lambert15
second: {fileID: 2100000, guid: 034a6be45c119ee438da4b3060a51dbe, type: 2} second: {fileID: 2100000, guid: 034a6be45c119ee438da4b3060a51dbe, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD
materialLocation: 0 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: []
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations: clipAnimations:
- serializedVersion: 16 - serializedVersion: 16
name: L2_Building name: L2_Building
@ -243,30 +269,41 @@ ModelImporter:
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 0
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 0
importLights: 0 importLights: 0
=======
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: 1
=======
>>>>>>> 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: 0 normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
@ -275,6 +312,11 @@ ModelImporter:
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
@ -286,8 +328,11 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

45
Assets/Plugins/Tower Defence Turrets/FBXs/Laser_Level3.fbx.meta
View File

@ -1,13 +1,24 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: c45f084fafac6054ea0e2dfef27c4d96 guid: c45f084fafac6054ea0e2dfef27c4d96
=======
guid: 527bc2352328fe74c9110c2f52e3cb66
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels: labels:
- Gun - Gun
- laser - laser
- lazer - lazer
- tower - tower
- turret - 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
@ -44,38 +55,53 @@ ModelImporter:
7400004: L3_ShieldDown 7400004: L3_ShieldDown
7400006: L3_ShieldUp 7400006: L3_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD
externalObjects: externalObjects:
- first: - first:
type: UnityEngine:Material type: UnityEngine:Material
assembly: UnityEngine.CoreModule assembly: UnityEngine.CoreModule
name: lambert16 name: lambert16
second: {fileID: 2100000, guid: 2f45eca49f3995741847717ffd33da3d, type: 2} second: {fileID: 2100000, guid: 2f45eca49f3995741847717ffd33da3d, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD
materialLocation: 0 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: []
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations: clipAnimations:
- serializedVersion: 16 - serializedVersion: 16
name: L3_Building name: L3_Building
@ -243,30 +269,41 @@ ModelImporter:
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 0
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 0
importLights: 0 importLights: 0
=======
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: 1
=======
>>>>>>> 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: 0 normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
@ -275,6 +312,11 @@ ModelImporter:
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
@ -286,8 +328,11 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

8
Assets/Plugins/Tower Defence Turrets/FBXs/Materials.meta
View File

@ -1,8 +1,16 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 4c58721a069ca284db041993dc6b12d8 guid: 4c58721a069ca284db041993dc6b12d8
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
=======
guid: f4385fe31032e3e43ada3dc4e8181e8b
folderAsset: yes
timeCreated: 1483288116
licenseType: Store
DefaultImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseB1.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: ea1909320617464468e6af081a51ca64 guid: ea1909320617464468e6af081a51ca64
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 6cbd7dc85132d594d90e878678574a59
timeCreated: 1483289946
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseB2.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 25d5edd4c091c544e9f5624821c66a72 guid: 25d5edd4c091c544e9f5624821c66a72
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: fe9569142df3916418dff6e31cb4bfd9
timeCreated: 1483289953
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseB3.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: b7e7195876436ef4b8ca5df5e0606c83 guid: b7e7195876436ef4b8ca5df5e0606c83
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 40ac55435b3b56a419a51588b26f6b82
timeCreated: 1483289959
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseL1.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: e4dbcb672f282fc4aba8f8871dfb109b guid: e4dbcb672f282fc4aba8f8871dfb109b
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: bb19f79dde536c4439a7998e5d5a9ee2
timeCreated: 1483289966
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseL2.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 034a6be45c119ee438da4b3060a51dbe guid: 034a6be45c119ee438da4b3060a51dbe
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 5d13e0fe0485360479a68f667a19cf71
timeCreated: 1483289972
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseL3.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 2f45eca49f3995741847717ffd33da3d guid: 2f45eca49f3995741847717ffd33da3d
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: f2319b15c9ceccd4ca178cf619de9014
timeCreated: 1483289977
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseR1.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 89b20baf85c7ee740a8c07cea17f5617 guid: 89b20baf85c7ee740a8c07cea17f5617
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 7255e7c6c7f223a47b2d44af64de92f7
timeCreated: 1483289982
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseR2.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: a68d994dad7316f458b439b9cae3a709 guid: a68d994dad7316f458b439b9cae3a709
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 9e030aca40e09b74d9299fd866571b80
timeCreated: 1483289989
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseR3.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: d3d60ab4d164cc84d9c3d0b18649fdcf guid: d3d60ab4d164cc84d9c3d0b18649fdcf
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 941c66344def53d4fbcabe265f50e3fa
timeCreated: 1483289995
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuse_t1.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 0fcf534e621a6754e9da1e6c763b69db guid: 0fcf534e621a6754e9da1e6c763b69db
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: d9708ff3ccba26c4885989c6bbe41c72
timeCreated: 1483290000
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuse_t2.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 854cbc5f3f050774ebe5b736bfe753b3 guid: 854cbc5f3f050774ebe5b736bfe753b3
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: fc5c95db7798aa54a855abe61dee4342
timeCreated: 1483290308
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuse_t3.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: a15e6f3f5f1ec9a489d4930fc5a7b923 guid: a15e6f3f5f1ec9a489d4930fc5a7b923
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 8f1cbbdd1f304fb4495cc123f3f691de
timeCreated: 1483290439
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

45
Assets/Plugins/Tower Defence Turrets/FBXs/Rocket_Level1.fbx.meta
View File

@ -1,12 +1,23 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 5b884fceac83e384c85c9d94a325299c guid: 5b884fceac83e384c85c9d94a325299c
=======
guid: 64d97d559ee3c274882d59046ccd6781
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels: labels:
- Gun - Gun
- rocket - rocket
- tower - tower
- turret - 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
@ -38,38 +49,53 @@ ModelImporter:
7400004: R1_ShieldDown 7400004: R1_ShieldDown
7400006: R1_ShieldUp 7400006: R1_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD
externalObjects: externalObjects:
- first: - first:
type: UnityEngine:Material type: UnityEngine:Material
assembly: UnityEngine.CoreModule assembly: UnityEngine.CoreModule
name: Rocket_1 name: Rocket_1
second: {fileID: 2100000, guid: 89b20baf85c7ee740a8c07cea17f5617, type: 2} second: {fileID: 2100000, guid: 89b20baf85c7ee740a8c07cea17f5617, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD
materialLocation: 0 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: []
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations: clipAnimations:
- serializedVersion: 16 - serializedVersion: 16
name: R1_Building name: R1_Building
@ -229,30 +255,41 @@ ModelImporter:
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 0
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 0
importLights: 0 importLights: 0
=======
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: 1
=======
>>>>>>> 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: 0 normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
@ -261,6 +298,11 @@ ModelImporter:
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
@ -272,8 +314,11 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

45
Assets/Plugins/Tower Defence Turrets/FBXs/Rocket_Level2.fbx.meta
View File

@ -1,12 +1,23 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 0b8d3d266ef632341bc8314f3057e150 guid: 0b8d3d266ef632341bc8314f3057e150
=======
guid: d2dddbb88b2ff9b40bcfcf899a3b56a9
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels: labels:
- Gun - Gun
- rocket - rocket
- tower - tower
- turret - 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
@ -38,38 +49,53 @@ ModelImporter:
7400004: R2_ShieldDown 7400004: R2_ShieldDown
7400006: R2_ShieldUp 7400006: R2_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD
externalObjects: externalObjects:
- first: - first:
type: UnityEngine:Material type: UnityEngine:Material
assembly: UnityEngine.CoreModule assembly: UnityEngine.CoreModule
name: Rocket_2 name: Rocket_2
second: {fileID: 2100000, guid: a68d994dad7316f458b439b9cae3a709, type: 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: 0 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: []
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations: clipAnimations:
- serializedVersion: 16 - serializedVersion: 16
name: R2_Building name: R2_Building
@ -229,30 +255,41 @@ ModelImporter:
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 0
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 0
importLights: 0 importLights: 0
=======
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: 1
=======
>>>>>>> 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: 0 normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
@ -261,6 +298,11 @@ ModelImporter:
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
@ -272,8 +314,11 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

45
Assets/Plugins/Tower Defence Turrets/FBXs/Rocket_Level3.fbx.meta
View File

@ -1,12 +1,23 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: e6f39ee1b1a64c14cb2afbbc60127caf guid: e6f39ee1b1a64c14cb2afbbc60127caf
=======
guid: a2fad7c5e55c0b640aa16b8bf0be7f18
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels: labels:
- Gun - Gun
- rocket - rocket
- tower - tower
- turret - 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
@ -38,38 +49,53 @@ ModelImporter:
7400004: R3_Shooting 7400004: R3_Shooting
7400006: R3_ShieldUp 7400006: R3_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD
externalObjects: externalObjects:
- first: - first:
type: UnityEngine:Material type: UnityEngine:Material
assembly: UnityEngine.CoreModule assembly: UnityEngine.CoreModule
name: Rocket_3 name: Rocket_3
second: {fileID: 2100000, guid: d3d60ab4d164cc84d9c3d0b18649fdcf, type: 2} second: {fileID: 2100000, guid: d3d60ab4d164cc84d9c3d0b18649fdcf, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD
materialLocation: 0 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: []
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations: clipAnimations:
- serializedVersion: 16 - serializedVersion: 16
name: R3_Building name: R3_Building
@ -229,30 +255,41 @@ ModelImporter:
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 0
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 0
importLights: 0 importLights: 0
=======
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: 1
=======
>>>>>>> 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: 0 normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
@ -261,6 +298,11 @@ ModelImporter:
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
@ -272,8 +314,11 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

45
Assets/Plugins/Tower Defence Turrets/FBXs/Tesla_Level1.fbx.meta
View File

@ -1,12 +1,23 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: c9585c729aa432f469d2530887004ace guid: c9585c729aa432f469d2530887004ace
=======
guid: 1015ac51b01675443a133858969b5126
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels: labels:
- Gun - Gun
- tesla - tesla
- tower - tower
- turret - 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
@ -28,38 +39,53 @@ ModelImporter:
7400004: T1_ShieldDown 7400004: T1_ShieldDown
7400006: T1_ShieldUp 7400006: T1_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD
externalObjects: externalObjects:
- first: - first:
type: UnityEngine:Material type: UnityEngine:Material
assembly: UnityEngine.CoreModule assembly: UnityEngine.CoreModule
name: Tesla_1 name: Tesla_1
second: {fileID: 2100000, guid: 0fcf534e621a6754e9da1e6c763b69db, type: 2} second: {fileID: 2100000, guid: 0fcf534e621a6754e9da1e6c763b69db, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD
materialLocation: 0 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: <Root Transform>
<<<<<<< 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: []
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations: clipAnimations:
- serializedVersion: 16 - serializedVersion: 16
name: T1_Building name: T1_Building
@ -203,30 +229,41 @@ ModelImporter:
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 0
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 0
importLights: 0 importLights: 0
=======
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: 1
=======
>>>>>>> 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: 0 normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
@ -235,6 +272,11 @@ ModelImporter:
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
@ -246,8 +288,11 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

45
Assets/Plugins/Tower Defence Turrets/FBXs/Tesla_Level2.fbx.meta
View File

@ -1,12 +1,23 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: de4fbb42e6e048e4aaa51ee411eb9388 guid: de4fbb42e6e048e4aaa51ee411eb9388
=======
guid: d1422c96a8703674498bc10f2661c792
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels: labels:
- Gun - Gun
- tesla - tesla
- tower - tower
- turret - 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
@ -33,38 +44,53 @@ ModelImporter:
7400004: T2_ShieldDown 7400004: T2_ShieldDown
7400006: T2_ShieldUp 7400006: T2_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD
externalObjects: externalObjects:
- first: - first:
type: UnityEngine:Material type: UnityEngine:Material
assembly: UnityEngine.CoreModule assembly: UnityEngine.CoreModule
name: Tesla_2 name: Tesla_2
second: {fileID: 2100000, guid: 854cbc5f3f050774ebe5b736bfe753b3, type: 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: 0 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: []
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations: clipAnimations:
- serializedVersion: 16 - serializedVersion: 16
name: T2_Building name: T2_Building
@ -216,30 +242,41 @@ ModelImporter:
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 0
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 0
importLights: 0 importLights: 0
=======
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: 1
=======
>>>>>>> 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: 0 normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
@ -248,6 +285,11 @@ ModelImporter:
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
@ -259,8 +301,11 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

45
Assets/Plugins/Tower Defence Turrets/FBXs/Tesla_Level3.fbx.meta
View File

@ -1,12 +1,23 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 668cfe22fc83ac24abe6a8e67544c4e6 guid: 668cfe22fc83ac24abe6a8e67544c4e6
=======
guid: c18131c0ca144db42a2bb106d0115544
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
labels: labels:
- Gun - Gun
- tesla - tesla
- tower - tower
- turret - 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
@ -38,38 +49,53 @@ ModelImporter:
7400004: T3_ShieldDown 7400004: T3_ShieldDown
7400006: T3_ShieldUp 7400006: T3_ShieldUp
9500000: //RootNode 9500000: //RootNode
<<<<<<< HEAD
externalObjects: externalObjects:
- first: - first:
type: UnityEngine:Material type: UnityEngine:Material
assembly: UnityEngine.CoreModule assembly: UnityEngine.CoreModule
name: Tesla_3 name: Tesla_3
second: {fileID: 2100000, guid: a15e6f3f5f1ec9a489d4930fc5a7b923, type: 2} second: {fileID: 2100000, guid: a15e6f3f5f1ec9a489d4930fc5a7b923, type: 2}
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
materials: materials:
importMaterials: 1 importMaterials: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
<<<<<<< HEAD
materialLocation: 0 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: []
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
clipAnimations: clipAnimations:
- serializedVersion: 16 - serializedVersion: 16
name: T3_Building name: T3_Building
@ -229,30 +255,41 @@ ModelImporter:
globalScale: 1 globalScale: 1
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
importVisibility: 0 importVisibility: 0
importBlendShapes: 1 importBlendShapes: 1
importCameras: 0 importCameras: 0
importLights: 0 importLights: 0
=======
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: 1
=======
>>>>>>> 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: 0 normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
@ -261,6 +298,11 @@ ModelImporter:
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
@ -272,8 +314,11 @@ ModelImporter:
feetSpacing: 0 feetSpacing: 0
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
<<<<<<< HEAD
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 0 skeletonHasParents: 0
=======
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1

8
Assets/Plugins/Tower Defence Turrets/Materials.meta
View File

@ -1,8 +1,16 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 540bfe0380056044fa0399831aa293db guid: 540bfe0380056044fa0399831aa293db
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
=======
guid: b6023887063ff874a9a938c4a33984ea
folderAsset: yes
timeCreated: 1483279398
licenseType: Store
DefaultImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Materials/Basic1.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 55eae1579925eb64e9a429ef28a1fd12 guid: 55eae1579925eb64e9a429ef28a1fd12
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 3717d9f6c5d2626429a28721f41fe09b
timeCreated: 1483280626
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Materials/Basic2.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 5426f0bff7fa04447bcedbbb4d5c2928 guid: 5426f0bff7fa04447bcedbbb4d5c2928
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: e9cc07ea16b0a00439b0e9509e868d38
timeCreated: 1483280625
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Materials/Basic3.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 0ee391917c6157343b141707f14828c6 guid: 0ee391917c6157343b141707f14828c6
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 2f9c490cade8cab4992150a67f998046
timeCreated: 1483280625
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Materials/Laser1.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 6a52337f0cc87b843958aa0a291b5443 guid: 6a52337f0cc87b843958aa0a291b5443
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: a2c5a40437ded6f46923634b45e70aef
timeCreated: 1483280627
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Materials/Laser2.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 17e51995d9e8dbc48ae1335d82ce9df0 guid: 17e51995d9e8dbc48ae1335d82ce9df0
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 989244c8e4768ae499ad80dbcc078ccc
timeCreated: 1483280627
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Materials/Laser3.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 885e4614c1bafa64ca9063237c3a1f71 guid: 885e4614c1bafa64ca9063237c3a1f71
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 8cf05101459607d4c91eabba6899d532
timeCreated: 1483280626
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Materials/Rockets1.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 1ad3bbb8a17a6164b924373ec3812327 guid: 1ad3bbb8a17a6164b924373ec3812327
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 55b98f94749070b41a3fbfce972daf42
timeCreated: 1483280626
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Materials/Rockets2.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: fcc5a4775d76ed54eb3a7ae73b3b7712 guid: fcc5a4775d76ed54eb3a7ae73b3b7712
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 7f5155becd692e54a84e8dc93d03d357
timeCreated: 1483280627
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Materials/Rockets3.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: f14b23b21ac4dda46897f8ffa6474cde guid: f14b23b21ac4dda46897f8ffa6474cde
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 508f4c9483f5a524d9fb026d74aaaaf1
timeCreated: 1483280626
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Materials/Tesla1.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: bf7c2591f99df8b44962b9ac64e3d896 guid: bf7c2591f99df8b44962b9ac64e3d896
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 7f533e6853703124e892882c4b01beb7
timeCreated: 1483280624
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Materials/Tesla2.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: ee61b9fb372b5fc4b99f9a1a61990767 guid: ee61b9fb372b5fc4b99f9a1a61990767
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 553fd635de39b9d4f9e032c167980ce9
timeCreated: 1483280627
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

3
Assets/Plugins/Tower Defence Turrets/Materials/Tesla3.mat
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:06b656ee10e67fd2b53dda81ff4af8e08f01564a76312ea4da10fa1886b764c2
size 2222

7
Assets/Plugins/Tower Defence Turrets/Materials/Tesla3.mat.meta
View File

@ -1,8 +1,15 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 29241dc81d1151949a3827a42117aeaf guid: 29241dc81d1151949a3827a42117aeaf
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 0 mainObjectFileID: 0
=======
guid: 6b2f302c745ea654a86d6007b59c3333
timeCreated: 1483279398
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

8
Assets/Plugins/Tower Defence Turrets/Prefabs.meta
View File

@ -1,8 +1,16 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: e4c4023722446ad4b9610574d4669757 guid: e4c4023722446ad4b9610574d4669757
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
=======
guid: ccfb33aa6ed3a5a4886706d23875cf35
folderAsset: yes
timeCreated: 1483280899
licenseType: Store
DefaultImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Prefabs/Basic_Level1.prefab.meta
View File

@ -1,7 +1,14 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: a6f04b7e096f2344d9eb35a6d3748c64 guid: a6f04b7e096f2344d9eb35a6d3748c64
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
=======
guid: c629adedc8f3c8149abe1b0ca12078e6
timeCreated: 1483281381
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Prefabs/Basic_Level2.prefab.meta
View File

@ -1,7 +1,14 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 111da0288907eba48aaaddbbd8c31319 guid: 111da0288907eba48aaaddbbd8c31319
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
=======
guid: 0ecde4bedcde3aa40a358e899d7cd0db
timeCreated: 1483281383
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Prefabs/Basic_Level3.prefab.meta
View File

@ -1,7 +1,14 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 1eea1f20ac6c2624a8334863bdf64225 guid: 1eea1f20ac6c2624a8334863bdf64225
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
=======
guid: 46c910e0a0365e14fba9f53417edd9f5
timeCreated: 1483281385
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Prefabs/Laser_Level1.prefab.meta
View File

@ -1,7 +1,14 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 7c6057e7f6b6fdf4ebbe25a5c96f85b0 guid: 7c6057e7f6b6fdf4ebbe25a5c96f85b0
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
=======
guid: 99d383f2cea821549a9b6398311d00e1
timeCreated: 1483281387
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Prefabs/Laser_Level2.prefab.meta
View File

@ -1,7 +1,14 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: c61b67b4b618b574899e1e8c4af68c96 guid: c61b67b4b618b574899e1e8c4af68c96
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
=======
guid: 8173d05f94b74c941a652c537abb0611
timeCreated: 1483281388
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Prefabs/Laser_Level3.prefab.meta
View File

@ -1,7 +1,14 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 262bdcba1a8145b4592c0342c42008d2 guid: 262bdcba1a8145b4592c0342c42008d2
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
=======
guid: 14dbc2dac89b25a4093bd9eaec6c2c64
timeCreated: 1483281391
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Prefabs/Rocket_Level1.prefab.meta
View File

@ -1,7 +1,14 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: aaf1c24373742744093616b899a70599 guid: aaf1c24373742744093616b899a70599
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
=======
guid: 1a695cec0737dde4e9d7e14386d68863
timeCreated: 1483281394
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Prefabs/Rocket_Level2.prefab.meta
View File

@ -1,7 +1,14 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: f8e9dda159693c74a978c011847cd507 guid: f8e9dda159693c74a978c011847cd507
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
=======
guid: b5cc8492e30246b48891c4d3e583d252
timeCreated: 1483281397
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Prefabs/Rocket_Level3.prefab.meta
View File

@ -1,7 +1,14 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: eba0d83bcfb557c42aa4b9985c1e1d9a guid: eba0d83bcfb557c42aa4b9985c1e1d9a
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
=======
guid: b5da5e91d3d933a479bd0627d7cc7298
timeCreated: 1483281399
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Prefabs/Tesla_Level1.prefab.meta
View File

@ -1,7 +1,14 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 050aaf241e091e64a975f79b069d8345 guid: 050aaf241e091e64a975f79b069d8345
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
=======
guid: d07549275ca8ca04f9a1c41f16471552
timeCreated: 1483281401
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Prefabs/Tesla_Level2.prefab.meta
View File

@ -1,7 +1,14 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 868cc57771dc5364d811f0c3dca1ec18 guid: 868cc57771dc5364d811f0c3dca1ec18
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
=======
guid: 732f849ef000e034ba54ddda4b8c9164
timeCreated: 1483281404
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Prefabs/Tesla_Level3.prefab.meta
View File

@ -1,7 +1,14 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: d8a9265add6e029409fb03278c1e19bb guid: d8a9265add6e029409fb03278c1e19bb
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
=======
guid: 29289ebc7c465d14abb284bce7ffa060
timeCreated: 1483280877
licenseType: Store
NativeFormatImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

7
Assets/Plugins/Tower Defence Turrets/Readme.txt.meta
View File

@ -1,7 +1,14 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: e4d0516129b1b984e984837f1c66847a guid: e4d0516129b1b984e984837f1c66847a
TextScriptImporter: TextScriptImporter:
externalObjects: {} externalObjects: {}
=======
guid: 0443240fece72cb40a8f5b488a47842c
timeCreated: 1483316232
licenseType: Store
TextScriptImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

8
Assets/Plugins/Tower Defence Turrets/Textures.meta
View File

@ -1,8 +1,16 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: ae3eb745d9210474b8f838ca4fd02534 guid: ae3eb745d9210474b8f838ca4fd02534
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
=======
guid: 80151ec9c1b8b9444b91fe7825d9575c
folderAsset: yes
timeCreated: 1483279437
licenseType: Store
DefaultImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

8
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1.meta
View File

@ -1,8 +1,16 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 4abbefbe18e9375479b995d3edb573f6 guid: 4abbefbe18e9375479b995d3edb573f6
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
=======
guid: 025518450926aa04c9b9228c587528d2
folderAsset: yes
timeCreated: 1483280675
licenseType: Store
DefaultImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/MetallicB1.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 01bad7a601fa1e843b5e511d8f46bbc9 guid: 01bad7a601fa1e843b5e511d8f46bbc9
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: b15d2bf521ab31e4984616a3b4cc6ef7
timeCreated: 1483280685
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuseB1.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 64a15da43ed5d0244b442087154e7747 guid: 64a15da43ed5d0244b442087154e7747
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: ad2d2f8ee431eb84ebacdc8f07781528
timeCreated: 1483280684
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_BW.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 899e1ffa20ad72a42bea1e832bca0bf8 guid: 899e1ffa20ad72a42bea1e832bca0bf8
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: 4fa39ba421fc1e74bb6cdbd8524d306a
timeCreated: 1483308026
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_WB.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 73307d2e3e5125944a04e481f05597e9 guid: 73307d2e3e5125944a04e481f05597e9
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: aa6dcb590fb5d4c42843d0df8cf3e50d
timeCreated: 1483308027
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_green.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: e1bf59949c6575e42bf4ee9f80a344da guid: e1bf59949c6575e42bf4ee9f80a344da
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: bd5161ca7413f134c85244dcc3982f6d
timeCreated: 1483308028
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_purple.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 4fc20477421a0594691c6a6e159032ee guid: 4fc20477421a0594691c6a6e159032ee
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: 7076022fe003df740860f93ed2ac5ef9
timeCreated: 1483308027
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_red.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 0ae8cdfbc0196744fbf343eb794ea754 guid: 0ae8cdfbc0196744fbf343eb794ea754
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: ea1cda569d4f31e468b30893e43e3adb
timeCreated: 1483308028
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

8
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2.meta
View File

@ -1,8 +1,16 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 57e825bc70c814947856dde2590e0147 guid: 57e825bc70c814947856dde2590e0147
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
=======
guid: 58c6027631d74d049b8ee24bcb42650e
folderAsset: yes
timeCreated: 1483280675
licenseType: Store
DefaultImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/MetallicB2.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 2a995ea40f1f7014b8d319a0e380fe47 guid: 2a995ea40f1f7014b8d319a0e380fe47
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: decf3bab3d357614ebf52de1fee4c53b
timeCreated: 1483280688
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuseB2.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 7a4d652e68871614e8f11bd871b7b9c0 guid: 7a4d652e68871614e8f11bd871b7b9c0
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: 0a85b89324f80d14da21fd7705bba959
timeCreated: 1483280677
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_BW.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: f8127622754968a468af3fef9d0b8de8 guid: f8127622754968a468af3fef9d0b8de8
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: ec66d600a8855724e85ab06a0f54d2ea
timeCreated: 1483308043
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_WB.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 3fa6682402f8dd24db80387c19bd642d guid: 3fa6682402f8dd24db80387c19bd642d
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: 30b0c1a8233b50e458dc666a76c32d92
timeCreated: 1483308042
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_green.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 1673a1904bc814d48b7e9923626989c1 guid: 1673a1904bc814d48b7e9923626989c1
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: 08f9daf36745ab044a28b4458b16376d
timeCreated: 1483308041
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_purple.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 00d3a9eecb6dbe94e987bdc1a3c1c0c3 guid: 00d3a9eecb6dbe94e987bdc1a3c1c0c3
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: 11d8960e046bc8245833c16c36c4411b
timeCreated: 1483308042
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_red.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 1df055e6904ba274697f0bb8edc8d946 guid: 1df055e6904ba274697f0bb8edc8d946
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: e1b34bb46ebd7d448aebabce531e4b66
timeCreated: 1483308042
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

8
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3.meta
View File

@ -1,8 +1,16 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 6fbd509b6becc8b42b2eac0bab00ed5f guid: 6fbd509b6becc8b42b2eac0bab00ed5f
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
=======
guid: a0749a8b16b66e041b6d884caa564466
folderAsset: yes
timeCreated: 1483280676
licenseType: Store
DefaultImporter:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/MetallicB3.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 350ab54c54e833d4c8314421022f0049 guid: 350ab54c54e833d4c8314421022f0049
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: 7228de1286c053848b759550ead8f0d6
timeCreated: 1483280682
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuseB3.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: c66bc639fed432b4ebf80589fa3ca2eb guid: c66bc639fed432b4ebf80589fa3ca2eb
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: db3c881e6b4c29f4781d39528d5b2636
timeCreated: 1483280688
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_BW.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 5c634b60735d7d741b57165fdcc581fa guid: 5c634b60735d7d741b57165fdcc581fa
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: 5dcdb302d1676634e844950001616375
timeCreated: 1483308051
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_WB.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: c2aac47cb2980e445826a630479a0624 guid: c2aac47cb2980e445826a630479a0624
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: e0a60ffe39df2c5409006e96d9ddaaec
timeCreated: 1483308052
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

49
Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_green.png.meta
View File

@ -1,4 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD
guid: 8dc5205207b80b64298acc7349bcfb79 guid: 8dc5205207b80b64298acc7349bcfb79
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
@ -13,6 +14,21 @@ TextureImporter:
borderMipMap: 0 borderMipMap: 0
mipMapsPreserveCoverage: 0 mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5 alphaTestReferenceValue: 0.5
=======
guid: e8f38c0a43043204c94d5c8ce2627fa3
timeCreated: 1483308052
licenseType: Store
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
mipMapFadeDistanceStart: 1 mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3 mipMapFadeDistanceEnd: 3
bumpmap: bumpmap:
@ -21,15 +37,24 @@ TextureImporter:
heightScale: 0.25 heightScale: 0.25
normalMapFilter: 0 normalMapFilter: 0
isReadable: 0 isReadable: 0
<<<<<<< HEAD
streamingMipmaps: 0 streamingMipmaps: 0
streamingMipmapsPriority: 0 streamingMipmapsPriority: 0
grayScaleToAlpha: 0 grayScaleToAlpha: 0
generateCubemap: 6 generateCubemap: 6
cubemapConvolution: 0 cubemapConvolution: 0
=======
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 7
cubemapConvolutionExponent: 1.5
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
seamlessCubemap: 0 seamlessCubemap: 0
textureFormat: -1 textureFormat: -1
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
<<<<<<< HEAD
serializedVersion: 2 serializedVersion: 2
filterMode: -1 filterMode: -1
aniso: -1 aniso: -1
@ -40,11 +65,23 @@ TextureImporter:
nPOTScale: 1 nPOTScale: 1
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
=======
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
rGBM: 0
compressionQuality: 50
allowsAlphaSplitting: 0
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
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}
<<<<<<< HEAD
spritePixelsToUnits: 100 spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
@ -69,10 +106,19 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
=======
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: -1
buildTargetSettings: []
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
<<<<<<< HEAD
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID:
@ -83,6 +129,9 @@ TextureImporter:
spritePackingTag: spritePackingTag:
pSDRemoveMatte: 0 pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0 pSDShowRemoveMatteOption: 0
=======
spritePackingTag:
>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

Some files were not shown because too many files have changed in this diff Show More