diff --git a/Assets/GameManagerNetwork.cs b/Assets/GameManagerNetwork.cs deleted file mode 100644 index da9eb9a..0000000 --- a/Assets/GameManagerNetwork.cs +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e22a060a662253117aa8dfff72d1962bc54bb4623bb7d81d74cbc69da48f90f3 -size 1578 diff --git a/Assets/Menus/Lobby/CarCustomImages.meta b/Assets/Menus/Lobby/CarCustomImages.meta new file mode 100644 index 0000000..f77fe80 --- /dev/null +++ b/Assets/Menus/Lobby/CarCustomImages.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ed9330e0b07b65a489a05e9a9c52d305 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/Lobby/CarDynamicModel.cs.meta b/Assets/Menus/Lobby/CarDynamicModel.cs.meta new file mode 100644 index 0000000..75830d2 --- /dev/null +++ b/Assets/Menus/Lobby/CarDynamicModel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0354b86fff9ce024cb2eb2dd6d6d92a0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/Lobby/CarPlatform.blend b/Assets/Menus/Lobby/CarPlatform.blend deleted file mode 100644 index a24ba8e..0000000 --- a/Assets/Menus/Lobby/CarPlatform.blend +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d41bde724b5c18f31a0def11b706ce6ef87725e4e7dd956acbd91d04cfcd344b -size 496184 diff --git a/Assets/Menus/Lobby/ChoiceButton.cs b/Assets/Menus/Lobby/ChoiceButton.cs index 2483a71..05e42d2 100644 --- a/Assets/Menus/Lobby/ChoiceButton.cs +++ b/Assets/Menus/Lobby/ChoiceButton.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:61634b40d6110adf40ae021516b422d525e4fb903cf9df3721d4576e7b4a965c -size 4871 +oid sha256:0b0d70a5afe43fcda053fafe055c261b20b0cae0ff939894555ff164fd29b8cf +size 4913 diff --git a/Assets/Menus/Lobby/EnsureTMPTextSize.cs.meta b/Assets/Menus/Lobby/EnsureTMPTextSize.cs.meta new file mode 100644 index 0000000..48e81d6 --- /dev/null +++ b/Assets/Menus/Lobby/EnsureTMPTextSize.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7ac9a571c4fdbf04eb9fec7913e8292b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/Lobby/LobbyObjectiveInit.cs b/Assets/Menus/Lobby/LobbyObjectiveInit.cs index 353d6ca..fee34e4 100644 --- a/Assets/Menus/Lobby/LobbyObjectiveInit.cs +++ b/Assets/Menus/Lobby/LobbyObjectiveInit.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6693d0c7e75b4a65a94ccaa311cc67a6901b3267249a9e8e931f81c05929c1e -size 987 +oid sha256:fbb44214db84fec54c71848e6279fb456a92ce92ae8249727272af4aaa446407 +size 951 diff --git a/Assets/Menus/Lobby/LobbyObjectiveInit.cs.meta b/Assets/Menus/Lobby/LobbyObjectiveInit.cs.meta new file mode 100644 index 0000000..9dbb448 --- /dev/null +++ b/Assets/Menus/Lobby/LobbyObjectiveInit.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7ec8fdf72720193439ec155ce00f34a7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/Lobby/Models.meta b/Assets/Menus/Lobby/Models.meta new file mode 100644 index 0000000..e0e26ab --- /dev/null +++ b/Assets/Menus/Lobby/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 09479c85cfb6fd140ac52b4fb051667a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/Lobby/CarPlatform.blend.meta b/Assets/Menus/Lobby/Models/CarPlatform.blend.meta~79efbfab432e0c255acb32491eb3e34efae6dc94 similarity index 100% rename from Assets/Menus/Lobby/CarPlatform.blend.meta rename to Assets/Menus/Lobby/Models/CarPlatform.blend.meta~79efbfab432e0c255acb32491eb3e34efae6dc94 diff --git a/Assets/Menus/Lobby/Models/CarPlatform.blend.meta b/Assets/Menus/Lobby/Models/CarPlatform.blend.meta~HEAD similarity index 100% rename from Assets/Menus/Lobby/Models/CarPlatform.blend.meta rename to Assets/Menus/Lobby/Models/CarPlatform.blend.meta~HEAD diff --git a/Assets/Menus/Lobby/Models/Shotgun Model.prefab b/Assets/Menus/Lobby/Models/Shotgun Model.prefab index e69de29..172f861 100644 --- a/Assets/Menus/Lobby/Models/Shotgun Model.prefab +++ b/Assets/Menus/Lobby/Models/Shotgun Model.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c11e49457f39294501840815bbe30fa84cfe327f02270561574473feab08ec4 +size 11875 diff --git a/Assets/Menus/Lobby/Objective Content.prefab.meta b/Assets/Menus/Lobby/Objective Content.prefab.meta new file mode 100644 index 0000000..6050d93 --- /dev/null +++ b/Assets/Menus/Lobby/Objective Content.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 44f5c43c00d0cc34fa6f3227f064e234 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/Lobby/PlayerIdentity.cs b/Assets/Menus/Lobby/PlayerIdentity.cs deleted file mode 100644 index 7570508..0000000 --- a/Assets/Menus/Lobby/PlayerIdentity.cs +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07aef50acf6f1207dd84240943bcf8e9460aa37feceb72cad01acd3315cfd1f3 -size 437 diff --git a/Assets/Menus/Lobby/PlayerIdentity.cs.meta b/Assets/Menus/Network/PlayerIdentity.cs.meta similarity index 100% rename from Assets/Menus/Lobby/PlayerIdentity.cs.meta rename to Assets/Menus/Network/PlayerIdentity.cs.meta diff --git a/Assets/Menus/WaitingRoom/WaitingRoomManager.cs b/Assets/Menus/WaitingRoom/WaitingRoomManager.cs index de277c3..476e235 100644 --- a/Assets/Menus/WaitingRoom/WaitingRoomManager.cs +++ b/Assets/Menus/WaitingRoom/WaitingRoomManager.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d96b8f3fcf8890ed7e7b21534c6cf2f70dfa34f493fef04fee555aca1f2dcf1 -size 4490 +oid sha256:a50b2f57cdcd926893fae1975ce5146e15b43e7029e3db050272bfc43aa4be5f +size 4482 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Outline.mat b/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Outline.mat index 7bfb699..82cca81 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Outline.mat +++ b/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Outline.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba1e8761abe2c6fda2a4370f06dc8855b367a2e47703d235f96b09d565c5fc77 -size 2977 +oid sha256:b451ff7ac81663553c5e29fee6df9a4a7e1956503f80283fabf8795f608f750a +size 3033 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Glow.mat b/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Glow.mat index ddba6e5..06212fe 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Glow.mat +++ b/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Glow.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a657a32bc4982fd8f94142b306e0fe8a521b24191c80b2c15df67a14688490ca -size 3137 +oid sha256:fac16b3fad465d8eb18ad93697df54cc58e30e7dc5452bd708c2f4f08ae1f647 +size 3193 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Logo.mat b/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Logo.mat index 94a27e1..e36c444 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Logo.mat +++ b/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Logo.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6423063be2b52536761c1954bf9bac46c4e7de31fe4fe498c83b390ca2917a7 -size 2968 +oid sha256:65637bfac25a72e90c76abf26c0b056b9292e973b9e1a7b28705605801c3104d +size 3024 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset b/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset index 1c5fef1..86d0f46 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset +++ b/Assets/Plugins/TextMesh Pro/Resources/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63d1c7ee93150949af21ddcc99a4b258c25115545cb781611145b8f87a641e39 -size 2155817 +oid sha256:1cdb708c57e4b37aedd69e865044b44bb0cf83d172d25485d2f2c73e1a763e3b +size 2155837 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta new file mode 100644 index 0000000..55df787 --- /dev/null +++ b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 731f1baa9d144a9897cb1d341c2092b8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets.meta b/Assets/Plugins/Tower Defence Turrets.meta new file mode 100644 index 0000000..808bb6c --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 80cf61f5062b17e44adae3e4efb3fe68 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs.meta~79efbfab432e0c255acb32491eb3e34efae6dc94 b/Assets/Plugins/Tower Defence Turrets/FBXs.meta~79efbfab432e0c255acb32491eb3e34efae6dc94 new file mode 100644 index 0000000..b27d122 --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/FBXs.meta~79efbfab432e0c255acb32491eb3e34efae6dc94 @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 409061a2e8974384988997c38739068e +folderAsset: yes +timeCreated: 1483279444 +licenseType: Store +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs.meta b/Assets/Plugins/Tower Defence Turrets/FBXs.meta~HEAD similarity index 100% rename from Assets/Plugins/Tower Defence Turrets/FBXs.meta rename to Assets/Plugins/Tower Defence Turrets/FBXs.meta~HEAD diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Basic_Level1.fbx.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Basic_Level1.fbx.meta index ddd7afa..f769d6e 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Basic_Level1.fbx.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Basic_Level1.fbx.meta @@ -1,13 +1,24 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 534831cd8970b4d44a0b9b0c1b40dcf2 +======= +guid: 41114f56c5f3b4847be6e9456f33fd0b +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 labels: - Gun - gatling - machinegun - tower - turret +<<<<<<< HEAD ModelImporter: serializedVersion: 23 +======= +timeCreated: 1483280626 +licenseType: Store +ModelImporter: + serializedVersion: 19 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 fileIDToRecycleName: 100000: Basic1_gun 100002: Basic1_turretLower @@ -39,38 +50,53 @@ ModelImporter: 7400004: ShieldDown 7400006: ShieldUp 9500000: //RootNode +<<<<<<< HEAD externalObjects: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: Basic_1 second: {fileID: 2100000, guid: ea1909320617464468e6af081a51ca64, type: 2} +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 materials: importMaterials: 1 materialName: 0 materialSearch: 1 +<<<<<<< HEAD materialLocation: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: +<<<<<<< HEAD rigImportErrors: rigImportWarnings: +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 +<<<<<<< HEAD importAnimatedCustomProperties: 0 importConstraints: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] +<<<<<<< HEAD extraUserProperties: [] +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 clipAnimations: - serializedVersion: 16 name: Building @@ -230,30 +256,41 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 +<<<<<<< HEAD useSRGBMaterialColor: 1 importVisibility: 0 importBlendShapes: 1 importCameras: 0 importLights: 0 +======= + importBlendShapes: 1 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 +<<<<<<< HEAD preserveHierarchy: 0 indexFormat: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 +<<<<<<< HEAD previousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 +<<<<<<< HEAD normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 blendShapeNormalImportMode: 1 @@ -262,6 +299,11 @@ ModelImporter: copyAvatar: 0 humanDescription: serializedVersion: 2 +======= + importAnimation: 1 + copyAvatar: 0 + humanDescription: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 human: [] skeleton: [] armTwist: 0.5 @@ -273,8 +315,11 @@ ModelImporter: feetSpacing: 0 rootMotionBoneName: hasTranslationDoF: 0 +<<<<<<< HEAD hasExtraRoot: 0 skeletonHasParents: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 2 humanoidOversampling: 1 diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Basic_Level2.fbx.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Basic_Level2.fbx.meta index 1866527..1c0e02a 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Basic_Level2.fbx.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Basic_Level2.fbx.meta @@ -1,13 +1,24 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 91ddc9ba03543444c853257a31abd52d +======= +guid: 3a5d592d4c49e234a8ec599bf0e33656 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 labels: - Gun - gatling - machinegun - tower - turret +<<<<<<< HEAD ModelImporter: serializedVersion: 23 +======= +timeCreated: 1483280625 +licenseType: Store +ModelImporter: + serializedVersion: 19 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 fileIDToRecycleName: 100000: Basic2_guns 100002: Basic2_turretLower @@ -39,38 +50,53 @@ ModelImporter: 7400004: B2_ShieldDown 7400006: B2_ShieldUp 9500000: //RootNode +<<<<<<< HEAD externalObjects: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: Basic_2 second: {fileID: 2100000, guid: 25d5edd4c091c544e9f5624821c66a72, type: 2} +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 materials: importMaterials: 1 materialName: 0 materialSearch: 1 +<<<<<<< HEAD materialLocation: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: +<<<<<<< HEAD rigImportErrors: rigImportWarnings: +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 +<<<<<<< HEAD importAnimatedCustomProperties: 0 importConstraints: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] +<<<<<<< HEAD extraUserProperties: [] +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 clipAnimations: - serializedVersion: 16 name: B2_Building @@ -230,30 +256,41 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 +<<<<<<< HEAD useSRGBMaterialColor: 1 importVisibility: 0 importBlendShapes: 1 importCameras: 0 importLights: 0 +======= + importBlendShapes: 1 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 +<<<<<<< HEAD preserveHierarchy: 0 indexFormat: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 +<<<<<<< HEAD previousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 +<<<<<<< HEAD normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 blendShapeNormalImportMode: 1 @@ -262,6 +299,11 @@ ModelImporter: copyAvatar: 0 humanDescription: serializedVersion: 2 +======= + importAnimation: 1 + copyAvatar: 0 + humanDescription: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 human: [] skeleton: [] armTwist: 0.5 @@ -273,8 +315,11 @@ ModelImporter: feetSpacing: 0 rootMotionBoneName: hasTranslationDoF: 0 +<<<<<<< HEAD hasExtraRoot: 0 skeletonHasParents: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 2 humanoidOversampling: 1 diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Basic_Level3.fbx.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Basic_Level3.fbx.meta index 026d31e..2373331 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Basic_Level3.fbx.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Basic_Level3.fbx.meta @@ -1,13 +1,24 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: cc0dea20332a71d419956221115a31a5 +======= +guid: 33ddf4a80a25baf419b7b1cfda300ee5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 labels: - Gun - gatling - machinegun - tower - turret +<<<<<<< HEAD ModelImporter: serializedVersion: 23 +======= +timeCreated: 1483280625 +licenseType: Store +ModelImporter: + serializedVersion: 19 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 fileIDToRecycleName: 100000: Basic3_gunsLow 100002: Basic3_gunsUp @@ -44,38 +55,53 @@ ModelImporter: 7400004: B3_ShieldDown 7400006: B3_ShieldUp 9500000: //RootNode +<<<<<<< HEAD externalObjects: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: Basic_3 second: {fileID: 2100000, guid: b7e7195876436ef4b8ca5df5e0606c83, type: 2} +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 materials: importMaterials: 1 materialName: 0 materialSearch: 1 +<<<<<<< HEAD materialLocation: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: +<<<<<<< HEAD rigImportErrors: rigImportWarnings: +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 +<<<<<<< HEAD importAnimatedCustomProperties: 0 importConstraints: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] +<<<<<<< HEAD extraUserProperties: [] +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 clipAnimations: - serializedVersion: 16 name: B3_Building @@ -243,30 +269,41 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 +<<<<<<< HEAD useSRGBMaterialColor: 1 importVisibility: 0 importBlendShapes: 1 importCameras: 0 importLights: 0 +======= + importBlendShapes: 1 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 +<<<<<<< HEAD preserveHierarchy: 0 indexFormat: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 +<<<<<<< HEAD previousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 +<<<<<<< HEAD normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 blendShapeNormalImportMode: 1 @@ -275,6 +312,11 @@ ModelImporter: copyAvatar: 0 humanDescription: serializedVersion: 2 +======= + importAnimation: 1 + copyAvatar: 0 + humanDescription: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 human: [] skeleton: [] armTwist: 0.5 @@ -286,8 +328,11 @@ ModelImporter: feetSpacing: 0 rootMotionBoneName: hasTranslationDoF: 0 +<<<<<<< HEAD hasExtraRoot: 0 skeletonHasParents: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 2 humanoidOversampling: 1 diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Laser_Level1.fbx.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Laser_Level1.fbx.meta index 6eb1fa3..d25e878 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Laser_Level1.fbx.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Laser_Level1.fbx.meta @@ -1,13 +1,24 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: b9a2d3052aa3c344bb14d635948d6b64 +======= +guid: a68e661ad382e61479ba954ba7073351 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 labels: - Gun - laser - lazer - tower - turret +<<<<<<< HEAD ModelImporter: serializedVersion: 23 +======= +timeCreated: 1483280627 +licenseType: Store +ModelImporter: + serializedVersion: 19 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 fileIDToRecycleName: 100000: laser1_gun 100002: laser1_platform @@ -44,38 +55,53 @@ ModelImporter: 7400004: L1_SheldDown 7400006: L1_ShieldUp 9500000: //RootNode +<<<<<<< HEAD externalObjects: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: Laser_1 second: {fileID: 2100000, guid: e4dbcb672f282fc4aba8f8871dfb109b, type: 2} +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 materials: importMaterials: 1 materialName: 0 materialSearch: 1 +<<<<<<< HEAD materialLocation: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: +<<<<<<< HEAD rigImportErrors: rigImportWarnings: +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 +<<<<<<< HEAD importAnimatedCustomProperties: 0 importConstraints: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] +<<<<<<< HEAD extraUserProperties: [] +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 clipAnimations: - serializedVersion: 16 name: L1_Building @@ -243,30 +269,41 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 +<<<<<<< HEAD useSRGBMaterialColor: 1 importVisibility: 0 importBlendShapes: 1 importCameras: 0 importLights: 0 +======= + importBlendShapes: 1 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 +<<<<<<< HEAD preserveHierarchy: 0 indexFormat: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 +<<<<<<< HEAD previousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 +<<<<<<< HEAD normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 blendShapeNormalImportMode: 1 @@ -275,6 +312,11 @@ ModelImporter: copyAvatar: 0 humanDescription: serializedVersion: 2 +======= + importAnimation: 1 + copyAvatar: 0 + humanDescription: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 human: [] skeleton: [] armTwist: 0.5 @@ -286,8 +328,11 @@ ModelImporter: feetSpacing: 0 rootMotionBoneName: hasTranslationDoF: 0 +<<<<<<< HEAD hasExtraRoot: 0 skeletonHasParents: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 2 humanoidOversampling: 1 diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Laser_Level2.fbx.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Laser_Level2.fbx.meta index 7e7308d..f121a39 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Laser_Level2.fbx.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Laser_Level2.fbx.meta @@ -1,13 +1,24 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: b945f9060b1567a4bb75bf3cf9c5345e +======= +guid: e23e25bfa369167479153b9f54ab4752 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 labels: - Gun - laser - lazer - tower - turret +<<<<<<< HEAD ModelImporter: serializedVersion: 23 +======= +timeCreated: 1483280627 +licenseType: Store +ModelImporter: + serializedVersion: 19 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 fileIDToRecycleName: 100000: laser2_guns 100002: laser2_platform @@ -44,38 +55,53 @@ ModelImporter: 7400004: L2_ShieldDown 7400006: L2_ShieldUp 9500000: //RootNode +<<<<<<< HEAD externalObjects: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: lambert15 second: {fileID: 2100000, guid: 034a6be45c119ee438da4b3060a51dbe, type: 2} +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 materials: importMaterials: 1 materialName: 0 materialSearch: 1 +<<<<<<< HEAD materialLocation: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: +<<<<<<< HEAD rigImportErrors: rigImportWarnings: +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 +<<<<<<< HEAD importAnimatedCustomProperties: 0 importConstraints: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] +<<<<<<< HEAD extraUserProperties: [] +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 clipAnimations: - serializedVersion: 16 name: L2_Building @@ -243,30 +269,41 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 +<<<<<<< HEAD useSRGBMaterialColor: 1 importVisibility: 0 importBlendShapes: 1 importCameras: 0 importLights: 0 +======= + importBlendShapes: 1 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 +<<<<<<< HEAD preserveHierarchy: 0 indexFormat: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 +<<<<<<< HEAD previousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 +<<<<<<< HEAD normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 blendShapeNormalImportMode: 1 @@ -275,6 +312,11 @@ ModelImporter: copyAvatar: 0 humanDescription: serializedVersion: 2 +======= + importAnimation: 1 + copyAvatar: 0 + humanDescription: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 human: [] skeleton: [] armTwist: 0.5 @@ -286,8 +328,11 @@ ModelImporter: feetSpacing: 0 rootMotionBoneName: hasTranslationDoF: 0 +<<<<<<< HEAD hasExtraRoot: 0 skeletonHasParents: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 2 humanoidOversampling: 1 diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Laser_Level3.fbx.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Laser_Level3.fbx.meta index 6920d60..76efce0 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Laser_Level3.fbx.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Laser_Level3.fbx.meta @@ -1,13 +1,24 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: c45f084fafac6054ea0e2dfef27c4d96 +======= +guid: 527bc2352328fe74c9110c2f52e3cb66 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 labels: - Gun - laser - lazer - tower - turret +<<<<<<< HEAD ModelImporter: serializedVersion: 23 +======= +timeCreated: 1483280626 +licenseType: Store +ModelImporter: + serializedVersion: 19 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 fileIDToRecycleName: 100000: laser3_guns 100002: laser3_platform @@ -44,38 +55,53 @@ ModelImporter: 7400004: L3_ShieldDown 7400006: L3_ShieldUp 9500000: //RootNode +<<<<<<< HEAD externalObjects: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: lambert16 second: {fileID: 2100000, guid: 2f45eca49f3995741847717ffd33da3d, type: 2} +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 materials: importMaterials: 1 materialName: 0 materialSearch: 1 +<<<<<<< HEAD materialLocation: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: +<<<<<<< HEAD rigImportErrors: rigImportWarnings: +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 +<<<<<<< HEAD importAnimatedCustomProperties: 0 importConstraints: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] +<<<<<<< HEAD extraUserProperties: [] +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 clipAnimations: - serializedVersion: 16 name: L3_Building @@ -243,30 +269,41 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 +<<<<<<< HEAD useSRGBMaterialColor: 1 importVisibility: 0 importBlendShapes: 1 importCameras: 0 importLights: 0 +======= + importBlendShapes: 1 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 +<<<<<<< HEAD preserveHierarchy: 0 indexFormat: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 +<<<<<<< HEAD previousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 +<<<<<<< HEAD normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 blendShapeNormalImportMode: 1 @@ -275,6 +312,11 @@ ModelImporter: copyAvatar: 0 humanDescription: serializedVersion: 2 +======= + importAnimation: 1 + copyAvatar: 0 + humanDescription: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 human: [] skeleton: [] armTwist: 0.5 @@ -286,8 +328,11 @@ ModelImporter: feetSpacing: 0 rootMotionBoneName: hasTranslationDoF: 0 +<<<<<<< HEAD hasExtraRoot: 0 skeletonHasParents: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 2 humanoidOversampling: 1 diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials.meta index 6b0ea19..dafdac1 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials.meta @@ -1,8 +1,16 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 4c58721a069ca284db041993dc6b12d8 folderAsset: yes DefaultImporter: externalObjects: {} +======= +guid: f4385fe31032e3e43ada3dc4e8181e8b +folderAsset: yes +timeCreated: 1483288116 +licenseType: Store +DefaultImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseB1.mat.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseB1.mat.meta index 5e48333..71b8254 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseB1.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseB1.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: ea1909320617464468e6af081a51ca64 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 6cbd7dc85132d594d90e878678574a59 +timeCreated: 1483289946 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseB2.mat.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseB2.mat.meta index dcadf26..9351365 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseB2.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseB2.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 25d5edd4c091c544e9f5624821c66a72 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: fe9569142df3916418dff6e31cb4bfd9 +timeCreated: 1483289953 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseB3.mat.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseB3.mat.meta index 9d47489..621718c 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseB3.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseB3.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: b7e7195876436ef4b8ca5df5e0606c83 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 40ac55435b3b56a419a51588b26f6b82 +timeCreated: 1483289959 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseL1.mat.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseL1.mat.meta index b987455..fd1f575 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseL1.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseL1.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: e4dbcb672f282fc4aba8f8871dfb109b NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: bb19f79dde536c4439a7998e5d5a9ee2 +timeCreated: 1483289966 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseL2.mat.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseL2.mat.meta index d2ad6e2..eed2387 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseL2.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseL2.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 034a6be45c119ee438da4b3060a51dbe NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 5d13e0fe0485360479a68f667a19cf71 +timeCreated: 1483289972 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseL3.mat.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseL3.mat.meta index cc79453..795ca0a 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseL3.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseL3.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 2f45eca49f3995741847717ffd33da3d NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: f2319b15c9ceccd4ca178cf619de9014 +timeCreated: 1483289977 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseR1.mat.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseR1.mat.meta index 3803d3a..8e1dec7 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseR1.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseR1.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 89b20baf85c7ee740a8c07cea17f5617 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 7255e7c6c7f223a47b2d44af64de92f7 +timeCreated: 1483289982 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseR2.mat.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseR2.mat.meta index 165b1d5..8512ba3 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseR2.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseR2.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: a68d994dad7316f458b439b9cae3a709 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 9e030aca40e09b74d9299fd866571b80 +timeCreated: 1483289989 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseR3.mat.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseR3.mat.meta index 85764b9..b7a8b8a 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseR3.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuseR3.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: d3d60ab4d164cc84d9c3d0b18649fdcf NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 941c66344def53d4fbcabe265f50e3fa +timeCreated: 1483289995 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuse_t1.mat.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuse_t1.mat.meta index 83df6c4..433cdc3 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuse_t1.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuse_t1.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 0fcf534e621a6754e9da1e6c763b69db NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: d9708ff3ccba26c4885989c6bbe41c72 +timeCreated: 1483290000 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuse_t2.mat.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuse_t2.mat.meta index 2de6682..c35766c 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuse_t2.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuse_t2.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 854cbc5f3f050774ebe5b736bfe753b3 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: fc5c95db7798aa54a855abe61dee4342 +timeCreated: 1483290308 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuse_t3.mat.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuse_t3.mat.meta index 480e903..28ac87a 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuse_t3.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Materials/diffuse_t3.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: a15e6f3f5f1ec9a489d4930fc5a7b923 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 8f1cbbdd1f304fb4495cc123f3f691de +timeCreated: 1483290439 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Rocket_Level1.fbx.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Rocket_Level1.fbx.meta index 8dcc276..fe35a48 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Rocket_Level1.fbx.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Rocket_Level1.fbx.meta @@ -1,12 +1,23 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 5b884fceac83e384c85c9d94a325299c +======= +guid: 64d97d559ee3c274882d59046ccd6781 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 labels: - Gun - rocket - tower - turret +<<<<<<< HEAD ModelImporter: serializedVersion: 23 +======= +timeCreated: 1483280626 +licenseType: Store +ModelImporter: + serializedVersion: 19 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 fileIDToRecycleName: 100000: Rocket1_Guns 100002: Rocket1_Platform @@ -38,38 +49,53 @@ ModelImporter: 7400004: R1_ShieldDown 7400006: R1_ShieldUp 9500000: //RootNode +<<<<<<< HEAD externalObjects: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: Rocket_1 second: {fileID: 2100000, guid: 89b20baf85c7ee740a8c07cea17f5617, type: 2} +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 materials: importMaterials: 1 materialName: 0 materialSearch: 1 +<<<<<<< HEAD materialLocation: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: +<<<<<<< HEAD rigImportErrors: rigImportWarnings: +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 +<<<<<<< HEAD importAnimatedCustomProperties: 0 importConstraints: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] +<<<<<<< HEAD extraUserProperties: [] +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 clipAnimations: - serializedVersion: 16 name: R1_Building @@ -229,30 +255,41 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 +<<<<<<< HEAD useSRGBMaterialColor: 1 importVisibility: 0 importBlendShapes: 1 importCameras: 0 importLights: 0 +======= + importBlendShapes: 1 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 +<<<<<<< HEAD preserveHierarchy: 0 indexFormat: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 +<<<<<<< HEAD previousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 +<<<<<<< HEAD normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 blendShapeNormalImportMode: 1 @@ -261,6 +298,11 @@ ModelImporter: copyAvatar: 0 humanDescription: serializedVersion: 2 +======= + importAnimation: 1 + copyAvatar: 0 + humanDescription: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 human: [] skeleton: [] armTwist: 0.5 @@ -272,8 +314,11 @@ ModelImporter: feetSpacing: 0 rootMotionBoneName: hasTranslationDoF: 0 +<<<<<<< HEAD hasExtraRoot: 0 skeletonHasParents: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 2 humanoidOversampling: 1 diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Rocket_Level2.fbx.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Rocket_Level2.fbx.meta index 4de108a..d8e5c70 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Rocket_Level2.fbx.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Rocket_Level2.fbx.meta @@ -1,12 +1,23 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 0b8d3d266ef632341bc8314f3057e150 +======= +guid: d2dddbb88b2ff9b40bcfcf899a3b56a9 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 labels: - Gun - rocket - tower - turret +<<<<<<< HEAD ModelImporter: serializedVersion: 23 +======= +timeCreated: 1483280627 +licenseType: Store +ModelImporter: + serializedVersion: 19 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 fileIDToRecycleName: 100000: Rocket2_base 100002: Rocket2_guns @@ -38,38 +49,53 @@ ModelImporter: 7400004: R2_ShieldDown 7400006: R2_ShieldUp 9500000: //RootNode +<<<<<<< HEAD externalObjects: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: Rocket_2 second: {fileID: 2100000, guid: a68d994dad7316f458b439b9cae3a709, type: 2} +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 materials: importMaterials: 1 materialName: 0 materialSearch: 1 +<<<<<<< HEAD materialLocation: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: +<<<<<<< HEAD rigImportErrors: rigImportWarnings: +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 +<<<<<<< HEAD importAnimatedCustomProperties: 0 importConstraints: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] +<<<<<<< HEAD extraUserProperties: [] +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 clipAnimations: - serializedVersion: 16 name: R2_Building @@ -229,30 +255,41 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 +<<<<<<< HEAD useSRGBMaterialColor: 1 importVisibility: 0 importBlendShapes: 1 importCameras: 0 importLights: 0 +======= + importBlendShapes: 1 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 +<<<<<<< HEAD preserveHierarchy: 0 indexFormat: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 +<<<<<<< HEAD previousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 +<<<<<<< HEAD normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 blendShapeNormalImportMode: 1 @@ -261,6 +298,11 @@ ModelImporter: copyAvatar: 0 humanDescription: serializedVersion: 2 +======= + importAnimation: 1 + copyAvatar: 0 + humanDescription: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 human: [] skeleton: [] armTwist: 0.5 @@ -272,8 +314,11 @@ ModelImporter: feetSpacing: 0 rootMotionBoneName: hasTranslationDoF: 0 +<<<<<<< HEAD hasExtraRoot: 0 skeletonHasParents: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 2 humanoidOversampling: 1 diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Rocket_Level3.fbx.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Rocket_Level3.fbx.meta index 22f4e3a..6a3c51d 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Rocket_Level3.fbx.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Rocket_Level3.fbx.meta @@ -1,12 +1,23 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: e6f39ee1b1a64c14cb2afbbc60127caf +======= +guid: a2fad7c5e55c0b640aa16b8bf0be7f18 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 labels: - Gun - rocket - tower - turret +<<<<<<< HEAD ModelImporter: serializedVersion: 23 +======= +timeCreated: 1483280626 +licenseType: Store +ModelImporter: + serializedVersion: 19 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 fileIDToRecycleName: 100000: Rocket3_Guns 100002: Rocket3_Main @@ -38,38 +49,53 @@ ModelImporter: 7400004: R3_Shooting 7400006: R3_ShieldUp 9500000: //RootNode +<<<<<<< HEAD externalObjects: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: Rocket_3 second: {fileID: 2100000, guid: d3d60ab4d164cc84d9c3d0b18649fdcf, type: 2} +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 materials: importMaterials: 1 materialName: 0 materialSearch: 1 +<<<<<<< HEAD materialLocation: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: +<<<<<<< HEAD rigImportErrors: rigImportWarnings: +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 +<<<<<<< HEAD importAnimatedCustomProperties: 0 importConstraints: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] +<<<<<<< HEAD extraUserProperties: [] +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 clipAnimations: - serializedVersion: 16 name: R3_Building @@ -229,30 +255,41 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 +<<<<<<< HEAD useSRGBMaterialColor: 1 importVisibility: 0 importBlendShapes: 1 importCameras: 0 importLights: 0 +======= + importBlendShapes: 1 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 +<<<<<<< HEAD preserveHierarchy: 0 indexFormat: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 +<<<<<<< HEAD previousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 +<<<<<<< HEAD normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 blendShapeNormalImportMode: 1 @@ -261,6 +298,11 @@ ModelImporter: copyAvatar: 0 humanDescription: serializedVersion: 2 +======= + importAnimation: 1 + copyAvatar: 0 + humanDescription: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 human: [] skeleton: [] armTwist: 0.5 @@ -272,8 +314,11 @@ ModelImporter: feetSpacing: 0 rootMotionBoneName: hasTranslationDoF: 0 +<<<<<<< HEAD hasExtraRoot: 0 skeletonHasParents: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 2 humanoidOversampling: 1 diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Tesla_Level1.fbx.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Tesla_Level1.fbx.meta index 4237134..43eb380 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Tesla_Level1.fbx.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Tesla_Level1.fbx.meta @@ -1,12 +1,23 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: c9585c729aa432f469d2530887004ace +======= +guid: 1015ac51b01675443a133858969b5126 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 labels: - Gun - tesla - tower - turret +<<<<<<< HEAD ModelImporter: serializedVersion: 23 +======= +timeCreated: 1483280625 +licenseType: Store +ModelImporter: + serializedVersion: 19 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 fileIDToRecycleName: 100000: shield_b7 100002: Tesla1_main @@ -28,38 +39,53 @@ ModelImporter: 7400004: T1_ShieldDown 7400006: T1_ShieldUp 9500000: //RootNode +<<<<<<< HEAD externalObjects: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: Tesla_1 second: {fileID: 2100000, guid: 0fcf534e621a6754e9da1e6c763b69db, type: 2} +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 materials: importMaterials: 1 materialName: 0 materialSearch: 1 +<<<<<<< HEAD materialLocation: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: +<<<<<<< HEAD rigImportErrors: rigImportWarnings: +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 +<<<<<<< HEAD importAnimatedCustomProperties: 0 importConstraints: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] +<<<<<<< HEAD extraUserProperties: [] +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 clipAnimations: - serializedVersion: 16 name: T1_Building @@ -203,30 +229,41 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 +<<<<<<< HEAD useSRGBMaterialColor: 1 importVisibility: 0 importBlendShapes: 1 importCameras: 0 importLights: 0 +======= + importBlendShapes: 1 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 +<<<<<<< HEAD preserveHierarchy: 0 indexFormat: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 +<<<<<<< HEAD previousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 +<<<<<<< HEAD normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 blendShapeNormalImportMode: 1 @@ -235,6 +272,11 @@ ModelImporter: copyAvatar: 0 humanDescription: serializedVersion: 2 +======= + importAnimation: 1 + copyAvatar: 0 + humanDescription: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 human: [] skeleton: [] armTwist: 0.5 @@ -246,8 +288,11 @@ ModelImporter: feetSpacing: 0 rootMotionBoneName: hasTranslationDoF: 0 +<<<<<<< HEAD hasExtraRoot: 0 skeletonHasParents: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 2 humanoidOversampling: 1 diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Tesla_Level2.fbx.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Tesla_Level2.fbx.meta index aaddc9f..ae12bdd 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Tesla_Level2.fbx.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Tesla_Level2.fbx.meta @@ -1,12 +1,23 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: de4fbb42e6e048e4aaa51ee411eb9388 +======= +guid: d1422c96a8703674498bc10f2661c792 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 labels: - Gun - tesla - tower - turret +<<<<<<< HEAD ModelImporter: serializedVersion: 23 +======= +timeCreated: 1483280627 +licenseType: Store +ModelImporter: + serializedVersion: 19 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 fileIDToRecycleName: 100000: shield_t2 100002: Tesla2_orb @@ -33,38 +44,53 @@ ModelImporter: 7400004: T2_ShieldDown 7400006: T2_ShieldUp 9500000: //RootNode +<<<<<<< HEAD externalObjects: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: Tesla_2 second: {fileID: 2100000, guid: 854cbc5f3f050774ebe5b736bfe753b3, type: 2} +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 materials: importMaterials: 1 materialName: 0 materialSearch: 1 +<<<<<<< HEAD materialLocation: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: +<<<<<<< HEAD rigImportErrors: rigImportWarnings: +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 +<<<<<<< HEAD importAnimatedCustomProperties: 0 importConstraints: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] +<<<<<<< HEAD extraUserProperties: [] +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 clipAnimations: - serializedVersion: 16 name: T2_Building @@ -216,30 +242,41 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 +<<<<<<< HEAD useSRGBMaterialColor: 1 importVisibility: 0 importBlendShapes: 1 importCameras: 0 importLights: 0 +======= + importBlendShapes: 1 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 +<<<<<<< HEAD preserveHierarchy: 0 indexFormat: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 +<<<<<<< HEAD previousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 +<<<<<<< HEAD normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 blendShapeNormalImportMode: 1 @@ -248,6 +285,11 @@ ModelImporter: copyAvatar: 0 humanDescription: serializedVersion: 2 +======= + importAnimation: 1 + copyAvatar: 0 + humanDescription: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 human: [] skeleton: [] armTwist: 0.5 @@ -259,8 +301,11 @@ ModelImporter: feetSpacing: 0 rootMotionBoneName: hasTranslationDoF: 0 +<<<<<<< HEAD hasExtraRoot: 0 skeletonHasParents: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 2 humanoidOversampling: 1 diff --git a/Assets/Plugins/Tower Defence Turrets/FBXs/Tesla_Level3.fbx.meta b/Assets/Plugins/Tower Defence Turrets/FBXs/Tesla_Level3.fbx.meta index 5359683..4af6c89 100644 --- a/Assets/Plugins/Tower Defence Turrets/FBXs/Tesla_Level3.fbx.meta +++ b/Assets/Plugins/Tower Defence Turrets/FBXs/Tesla_Level3.fbx.meta @@ -1,12 +1,23 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 668cfe22fc83ac24abe6a8e67544c4e6 +======= +guid: c18131c0ca144db42a2bb106d0115544 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 labels: - Gun - tesla - tower - turret +<<<<<<< HEAD ModelImporter: serializedVersion: 23 +======= +timeCreated: 1483279398 +licenseType: Store +ModelImporter: + serializedVersion: 19 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 fileIDToRecycleName: 100000: shield_t3 100002: tesla3_orbLeft @@ -38,38 +49,53 @@ ModelImporter: 7400004: T3_ShieldDown 7400006: T3_ShieldUp 9500000: //RootNode +<<<<<<< HEAD externalObjects: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule name: Tesla_3 second: {fileID: 2100000, guid: a15e6f3f5f1ec9a489d4930fc5a7b923, type: 2} +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 materials: importMaterials: 1 materialName: 0 materialSearch: 1 +<<<<<<< HEAD materialLocation: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: +<<<<<<< HEAD rigImportErrors: rigImportWarnings: +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationImportErrors: animationImportWarnings: animationRetargetingWarnings: animationDoRetargetingWarnings: 0 +<<<<<<< HEAD importAnimatedCustomProperties: 0 importConstraints: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 animationCompression: 1 animationRotationError: 0.5 animationPositionError: 0.5 animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] +<<<<<<< HEAD extraUserProperties: [] +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 clipAnimations: - serializedVersion: 16 name: T3_Building @@ -229,30 +255,41 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 +<<<<<<< HEAD useSRGBMaterialColor: 1 importVisibility: 0 importBlendShapes: 1 importCameras: 0 importLights: 0 +======= + importBlendShapes: 1 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 +<<<<<<< HEAD preserveHierarchy: 0 indexFormat: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 secondaryUVPackMargin: 4 useFileScale: 1 +<<<<<<< HEAD previousCalculatedGlobalScale: 1 hasPreviousCalculatedGlobalScale: 1 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 tangentImportMode: 3 +<<<<<<< HEAD normalCalculationMode: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 blendShapeNormalImportMode: 1 @@ -261,6 +298,11 @@ ModelImporter: copyAvatar: 0 humanDescription: serializedVersion: 2 +======= + importAnimation: 1 + copyAvatar: 0 + humanDescription: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 human: [] skeleton: [] armTwist: 0.5 @@ -272,8 +314,11 @@ ModelImporter: feetSpacing: 0 rootMotionBoneName: hasTranslationDoF: 0 +<<<<<<< HEAD hasExtraRoot: 0 skeletonHasParents: 0 +======= +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 lastHumanDescriptionAvatarSource: {instanceID: 0} animationType: 2 humanoidOversampling: 1 diff --git a/Assets/Plugins/Tower Defence Turrets/Materials.meta b/Assets/Plugins/Tower Defence Turrets/Materials.meta index d02165a..95af7f4 100644 --- a/Assets/Plugins/Tower Defence Turrets/Materials.meta +++ b/Assets/Plugins/Tower Defence Turrets/Materials.meta @@ -1,8 +1,16 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 540bfe0380056044fa0399831aa293db folderAsset: yes DefaultImporter: externalObjects: {} +======= +guid: b6023887063ff874a9a938c4a33984ea +folderAsset: yes +timeCreated: 1483279398 +licenseType: Store +DefaultImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Materials/Basic1.mat.meta b/Assets/Plugins/Tower Defence Turrets/Materials/Basic1.mat.meta index 44f28f9..1350b8e 100644 --- a/Assets/Plugins/Tower Defence Turrets/Materials/Basic1.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/Materials/Basic1.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 55eae1579925eb64e9a429ef28a1fd12 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 3717d9f6c5d2626429a28721f41fe09b +timeCreated: 1483280626 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Materials/Basic2.mat.meta b/Assets/Plugins/Tower Defence Turrets/Materials/Basic2.mat.meta index 7af9928..e6b49f9 100644 --- a/Assets/Plugins/Tower Defence Turrets/Materials/Basic2.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/Materials/Basic2.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 5426f0bff7fa04447bcedbbb4d5c2928 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: e9cc07ea16b0a00439b0e9509e868d38 +timeCreated: 1483280625 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Materials/Basic3.mat.meta b/Assets/Plugins/Tower Defence Turrets/Materials/Basic3.mat.meta index f34737a..5f8c6aa 100644 --- a/Assets/Plugins/Tower Defence Turrets/Materials/Basic3.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/Materials/Basic3.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 0ee391917c6157343b141707f14828c6 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 2f9c490cade8cab4992150a67f998046 +timeCreated: 1483280625 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Materials/Laser1.mat.meta b/Assets/Plugins/Tower Defence Turrets/Materials/Laser1.mat.meta index 9f6bf90..ef3cc27 100644 --- a/Assets/Plugins/Tower Defence Turrets/Materials/Laser1.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/Materials/Laser1.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 6a52337f0cc87b843958aa0a291b5443 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: a2c5a40437ded6f46923634b45e70aef +timeCreated: 1483280627 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Materials/Laser2.mat.meta b/Assets/Plugins/Tower Defence Turrets/Materials/Laser2.mat.meta index ce461f0..ef3c771 100644 --- a/Assets/Plugins/Tower Defence Turrets/Materials/Laser2.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/Materials/Laser2.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 17e51995d9e8dbc48ae1335d82ce9df0 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 989244c8e4768ae499ad80dbcc078ccc +timeCreated: 1483280627 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Materials/Laser3.mat.meta b/Assets/Plugins/Tower Defence Turrets/Materials/Laser3.mat.meta index 746a2be..23c7ed4 100644 --- a/Assets/Plugins/Tower Defence Turrets/Materials/Laser3.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/Materials/Laser3.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 885e4614c1bafa64ca9063237c3a1f71 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 8cf05101459607d4c91eabba6899d532 +timeCreated: 1483280626 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Materials/Rockets1.mat.meta b/Assets/Plugins/Tower Defence Turrets/Materials/Rockets1.mat.meta index 9815d88..6458508 100644 --- a/Assets/Plugins/Tower Defence Turrets/Materials/Rockets1.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/Materials/Rockets1.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 1ad3bbb8a17a6164b924373ec3812327 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 55b98f94749070b41a3fbfce972daf42 +timeCreated: 1483280626 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Materials/Rockets2.mat.meta b/Assets/Plugins/Tower Defence Turrets/Materials/Rockets2.mat.meta index 6d68cab..b12905d 100644 --- a/Assets/Plugins/Tower Defence Turrets/Materials/Rockets2.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/Materials/Rockets2.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: fcc5a4775d76ed54eb3a7ae73b3b7712 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 7f5155becd692e54a84e8dc93d03d357 +timeCreated: 1483280627 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Materials/Rockets3.mat.meta b/Assets/Plugins/Tower Defence Turrets/Materials/Rockets3.mat.meta index 0b4acb9..9a0975e 100644 --- a/Assets/Plugins/Tower Defence Turrets/Materials/Rockets3.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/Materials/Rockets3.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: f14b23b21ac4dda46897f8ffa6474cde NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 508f4c9483f5a524d9fb026d74aaaaf1 +timeCreated: 1483280626 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Materials/Tesla1.mat.meta b/Assets/Plugins/Tower Defence Turrets/Materials/Tesla1.mat.meta index e361f79..bc84b7c 100644 --- a/Assets/Plugins/Tower Defence Turrets/Materials/Tesla1.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/Materials/Tesla1.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: bf7c2591f99df8b44962b9ac64e3d896 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 7f533e6853703124e892882c4b01beb7 +timeCreated: 1483280624 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Materials/Tesla2.mat.meta b/Assets/Plugins/Tower Defence Turrets/Materials/Tesla2.mat.meta index 19df814..62c34f9 100644 --- a/Assets/Plugins/Tower Defence Turrets/Materials/Tesla2.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/Materials/Tesla2.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: ee61b9fb372b5fc4b99f9a1a61990767 NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 553fd635de39b9d4f9e032c167980ce9 +timeCreated: 1483280627 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Materials/Tesla3.mat b/Assets/Plugins/Tower Defence Turrets/Materials/Tesla3.mat index e69de29..53e9f03 100644 --- a/Assets/Plugins/Tower Defence Turrets/Materials/Tesla3.mat +++ b/Assets/Plugins/Tower Defence Turrets/Materials/Tesla3.mat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06b656ee10e67fd2b53dda81ff4af8e08f01564a76312ea4da10fa1886b764c2 +size 2222 diff --git a/Assets/Plugins/Tower Defence Turrets/Materials/Tesla3.mat.meta b/Assets/Plugins/Tower Defence Turrets/Materials/Tesla3.mat.meta index 4d611d0..1330006 100644 --- a/Assets/Plugins/Tower Defence Turrets/Materials/Tesla3.mat.meta +++ b/Assets/Plugins/Tower Defence Turrets/Materials/Tesla3.mat.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 29241dc81d1151949a3827a42117aeaf NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 +======= +guid: 6b2f302c745ea654a86d6007b59c3333 +timeCreated: 1483279398 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Prefabs.meta b/Assets/Plugins/Tower Defence Turrets/Prefabs.meta index 2743281..b5bece3 100644 --- a/Assets/Plugins/Tower Defence Turrets/Prefabs.meta +++ b/Assets/Plugins/Tower Defence Turrets/Prefabs.meta @@ -1,8 +1,16 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: e4c4023722446ad4b9610574d4669757 folderAsset: yes DefaultImporter: externalObjects: {} +======= +guid: ccfb33aa6ed3a5a4886706d23875cf35 +folderAsset: yes +timeCreated: 1483280899 +licenseType: Store +DefaultImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Prefabs/Basic_Level1.prefab.meta b/Assets/Plugins/Tower Defence Turrets/Prefabs/Basic_Level1.prefab.meta index a0b720a..82390fd 100644 --- a/Assets/Plugins/Tower Defence Turrets/Prefabs/Basic_Level1.prefab.meta +++ b/Assets/Plugins/Tower Defence Turrets/Prefabs/Basic_Level1.prefab.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: a6f04b7e096f2344d9eb35a6d3748c64 PrefabImporter: externalObjects: {} +======= +guid: c629adedc8f3c8149abe1b0ca12078e6 +timeCreated: 1483281381 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Prefabs/Basic_Level2.prefab.meta b/Assets/Plugins/Tower Defence Turrets/Prefabs/Basic_Level2.prefab.meta index 4520f75..9e1cdb8 100644 --- a/Assets/Plugins/Tower Defence Turrets/Prefabs/Basic_Level2.prefab.meta +++ b/Assets/Plugins/Tower Defence Turrets/Prefabs/Basic_Level2.prefab.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 111da0288907eba48aaaddbbd8c31319 PrefabImporter: externalObjects: {} +======= +guid: 0ecde4bedcde3aa40a358e899d7cd0db +timeCreated: 1483281383 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Prefabs/Basic_Level3.prefab.meta b/Assets/Plugins/Tower Defence Turrets/Prefabs/Basic_Level3.prefab.meta index 4a6629c..15596ef 100644 --- a/Assets/Plugins/Tower Defence Turrets/Prefabs/Basic_Level3.prefab.meta +++ b/Assets/Plugins/Tower Defence Turrets/Prefabs/Basic_Level3.prefab.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 1eea1f20ac6c2624a8334863bdf64225 PrefabImporter: externalObjects: {} +======= +guid: 46c910e0a0365e14fba9f53417edd9f5 +timeCreated: 1483281385 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Prefabs/Laser_Level1.prefab.meta b/Assets/Plugins/Tower Defence Turrets/Prefabs/Laser_Level1.prefab.meta index 2a79c19..cbac2e2 100644 --- a/Assets/Plugins/Tower Defence Turrets/Prefabs/Laser_Level1.prefab.meta +++ b/Assets/Plugins/Tower Defence Turrets/Prefabs/Laser_Level1.prefab.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 7c6057e7f6b6fdf4ebbe25a5c96f85b0 PrefabImporter: externalObjects: {} +======= +guid: 99d383f2cea821549a9b6398311d00e1 +timeCreated: 1483281387 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Prefabs/Laser_Level2.prefab.meta b/Assets/Plugins/Tower Defence Turrets/Prefabs/Laser_Level2.prefab.meta index f2550c3..3519308 100644 --- a/Assets/Plugins/Tower Defence Turrets/Prefabs/Laser_Level2.prefab.meta +++ b/Assets/Plugins/Tower Defence Turrets/Prefabs/Laser_Level2.prefab.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: c61b67b4b618b574899e1e8c4af68c96 PrefabImporter: externalObjects: {} +======= +guid: 8173d05f94b74c941a652c537abb0611 +timeCreated: 1483281388 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Prefabs/Laser_Level3.prefab.meta b/Assets/Plugins/Tower Defence Turrets/Prefabs/Laser_Level3.prefab.meta index a52e669..b453172 100644 --- a/Assets/Plugins/Tower Defence Turrets/Prefabs/Laser_Level3.prefab.meta +++ b/Assets/Plugins/Tower Defence Turrets/Prefabs/Laser_Level3.prefab.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 262bdcba1a8145b4592c0342c42008d2 PrefabImporter: externalObjects: {} +======= +guid: 14dbc2dac89b25a4093bd9eaec6c2c64 +timeCreated: 1483281391 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Prefabs/Rocket_Level1.prefab.meta b/Assets/Plugins/Tower Defence Turrets/Prefabs/Rocket_Level1.prefab.meta index 3bbbabf..3b017c1 100644 --- a/Assets/Plugins/Tower Defence Turrets/Prefabs/Rocket_Level1.prefab.meta +++ b/Assets/Plugins/Tower Defence Turrets/Prefabs/Rocket_Level1.prefab.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: aaf1c24373742744093616b899a70599 PrefabImporter: externalObjects: {} +======= +guid: 1a695cec0737dde4e9d7e14386d68863 +timeCreated: 1483281394 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Prefabs/Rocket_Level2.prefab.meta b/Assets/Plugins/Tower Defence Turrets/Prefabs/Rocket_Level2.prefab.meta index 11f6e63..dcc44c1 100644 --- a/Assets/Plugins/Tower Defence Turrets/Prefabs/Rocket_Level2.prefab.meta +++ b/Assets/Plugins/Tower Defence Turrets/Prefabs/Rocket_Level2.prefab.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: f8e9dda159693c74a978c011847cd507 PrefabImporter: externalObjects: {} +======= +guid: b5cc8492e30246b48891c4d3e583d252 +timeCreated: 1483281397 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Prefabs/Rocket_Level3.prefab.meta b/Assets/Plugins/Tower Defence Turrets/Prefabs/Rocket_Level3.prefab.meta index bc9f3cd..48dfed3 100644 --- a/Assets/Plugins/Tower Defence Turrets/Prefabs/Rocket_Level3.prefab.meta +++ b/Assets/Plugins/Tower Defence Turrets/Prefabs/Rocket_Level3.prefab.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: eba0d83bcfb557c42aa4b9985c1e1d9a PrefabImporter: externalObjects: {} +======= +guid: b5da5e91d3d933a479bd0627d7cc7298 +timeCreated: 1483281399 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Prefabs/Tesla_Level1.prefab.meta b/Assets/Plugins/Tower Defence Turrets/Prefabs/Tesla_Level1.prefab.meta index c559d02..f7b055d 100644 --- a/Assets/Plugins/Tower Defence Turrets/Prefabs/Tesla_Level1.prefab.meta +++ b/Assets/Plugins/Tower Defence Turrets/Prefabs/Tesla_Level1.prefab.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 050aaf241e091e64a975f79b069d8345 PrefabImporter: externalObjects: {} +======= +guid: d07549275ca8ca04f9a1c41f16471552 +timeCreated: 1483281401 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Prefabs/Tesla_Level2.prefab.meta b/Assets/Plugins/Tower Defence Turrets/Prefabs/Tesla_Level2.prefab.meta index b66f238..687056e 100644 --- a/Assets/Plugins/Tower Defence Turrets/Prefabs/Tesla_Level2.prefab.meta +++ b/Assets/Plugins/Tower Defence Turrets/Prefabs/Tesla_Level2.prefab.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 868cc57771dc5364d811f0c3dca1ec18 PrefabImporter: externalObjects: {} +======= +guid: 732f849ef000e034ba54ddda4b8c9164 +timeCreated: 1483281404 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Prefabs/Tesla_Level3.prefab.meta b/Assets/Plugins/Tower Defence Turrets/Prefabs/Tesla_Level3.prefab.meta index 93c251a..a2ea853 100644 --- a/Assets/Plugins/Tower Defence Turrets/Prefabs/Tesla_Level3.prefab.meta +++ b/Assets/Plugins/Tower Defence Turrets/Prefabs/Tesla_Level3.prefab.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: d8a9265add6e029409fb03278c1e19bb PrefabImporter: externalObjects: {} +======= +guid: 29289ebc7c465d14abb284bce7ffa060 +timeCreated: 1483280877 +licenseType: Store +NativeFormatImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Readme.txt.meta b/Assets/Plugins/Tower Defence Turrets/Readme.txt.meta index 9debbf8..8a70e62 100644 --- a/Assets/Plugins/Tower Defence Turrets/Readme.txt.meta +++ b/Assets/Plugins/Tower Defence Turrets/Readme.txt.meta @@ -1,7 +1,14 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: e4d0516129b1b984e984837f1c66847a TextScriptImporter: externalObjects: {} +======= +guid: 0443240fece72cb40a8f5b488a47842c +timeCreated: 1483316232 +licenseType: Store +TextScriptImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures.meta b/Assets/Plugins/Tower Defence Turrets/Textures.meta index a16c8ae..025fc4f 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures.meta @@ -1,8 +1,16 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: ae3eb745d9210474b8f838ca4fd02534 folderAsset: yes DefaultImporter: externalObjects: {} +======= +guid: 80151ec9c1b8b9444b91fe7825d9575c +folderAsset: yes +timeCreated: 1483279437 +licenseType: Store +DefaultImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1.meta index fd37376..100a5a2 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1.meta @@ -1,8 +1,16 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 4abbefbe18e9375479b995d3edb573f6 folderAsset: yes DefaultImporter: externalObjects: {} +======= +guid: 025518450926aa04c9b9228c587528d2 +folderAsset: yes +timeCreated: 1483280675 +licenseType: Store +DefaultImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/MetallicB1.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/MetallicB1.png.meta index 3494a58..a9faa0f 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/MetallicB1.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/MetallicB1.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 01bad7a601fa1e843b5e511d8f46bbc9 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuseB1.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuseB1.png.meta index 0aaebe1..e90d8e5 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuseB1.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuseB1.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 64a15da43ed5d0244b442087154e7747 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_BW.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_BW.png.meta index ea2bede..7213234 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_BW.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_BW.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 899e1ffa20ad72a42bea1e832bca0bf8 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_WB.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_WB.png.meta index 682bcff..261f1bf 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_WB.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_WB.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 73307d2e3e5125944a04e481f05597e9 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_green.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_green.png.meta index 82f4288..98301a7 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_green.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_green.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: e1bf59949c6575e42bf4ee9f80a344da TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_purple.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_purple.png.meta index 48604a8..e9c898e 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_purple.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_purple.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 4fc20477421a0594691c6a6e159032ee TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_red.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_red.png.meta index 84c4d8a..b562399 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_red.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level1/diffuse_B1_red.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 0ae8cdfbc0196744fbf343eb794ea754 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2.meta index 8ac1f89..d4c11ab 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2.meta @@ -1,8 +1,16 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 57e825bc70c814947856dde2590e0147 folderAsset: yes DefaultImporter: externalObjects: {} +======= +guid: 58c6027631d74d049b8ee24bcb42650e +folderAsset: yes +timeCreated: 1483280675 +licenseType: Store +DefaultImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/MetallicB2.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/MetallicB2.png.meta index d1dec62..ff2d1a4 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/MetallicB2.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/MetallicB2.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 2a995ea40f1f7014b8d319a0e380fe47 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuseB2.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuseB2.png.meta index 37e65cd..0484e9b 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuseB2.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuseB2.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 7a4d652e68871614e8f11bd871b7b9c0 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_BW.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_BW.png.meta index 1803572..2a5aca8 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_BW.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_BW.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: f8127622754968a468af3fef9d0b8de8 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_WB.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_WB.png.meta index 2491947..420ceac 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_WB.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_WB.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 3fa6682402f8dd24db80387c19bd642d TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_green.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_green.png.meta index ea50f69..d71a450 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_green.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_green.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 1673a1904bc814d48b7e9923626989c1 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_purple.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_purple.png.meta index 9da1baf..32c868f 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_purple.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_purple.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 00d3a9eecb6dbe94e987bdc1a3c1c0c3 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_red.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_red.png.meta index 83801f8..3aa9b2e 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_red.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level2/diffuse_B2_red.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 1df055e6904ba274697f0bb8edc8d946 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3.meta index 83dd4ac..c29c979 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3.meta @@ -1,8 +1,16 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 6fbd509b6becc8b42b2eac0bab00ed5f folderAsset: yes DefaultImporter: externalObjects: {} +======= +guid: a0749a8b16b66e041b6d884caa564466 +folderAsset: yes +timeCreated: 1483280676 +licenseType: Store +DefaultImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/MetallicB3.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/MetallicB3.png.meta index 4f66480..b80ad1f 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/MetallicB3.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/MetallicB3.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 350ab54c54e833d4c8314421022f0049 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuseB3.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuseB3.png.meta index e9b6194..2b923f3 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuseB3.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuseB3.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: c66bc639fed432b4ebf80589fa3ca2eb TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_BW.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_BW.png.meta index 504c6ec..091bb4a 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_BW.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_BW.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 5c634b60735d7d741b57165fdcc581fa TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_WB.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_WB.png.meta index 0bc633e..5e369e7 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_WB.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_WB.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: c2aac47cb2980e445826a630479a0624 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_green.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_green.png.meta index 8961c22..8c0831f 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_green.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_green.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 8dc5205207b80b64298acc7349bcfb79 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 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 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_purple.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_purple.png.meta index 12dd71e..b4ab122 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_purple.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_purple.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 7d943334a9c01c34cb21b2bb0d915a93 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 23de188e94f23484885674bbb2a612c1 +timeCreated: 1483308050 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_red.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_red.png.meta index 97bd52e..46e0774 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_red.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Basic_Level3/diffuse_B3_red.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 635d4e54149ebe145815b9e87f84bfe4 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 4840f6277eecdd2459bd65fdcf87dc54 +timeCreated: 1483308051 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1.meta index 1084dae..9584f00 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1.meta @@ -1,8 +1,16 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: ca547bdeab6be7243984b0d50d9cb608 folderAsset: yes DefaultImporter: externalObjects: {} +======= +guid: 57926dfea0090144185b740beedc8a4c +folderAsset: yes +timeCreated: 1483280675 +licenseType: Store +DefaultImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/MetallicL1.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/MetallicL1.png.meta index 61442ea..0d9a9f7 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/MetallicL1.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/MetallicL1.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 839f87f5f692ecd4b85859c8280cfa7d TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: b367198c02b3eb14b8c83d0a805c03aa +timeCreated: 1483280685 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuseL1.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuseL1.png.meta index a1fbe7e..ebfe20e 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuseL1.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuseL1.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: c2380de2716796c4393be7eafc534b41 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 31d678deca0812a4bbf461d3a12d9f08 +timeCreated: 1483280680 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_BW.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_BW.png.meta index 7805e6c..e67cf2e 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_BW.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_BW.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 94c073068d7179341b8eb6b3d54246f2 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 34519c8afc5ae014e89679cdf5c150dd +timeCreated: 1483308061 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_WB.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_WB.png.meta index 90e6644..97d7412 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_WB.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_WB.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: ee167429571932a48b75dd3c40fa3e8f TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 309bcf0c65410144aa09de6dcaeee654 +timeCreated: 1483308060 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_green.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_green.png.meta index d0debd3..e43f625 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_green.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_green.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: df30f5ec8b24d62429461942b32bf0ee TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 2344488f58f86784094c27abfbd950f6 +timeCreated: 1483308060 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_purple.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_purple.png.meta index 10bf8b6..9f18481 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_purple.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_purple.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 43fe70a252d159742852a8a9ef61f613 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: ffcd8cd3b57cf1c49bf38fc2668a682d +timeCreated: 1483308062 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_red.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_red.png.meta index cf4074f..3f4ff8e 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_red.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level1/diffuse_L1_red.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 4d308b1f281c03340a8be7644faef3d3 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: a50cd1153c5124c4e9a76da6960cf2ee +timeCreated: 1483308061 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2.meta index 7b9d2d5..01c3291 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2.meta @@ -1,8 +1,16 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 899b91d464b153a4596b736934877144 folderAsset: yes DefaultImporter: externalObjects: {} +======= +guid: 4367d52ec84d5ff44809f6e4afebc87a +folderAsset: yes +timeCreated: 1483280675 +licenseType: Store +DefaultImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/MetallicL2.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/MetallicL2.png.meta index cb08789..a2ba01b 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/MetallicL2.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/MetallicL2.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: bdcca099c98da254681fd9f719bc5769 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 50f494cfb69ea604682dee33776a933c +timeCreated: 1483280681 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuseL2.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuseL2.png.meta index 3096c04..b478ee9 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuseL2.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuseL2.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 92e258671e5296c4687823099e18faa9 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: cc276ce4d0c62af4da23c2471f583d41 +timeCreated: 1483280688 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_BW.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_BW.png.meta index 829fe2a..adaefb4 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_BW.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_BW.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 2a44c3a7b72d40a4eb8f764f09aa7bb2 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 90c4e7b17daeb634bb657d77426ed988 +timeCreated: 1483308071 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_WB.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_WB.png.meta index 81d79b5..eeb064e 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_WB.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_WB.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 9a5b76e8282c25941aa3eefce19642d1 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 08ccaebc7092b0345b0a70617aca14dc +timeCreated: 1483308070 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_green.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_green.png.meta index cd65a49..6f1a9c3 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_green.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_green.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: ca4922ddda52bf742b5f5f319eaecd34 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 6cc2e253a2a1a614b982177f9d407a15 +timeCreated: 1483308070 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_purple.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_purple.png.meta index 729942b..455d152 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_purple.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_purple.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 34a788e007275ec4bbcd09ec79c45f08 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 8e944bdde1709a94990c9b11063a51f4 +timeCreated: 1483308071 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_red.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_red.png.meta index dd80d6f..19d48cc 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_red.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level2/diffuse_L2_red.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: e86dc9f3284fb514aafd1f3b441480cf TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 4cefb1a41cf21a248ba3804a346dcd1a +timeCreated: 1483308070 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3.meta index 6e1f320..5ce907e 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3.meta @@ -1,8 +1,16 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 7423730bcc74b074990b3ad574e4922a folderAsset: yes DefaultImporter: externalObjects: {} +======= +guid: 7537751db523e3644be6d25acbbc98e6 +folderAsset: yes +timeCreated: 1483280676 +licenseType: Store +DefaultImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/MetallicL3.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/MetallicL3.png.meta index a36b998..5c767e1 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/MetallicL3.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/MetallicL3.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 81c591a41925380479cb5bbd90132560 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 7e21c4abaf82a09458a653ef346f1127 +timeCreated: 1483280682 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuseL3.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuseL3.png.meta index 2212b00..f0c0bd5 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuseL3.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuseL3.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: ebf525fb4dcf9f14fab807fd6c37dd47 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 317de4303e30b5b4d9ee6af943635274 +timeCreated: 1483280680 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_BW.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_BW.png.meta index aec8ee9..b320b2b 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_BW.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_BW.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 0456e4fc0837ff14f986938987c0d080 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: ba6bfce29985f0d468239e53ebd01d0b +timeCreated: 1483308080 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_WB.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_WB.png.meta index 64376bd..e2a0635 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_WB.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_WB.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 5276adc7b54b15742b27ecc3c9bbcf32 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 0714a7d13621bf04db25751d366b13c3 +timeCreated: 1483308078 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_green.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_green.png.meta index 319d888..66448b0 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_green.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_green.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 3c904bd1b0d67744ab27662cd47576a4 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: a07795ea239419c4facd89ec88fee647 +timeCreated: 1483308079 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_purple.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_purple.png.meta index ca4f05b..0f9a6aa 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_purple.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_purple.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: ec04d9eddd15fa94faecda95678356f2 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 92533146b956c904da058ba393f272e5 +timeCreated: 1483308079 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_red.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_red.png.meta index 5a722d7..6637052 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_red.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Laser_Level3/diffuse_L3_red.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 2cdeeaa2615918a45823f55f29c690e6 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: be0282d0c1d7cb54ab553c39dc461d79 +timeCreated: 1483308080 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1.meta index 34ddba4..1ef3bb6 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1.meta @@ -1,8 +1,16 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 0dc74bcd439bc684c9e18f7f20d14ebb folderAsset: yes DefaultImporter: externalObjects: {} +======= +guid: 7288c5eab11b0134887d5e50bc83db20 +folderAsset: yes +timeCreated: 1483280676 +licenseType: Store +DefaultImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/MetallicR1.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/MetallicR1.png.meta index 7166c85..40040e8 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/MetallicR1.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/MetallicR1.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 62926bb868436bb47b26777ee5db8e87 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 0cdfc92d816f1c4449f7ae98ecb510df +timeCreated: 1483280677 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuseR1.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuseR1.png.meta index 40c1c26..5399827 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuseR1.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuseR1.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: bc33a9262e7e8de4fa7a5c3035d99caf TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 13bc24aef809064499f088d48f99157c +timeCreated: 1483280678 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_BW.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_BW.png.meta index 7636849..44403a8 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_BW.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_BW.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 0acd060d0138140408313a928abab023 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 5df27ff28bcf7634390a6df00ee50481 +timeCreated: 1483308090 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_WB.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_WB.png.meta index d1c5602..c21e37c 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_WB.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_WB.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: de98b94911b221b46808099b60d4a548 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 30da0a232acdab24aaa8a9d7473aac4f +timeCreated: 1483308090 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_green.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_green.png.meta index 9080264..2413dbc 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_green.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_green.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 5e76357e7662db8448732492891dd3ff TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 19225b8407443e542a06759fdb830877 +timeCreated: 1483308089 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_purple.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_purple.png.meta index 134e8b6..1507583 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_purple.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_purple.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 32137d79ce8abd047996cca00d7cdb07 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 7d0416f7532efae4dbab8c650331d421 +timeCreated: 1483308091 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_red.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_red.png.meta index e300a76..2ce710d 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_red.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level1/diffuse_r1_red.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 5f401baf2972f5d4da629b940ca9b65e TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 0772562c3f7368d498dc50993ecd500c +timeCreated: 1483308089 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2.meta index 58e23a5..5e6c459 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2.meta @@ -1,8 +1,16 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 344bb72000d4e624095e532ae07477cc folderAsset: yes DefaultImporter: externalObjects: {} +======= +guid: bd0590812e1642b44bf1cca3811fe90b +folderAsset: yes +timeCreated: 1483280676 +licenseType: Store +DefaultImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/MetallicR2.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/MetallicR2.png.meta index 69f5639..e8c78ec 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/MetallicR2.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/MetallicR2.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: e115fc361c79a034baeb511b62b409fe TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 66caf1772a101284282c3eec841022b2 +timeCreated: 1483280681 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuseR2.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuseR2.png.meta index b8bfc78..2b91146 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuseR2.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuseR2.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 1ea2ae1a8e2abb9419dd1aba89f72195 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 14f6e2b5f8936c44c8e8f97ccdfcb031 +timeCreated: 1483280678 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_BW.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_BW.png.meta index da29fce..cab67bb 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_BW.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_BW.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: e1a974c3af798954286fc3f1b6d55904 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: d936f8b88f5acd04d821ee7ff81301fe +timeCreated: 1483308099 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_WB.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_WB.png.meta index 4c75f88..7d9f2d9 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_WB.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_WB.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: a68ec049a923f104ba66142b202a5de0 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 05c033fcc0b3c3a4a9336873ade52987 +timeCreated: 1483308097 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_green.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_green.png.meta index 2039fa9..62d6250 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_green.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_green.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 1ce0896be5b77c541a19bcb1d212b20c TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 54d2e2f5166981b48b17ea72603f4381 +timeCreated: 1483308099 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_purple.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_purple.png.meta index 470b07f..eb58a09 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_purple.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_purple.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: e10a72015e1d6004e8558be86238de28 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 213a685045a3e3c4daada7a8388e5520 +timeCreated: 1483308098 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_red.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_red.png.meta index 3e847c1..a0c74ad 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_red.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level2/diffuse_r2_red.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: ddb1b07d369c4474ead8ce5636b70848 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 4fc45d3f213f62a44b9dd1e1a5561f54 +timeCreated: 1483308098 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3.meta index 303ba20..82e0799 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3.meta @@ -1,8 +1,16 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: b2c7f15bed7e4d74ba12a36899aa575d folderAsset: yes DefaultImporter: externalObjects: {} +======= +guid: a57f7d16d1c7a6847b177b7cc0791798 +folderAsset: yes +timeCreated: 1483280676 +licenseType: Store +DefaultImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/MetallicR3.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/MetallicR3.png.meta index 21118c3..ef1e49b 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/MetallicR3.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/MetallicR3.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: a680fc9f2cb805642a3e45411a1ed402 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: bd11dc62874df694786cf262429186dd +timeCreated: 1483280687 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuseR3.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuseR3.png.meta index e75116c..2d8f16e 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuseR3.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuseR3.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 6c05f867279aceb43927e3597f2d061b TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 1030a654647842e4abd1184f8d60172d +timeCreated: 1483280677 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_BW.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_BW.png.meta index 8b85224..a3746c0 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_BW.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_BW.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 6d809981b9dc77d4293ba70a5ddb6c55 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 36b3023c40bb2cf4d87baf73b18e1d78 +timeCreated: 1483308105 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_WB.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_WB.png.meta index 07c6ada..f1972e7 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_WB.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_WB.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: c0f67ddce3c68674b991eade62c9babe TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: cb689db539e003940a3510bde21c1304 +timeCreated: 1483308106 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_green.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_green.png.meta index b05a3f3..da79355 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_green.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_green.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 4744bed36ec391049815717403a6b8a3 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 531eedf2e4af731459117773a51a68f7 +timeCreated: 1483308105 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_purple.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_purple.png.meta index 3347d6f..a8bbef4 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_purple.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_purple.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 53d8c6667d2cdcd40aa1abb5eab63878 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 6a03f63053bf65b49aad74c32a1702c6 +timeCreated: 1483308105 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_red.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_red.png.meta index 53e69f3..0ddc2d7 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_red.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Rocket_Level3/diffuse_r3_red.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 7635177441f720043a2eef398f062eb0 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 73fe513b33360254ca316c00d2912a3a +timeCreated: 1483308106 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1.meta index ce537aa..80ef727 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1.meta @@ -1,8 +1,16 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: aedc0676f80129d4780e6b61e466c45d folderAsset: yes DefaultImporter: externalObjects: {} +======= +guid: 2b310bd4de9bb0345858c152011b5ba5 +folderAsset: yes +timeCreated: 1483280675 +licenseType: Store +DefaultImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/MetallicT1.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/MetallicT1.png.meta index 8625cf4..db83a52 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/MetallicT1.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/MetallicT1.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 216d6f8f350dfca4b99453270758309b TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 1b402ebf69d935f42bb8ea937dd3f9ee +timeCreated: 1483280679 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1.png.meta index a402e13..8a05423 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 178ce78000d56684188b4b820657581f TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 9051d76a741f4674bbd15a94b83a1abb +timeCreated: 1483280683 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_BW.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_BW.png.meta index db97df9..96f28d6 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_BW.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_BW.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 4546ae6ab0153e24eac5f2e1e2618076 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: ca0d71af17fe7ba44a874b2c71836d81 +timeCreated: 1483308120 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_WB.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_WB.png.meta index 589d4b2..4caea63 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_WB.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_WB.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: bcc16b9aec37ac4409fd6a96d5a2a49c TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: a4f03dc8c1e2e9642b44249782204d52 +timeCreated: 1483308120 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_green.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_green.png.meta index da3e331..6b40b04 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_green.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_green.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: e6b4c46c138cf4d47a707efbdeabd683 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 00a6b35fb81ab2c4b918c63cdf21db6a +timeCreated: 1483308119 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_purple.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_purple.png.meta index 08f29fc..0e8ff1c 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_purple.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_purple.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: f04bc587af0f9d44aaa42985ef0d50e0 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: a5c4c1a2016b629459871f66530665df +timeCreated: 1483308120 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_red.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_red.png.meta index a06277e..0736027 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_red.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level1/diffuse_t1_red.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 2e992176b14286943b4fae5609013dc7 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 36e312e7ca1bcdf4d923b3d6541c8edf +timeCreated: 1483308119 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2.meta index a145a99..9083cf5 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2.meta @@ -1,8 +1,16 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 9d9eff6200616d345b12c8348b56f97c folderAsset: yes DefaultImporter: externalObjects: {} +======= +guid: 35253c16a63d54a4bafdc3519372c334 +folderAsset: yes +timeCreated: 1483280675 +licenseType: Store +DefaultImporter: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/MetallicT2.png b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/MetallicT2.png new file mode 100644 index 0000000..69ba7ed --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/MetallicT2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:834ed11d2e39ccc9f091d33c022892c152de9ef1588c02c8da1ac2b6c40ffed5 +size 109248 diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/MetallicT2.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/MetallicT2.png.meta new file mode 100644 index 0000000..e887239 --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/MetallicT2.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: a8538e37515da8c4d82ba6bbb90c9037 +timeCreated: 1483280684 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2.png.meta index 6a38a3c..e840f6b 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 6ea6754011abc7941af87883f26f9e45 TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: c2f9c140cf16715449937d7fd080dff9 +timeCreated: 1483280687 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_BW.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_BW.png.meta index 5017aee..0370e38 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_BW.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_BW.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 48a43f3bfa3a24643867ecfbfdcee21d TextureImporter: fileIDToRecycleName: {} @@ -13,6 +14,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 354a6f0f798395a4ca5f140d5bf08b3c +timeCreated: 1483308003 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -21,15 +37,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -40,11 +65,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -69,10 +106,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -83,6 +129,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_WB.png b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_WB.png index e69de29..9be0272 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_WB.png +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_WB.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d6fc074a79ceed378365407668666ba272e1c76a93ab7cb231ed9cf27a54f9c +size 138205 diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_WB.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_WB.png.meta index c9dbdb5..e0880fc 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_WB.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_WB.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: dbe0e803119932c4daed735bbed9a2d6 TextureImporter: fileIDToRecycleName: @@ -14,6 +15,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 9ff96ce39336a1b499fa33e8399848f9 +timeCreated: 1483308003 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -22,6 +38,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 @@ -41,11 +58,32 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -59,10 +97,19 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: [] +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -73,6 +120,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_green.png b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_green.png index e69de29..669e033 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_green.png +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_green.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:264680186ed5d7cea426406befd1ff8acd75c0fa185876bc4c06387df01f6b99 +size 214967 diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_green.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_green.png.meta index e30c938..36215ae 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_green.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_green.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: e9499bb5dc88b1f4bba4d20f822c866c TextureImporter: fileIDToRecycleName: @@ -14,6 +15,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 0ec49b14dd0df304d8b7065546d3b997 +timeCreated: 1483308002 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -22,15 +38,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -41,11 +66,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -70,10 +107,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -84,6 +130,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_purple.png b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_purple.png index e69de29..db27e1c 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_purple.png +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_purple.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cf557b0b0f9e33b544d0a8ff4a2a14b642258cc854de0aa00d12b6c755c788a +size 213725 diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_purple.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_purple.png.meta index 33a585b..04b03db 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_purple.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_purple.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: a8ef341d6dee2274ea65db2bd0f70e60 TextureImporter: fileIDToRecycleName: @@ -14,6 +15,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: e51b4e1d165327245a41eb5b87e0c471 +timeCreated: 1483308004 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -22,15 +38,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -41,11 +66,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -70,10 +107,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -84,6 +130,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_red.png b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_red.png index e69de29..f2d373d 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_red.png +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_red.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a975985809cd43e7547d9504ab5c6c8adcd5bd1d6034507730e11ca552d1f74f +size 214941 diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_red.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_red.png.meta index 888ccf9..61e7bc5 100644 --- a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_red.png.meta +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level2/diffuse_t2_red.png.meta @@ -1,4 +1,5 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: 6a2646f728395f540990de59ebd6775a TextureImporter: fileIDToRecycleName: @@ -14,6 +15,21 @@ TextureImporter: borderMipMap: 0 mipMapsPreserveCoverage: 0 alphaTestReferenceValue: 0.5 +======= +guid: 68f8fd21a76268943b76033cf70716a1 +timeCreated: 1483308003 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -22,15 +38,24 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 +<<<<<<< HEAD streamingMipmaps: 0 streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 +======= + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 seamlessCubemap: 0 textureFormat: -1 maxTextureSize: 2048 textureSettings: +<<<<<<< HEAD serializedVersion: 2 filterMode: -1 aniso: -1 @@ -41,11 +66,23 @@ TextureImporter: nPOTScale: 1 lightmap: 0 compressionQuality: 50 +======= + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} +<<<<<<< HEAD spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -70,10 +107,19 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +======= + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 spriteSheet: serializedVersion: 2 sprites: [] outline: [] +<<<<<<< HEAD physicsShape: [] bones: [] spriteID: @@ -84,6 +130,9 @@ TextureImporter: spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 +======= + spritePackingTag: +>>>>>>> 79efbfab432e0c255acb32491eb3e34efae6dc94 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3.meta new file mode 100644 index 0000000..fa06c71 --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 6aa47978d58f83c4db289fab198c6a06 +folderAsset: yes +timeCreated: 1483280676 +licenseType: Store +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/MetallicT3.png b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/MetallicT3.png new file mode 100644 index 0000000..698b8c2 --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/MetallicT3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1a5c42e2c23afed3bef295c800fa940593a481d004019c653edebb57b112366 +size 116956 diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/MetallicT3.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/MetallicT3.png.meta new file mode 100644 index 0000000..1043b82 --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/MetallicT3.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 9caf5463874a8b24e96bdcc98aa0186f +timeCreated: 1483280684 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_BW.png b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_BW.png new file mode 100644 index 0000000..09f6896 --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_BW.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e215333cc3efd941cc34f0d9edda5865c2310a384b012a03b1e887891f028a74 +size 150911 diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_BW.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_BW.png.meta new file mode 100644 index 0000000..4438b23 --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_BW.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: d02a63368f3be5f488a83d4a37d271c7 +timeCreated: 1483308139 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_WB.png b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_WB.png new file mode 100644 index 0000000..394cbfb --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_WB.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:297862ea4735d2d06e6f52f635ed350453bb0e9b231682616cb6d770bf9eee5e +size 151629 diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_WB.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_WB.png.meta new file mode 100644 index 0000000..4e8d6b5 --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_WB.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: c15c630d1d7af4c48878a3a999bef25b +timeCreated: 1483308139 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_green.png b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_green.png new file mode 100644 index 0000000..66ac32a --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_green.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:878328e792da280b2810ec25ec3e1fe38858d533c0ba68019b18778b272e2304 +size 233112 diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_green.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_green.png.meta new file mode 100644 index 0000000..0c69f49 --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_green.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 8e8d39ca1ef13574da35c26fe0725579 +timeCreated: 1483308138 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_purple.png b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_purple.png new file mode 100644 index 0000000..2d2fc38 --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_purple.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69b6e9e3c7c7e2cac24daa54495d8c01ace8f6df29ea12263ea5c3fa4a7ae95f +size 231678 diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_purple.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_purple.png.meta new file mode 100644 index 0000000..7e00241 --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_purple.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 91ef49a20de008547b73de106c88f08c +timeCreated: 1483308138 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_red.png b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_red.png new file mode 100644 index 0000000..9eb045a --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_red.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e0c4b3ae2474ea89f34106e5ee04cf6fea3fb2c1fcb9fe68705a9d283298105 +size 232592 diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_red.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_red.png.meta new file mode 100644 index 0000000..6203773 --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_T3_red.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 3304d597ff157c94bb78db1ffc52b3d3 +timeCreated: 1483308138 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_t3.png b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_t3.png new file mode 100644 index 0000000..24b9332 --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_t3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1f642c6f6426d9566a09d3c15dfd7326f2bde479c12989aac2cdd0d9d7aa48f +size 228083 diff --git a/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_t3.png.meta b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_t3.png.meta new file mode 100644 index 0000000..4c249c2 --- /dev/null +++ b/Assets/Plugins/Tower Defence Turrets/Textures/Tesla_Level3/diffuse_t3.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 8c795f0e4bbb74a4b97f2f56d8f9cced +timeCreated: 1483280683 +licenseType: Store +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Core/StartTimer.prefab b/Assets/Prefabs/Core/StartTimer.prefab new file mode 100644 index 0000000..2f170b7 --- /dev/null +++ b/Assets/Prefabs/Core/StartTimer.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60f207301799c118e69672d0e153934367be13112bdf2916c5d8ca74957fd28f +size 6213 diff --git a/Assets/Prefabs/Core/StartTimer.prefab.meta b/Assets/Prefabs/Core/StartTimer.prefab.meta new file mode 100644 index 0000000..4955546 --- /dev/null +++ b/Assets/Prefabs/Core/StartTimer.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c210c09e56bfe434a9c3cfada6822c61 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Core.meta b/Assets/Resources/Core.meta new file mode 100644 index 0000000..2913377 --- /dev/null +++ b/Assets/Resources/Core.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c6e6ca9f355c8843957b61e5ce66866 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Current Objective.controller b/Assets/Resources/Core/Current Objective.controller similarity index 100% rename from Assets/Resources/Current Objective.controller rename to Assets/Resources/Core/Current Objective.controller diff --git a/Assets/Resources/Current Objective.controller.meta b/Assets/Resources/Core/Current Objective.controller.meta similarity index 100% rename from Assets/Resources/Current Objective.controller.meta rename to Assets/Resources/Core/Current Objective.controller.meta diff --git a/Assets/Resources/NextToCurrent.anim b/Assets/Resources/Core/NextToCurrent.anim similarity index 100% rename from Assets/Resources/NextToCurrent.anim rename to Assets/Resources/Core/NextToCurrent.anim diff --git a/Assets/Resources/NextToCurrent.anim.meta b/Assets/Resources/Core/NextToCurrent.anim.meta similarity index 100% rename from Assets/Resources/NextToCurrent.anim.meta rename to Assets/Resources/Core/NextToCurrent.anim.meta diff --git a/Assets/Resources/ObjectiveEnd.anim b/Assets/Resources/Core/ObjectiveEnd.anim similarity index 100% rename from Assets/Resources/ObjectiveEnd.anim rename to Assets/Resources/Core/ObjectiveEnd.anim diff --git a/Assets/Resources/ObjectiveEnd.anim.meta b/Assets/Resources/Core/ObjectiveEnd.anim.meta similarity index 100% rename from Assets/Resources/ObjectiveEnd.anim.meta rename to Assets/Resources/Core/ObjectiveEnd.anim.meta diff --git a/Assets/Resources/ObjectiveInit.anim b/Assets/Resources/Core/ObjectiveInit.anim similarity index 100% rename from Assets/Resources/ObjectiveInit.anim rename to Assets/Resources/Core/ObjectiveInit.anim diff --git a/Assets/Resources/ObjectiveInit.anim.meta b/Assets/Resources/Core/ObjectiveInit.anim.meta similarity index 100% rename from Assets/Resources/ObjectiveInit.anim.meta rename to Assets/Resources/Core/ObjectiveInit.anim.meta diff --git a/Assets/Resources/Core/StartCounting.anim b/Assets/Resources/Core/StartCounting.anim new file mode 100644 index 0000000..cb5764c --- /dev/null +++ b/Assets/Resources/Core/StartCounting.anim @@ -0,0 +1,527 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: StartCounting + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.2, y: 0.2, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.9166667 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_EffectColor.a + path: + classID: 114 + script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 114 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1760254681 + script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 304273561 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1460864421 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1967290853 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 538195251 + script: {fileID: 0} + typeID: 224 + customType: 28 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.9166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SizeDelta.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 224 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_EffectColor.a + path: + classID: 114 + script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.9166667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 114 + script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_AnchoredPosition.y + path: + classID: 224 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: + - time: 0.9166667 + functionName: NextCounter + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Core/StartCounting.anim.meta b/Assets/Resources/Core/StartCounting.anim.meta new file mode 100644 index 0000000..0a9f9e1 --- /dev/null +++ b/Assets/Resources/Core/StartCounting.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 305e2d6f0fe58274aa08d3cee0c12a36 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Core/Text.controller b/Assets/Resources/Core/Text.controller new file mode 100644 index 0000000..9734e33 --- /dev/null +++ b/Assets/Resources/Core/Text.controller @@ -0,0 +1,156 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Text + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Next + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107614339208606310} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1101025086477539332 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Next + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102712798030628128} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1101217573810338628 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102671646799619652} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &1102671646799619652 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101025086477539332} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102712798030628128 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: StartCounting + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101217573810338628} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 305e2d6f0fe58274aa08d3cee0c12a36, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107614339208606310 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102712798030628128} + m_Position: {x: 348, y: 108, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102671646799619652} + m_Position: {x: 348, y: -24, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102712798030628128} diff --git a/Assets/Resources/Core/Text.controller.meta b/Assets/Resources/Core/Text.controller.meta new file mode 100644 index 0000000..ea8ea54 --- /dev/null +++ b/Assets/Resources/Core/Text.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 826cab97feeb7ba4ba1f8c499d48da85 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/LobbyScene.unity b/Assets/Scenes/LobbyScene.unity index 1752061..dcd3d58 100644 --- a/Assets/Scenes/LobbyScene.unity +++ b/Assets/Scenes/LobbyScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b2c98614160a7381df8f921d7e43c43faf09523cafe544c2ddc83f3906b35548 -size 168495 +oid sha256:7ea473be3d831df127ea15471233afa3d6c12f8fadfd43011ffb8e9f1636bed0 +size 267895 diff --git a/Assets/Scenes/Local Simulator.unity b/Assets/Scenes/Local Simulator.unity index 8826a7c..9c93416 100644 --- a/Assets/Scenes/Local Simulator.unity +++ b/Assets/Scenes/Local Simulator.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3d402b2195867d663851d2af6ed78c648dbdb22f8887a7afdb2d0055301327e -size 69271 +oid sha256:084125c0368374f8aa41d8c4d8c7c9b9e5af5cfcaef901ba52aecefbc0dd78ad +size 74101 diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index d41c594..ceb9e72 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a357c351f62f235e0011e55c39f6c7f8303c0d7bc8aeb5cfbb16d200431f416f -size 106695 +oid sha256:3db00f35a4bd00a8de737bbea8611dd267e073f57a052519894c19410670cb0e +size 107105 diff --git a/Assets/Scenes/WaitingRoomScene.unity b/Assets/Scenes/WaitingRoomScene.unity index fe62969..381a8e7 100644 --- a/Assets/Scenes/WaitingRoomScene.unity +++ b/Assets/Scenes/WaitingRoomScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31f826f3f666bca6761eedaafd1236e539ea23bcb302f34b1f60161884a8e86b -size 101425 +oid sha256:e9e27d98e59ca943805445ebf1fbf3eeb785c59f5ed6f6cdfa4523addcb738e5 +size 101828 diff --git a/Assets/Scripts/Game Management/GameManager.cs b/Assets/Scripts/Game Management/GameManager.cs index dfbf454..5cd358c 100644 --- a/Assets/Scripts/Game Management/GameManager.cs +++ b/Assets/Scripts/Game Management/GameManager.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a9b7873003297face5894bff58bfd0c45326b766f7f5f01dc1c956df094b35a6 -size 5842 +oid sha256:2a4d602b088df297fc9ef9226acf04bdfe81e590309899ca390dbefaaf32da98 +size 6858 diff --git a/Assets/Scripts/Game Management/GameManagerNetwork.cs b/Assets/Scripts/Game Management/GameManagerNetwork.cs new file mode 100644 index 0000000..a58fd7f --- /dev/null +++ b/Assets/Scripts/Game Management/GameManagerNetwork.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44bb95e4297162e76bf07b90ea64579cd32d9486d9c4b95337eac00a0b2de638 +size 2435 diff --git a/Assets/GameManagerNetwork.cs.meta b/Assets/Scripts/Game Management/GameManagerNetwork.cs.meta similarity index 100% rename from Assets/GameManagerNetwork.cs.meta rename to Assets/Scripts/Game Management/GameManagerNetwork.cs.meta diff --git a/Assets/Scripts/Game Management/Host Stats Tracker.cs b/Assets/Scripts/Game Management/Host Stats Tracker.cs index 02dafa8..cb272e8 100644 --- a/Assets/Scripts/Game Management/Host Stats Tracker.cs +++ b/Assets/Scripts/Game Management/Host Stats Tracker.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7adee72fb77216983f5f5788fb5c3436a56d2e34f400babdaac54e1053276af -size 1577 +oid sha256:1d3b4f70b5679c35992da0738cb25365cfece5d3eda0eb336592b57aa2c1c25f +size 2419 diff --git a/Assets/Scripts/Game Management/ObjectiveManager.cs b/Assets/Scripts/Game Management/ObjectiveManager.cs index 58c7e33..b8b97fc 100644 --- a/Assets/Scripts/Game Management/ObjectiveManager.cs +++ b/Assets/Scripts/Game Management/ObjectiveManager.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2636d969049ee58a4ca605e75a66014f1c9f99d2f9270e640df1059cdc3fdf2d -size 4074 +oid sha256:f1e72963687c43755bcc5766aa4de108d0c302d19114e4653b8d72cfbb1a913e +size 4191 diff --git a/Assets/PrefabStock.cs b/Assets/Scripts/Game Management/PrefabStock.cs similarity index 100% rename from Assets/PrefabStock.cs rename to Assets/Scripts/Game Management/PrefabStock.cs diff --git a/Assets/PrefabStock.cs.meta b/Assets/Scripts/Game Management/PrefabStock.cs.meta similarity index 100% rename from Assets/PrefabStock.cs.meta rename to Assets/Scripts/Game Management/PrefabStock.cs.meta diff --git a/Assets/Scripts/Game Management/SmoothSync.cs b/Assets/Scripts/Game Management/SmoothSync.cs new file mode 100644 index 0000000..b9c6126 --- /dev/null +++ b/Assets/Scripts/Game Management/SmoothSync.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39a01c7c0c69dcb967fa94a631b136d923214a6fb26cad8c491a47027feb1780 +size 1601 diff --git a/Assets/SmoothSync.cs.meta b/Assets/Scripts/Game Management/SmoothSync.cs.meta similarity index 100% rename from Assets/SmoothSync.cs.meta rename to Assets/Scripts/Game Management/SmoothSync.cs.meta diff --git a/Assets/HoldArea.cs b/Assets/Scripts/Objectives/HoldArea.cs similarity index 100% rename from Assets/HoldArea.cs rename to Assets/Scripts/Objectives/HoldArea.cs diff --git a/Assets/HoldArea.cs.meta b/Assets/Scripts/Objectives/HoldArea.cs.meta similarity index 100% rename from Assets/HoldArea.cs.meta rename to Assets/Scripts/Objectives/HoldArea.cs.meta diff --git a/Assets/Scripts/Objectives/IObjective.cs b/Assets/Scripts/Objectives/IObjective.cs index dc154fc..1dc8d02 100644 --- a/Assets/Scripts/Objectives/IObjective.cs +++ b/Assets/Scripts/Objectives/IObjective.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c0dfdec058cccb5b6c9f79bfc7758dd14bbc9d397563836c157b9452896eb2c -size 646 +oid sha256:18aec7934d4b1e5862a124855aea68f907c78a015ddf00a89ac7067f8b008d8c +size 643 diff --git a/Assets/ObjectiveUI.cs b/Assets/Scripts/Objectives/ObjectiveUI.cs similarity index 100% rename from Assets/ObjectiveUI.cs rename to Assets/Scripts/Objectives/ObjectiveUI.cs diff --git a/Assets/ObjectiveUI.cs.meta b/Assets/Scripts/Objectives/ObjectiveUI.cs.meta similarity index 100% rename from Assets/ObjectiveUI.cs.meta rename to Assets/Scripts/Objectives/ObjectiveUI.cs.meta diff --git a/Assets/Scripts/TransformSync.cs b/Assets/Scripts/TransformSync.cs new file mode 100644 index 0000000..cfcc4f8 --- /dev/null +++ b/Assets/Scripts/TransformSync.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5e37839b010c0d7f1b19715297410316cf1da7aba8eca2199bb6e95a7452586 +size 1508 diff --git a/Assets/Scripts/TransformSync.cs.meta b/Assets/Scripts/TransformSync.cs.meta new file mode 100644 index 0000000..0693b90 --- /dev/null +++ b/Assets/Scripts/TransformSync.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e24d26649762d8640a8af8adefa81bcc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/VelocitySync.cs b/Assets/Scripts/VelocitySync.cs new file mode 100644 index 0000000..76e84b0 --- /dev/null +++ b/Assets/Scripts/VelocitySync.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9aa7b7a674cc04ef69d8c5fbd9b4a28ccc2bd5fff97893b97938fc6492f0b932 +size 1173 diff --git a/Assets/Scripts/VelocitySync.cs.meta b/Assets/Scripts/VelocitySync.cs.meta new file mode 100644 index 0000000..e7e86e4 --- /dev/null +++ b/Assets/Scripts/VelocitySync.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 10ec80932f6558e46a50b7efa7f6e0d0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/SmoothSync.cs b/Assets/SmoothSync.cs deleted file mode 100644 index 7fb3834..0000000 --- a/Assets/SmoothSync.cs +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11eb02b8efaf65c352a52d162feb6fe1e37b7ff8f6ec06dbb78bdd5aa808260f -size 1463 diff --git a/Assets/StartCounter.cs b/Assets/StartCounter.cs new file mode 100644 index 0000000..9386a97 --- /dev/null +++ b/Assets/StartCounter.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74ba922b36eca77e94716363b45891a27218dc0df20c75df03ea81a83e3eea9e +size 996 diff --git a/Assets/StartCounter.cs.meta b/Assets/StartCounter.cs.meta new file mode 100644 index 0000000..6622b9e --- /dev/null +++ b/Assets/StartCounter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 317b72a57ec950442b4f6d615e3799b4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI.meta b/Assets/UserUI.meta new file mode 100644 index 0000000..aa086b6 --- /dev/null +++ b/Assets/UserUI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 62012462b2381da469a081a6b4dc4c74 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Canvas.prefab b/Assets/UserUI/Canvas.prefab new file mode 100644 index 0000000..8bed477 --- /dev/null +++ b/Assets/UserUI/Canvas.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9446f0ea418d4cd1328a605247feeccdab5a10ed1f9f650cc7ed962e97e27c7 +size 62886 diff --git a/Assets/UserUI/Canvas.prefab.meta b/Assets/UserUI/Canvas.prefab.meta new file mode 100644 index 0000000..3cb2830 --- /dev/null +++ b/Assets/UserUI/Canvas.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cf57276b5483d9c4bba302512cf49c79 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/HealthDisplay.cs b/Assets/UserUI/HealthDisplay.cs new file mode 100644 index 0000000..6f2d6c1 --- /dev/null +++ b/Assets/UserUI/HealthDisplay.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17c149a06312260e8fba96d17d4b59538106d247fbcb2caabcc0b9ebb36fdbf3 +size 794 diff --git a/Assets/UserUI/HealthDisplay.cs.meta b/Assets/UserUI/HealthDisplay.cs.meta new file mode 100644 index 0000000..cee4b92 --- /dev/null +++ b/Assets/UserUI/HealthDisplay.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d2a9b412f2b353744bfe1c023e64e8fb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Materials.meta b/Assets/UserUI/Materials.meta new file mode 100644 index 0000000..7021245 --- /dev/null +++ b/Assets/UserUI/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 97b92bcd005673f47b35e09921765702 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Materials/Bangers SDF TextureBelowBronze.mat b/Assets/UserUI/Materials/Bangers SDF TextureBelowBronze.mat new file mode 100644 index 0000000..33fe2b2 --- /dev/null +++ b/Assets/UserUI/Materials/Bangers SDF TextureBelowBronze.mat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:432b403dd358e95a1410d9c7c0278bbb5d53d08006ced4ba5f21681da1143f14 +size 3167 diff --git a/Assets/UserUI/Materials/Bangers SDF TextureBelowBronze.mat.meta b/Assets/UserUI/Materials/Bangers SDF TextureBelowBronze.mat.meta new file mode 100644 index 0000000..1e2adca --- /dev/null +++ b/Assets/UserUI/Materials/Bangers SDF TextureBelowBronze.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 96c87c3bad7efad43a2672af1313b530 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Materials/Bangers SDF TextureBronze.mat b/Assets/UserUI/Materials/Bangers SDF TextureBronze.mat new file mode 100644 index 0000000..2b8377b --- /dev/null +++ b/Assets/UserUI/Materials/Bangers SDF TextureBronze.mat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ade169aa4bffbabee8145ee082fac9b694fbfd4731d1f87b45f9b3726c7642a0 +size 3135 diff --git a/Assets/UserUI/Materials/Bangers SDF TextureBronze.mat.meta b/Assets/UserUI/Materials/Bangers SDF TextureBronze.mat.meta new file mode 100644 index 0000000..60e25b1 --- /dev/null +++ b/Assets/UserUI/Materials/Bangers SDF TextureBronze.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8fa9bdcbf5d7cdd4d87d8f0081e5867a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Materials/Bangers SDF TextureGold.mat b/Assets/UserUI/Materials/Bangers SDF TextureGold.mat new file mode 100644 index 0000000..b0e3797 --- /dev/null +++ b/Assets/UserUI/Materials/Bangers SDF TextureGold.mat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f110eb97b206b74d6d8c786bd6be8c254ca772ce0b665bba0377a7212fc64162 +size 3133 diff --git a/Assets/UserUI/Materials/Bangers SDF TextureGold.mat.meta b/Assets/UserUI/Materials/Bangers SDF TextureGold.mat.meta new file mode 100644 index 0000000..1da35c6 --- /dev/null +++ b/Assets/UserUI/Materials/Bangers SDF TextureGold.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 10ddea07773cf2e48a58e958068aa3fe +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Materials/Bangers SDF TextureSilver.mat b/Assets/UserUI/Materials/Bangers SDF TextureSilver.mat new file mode 100644 index 0000000..6356722 --- /dev/null +++ b/Assets/UserUI/Materials/Bangers SDF TextureSilver.mat @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ff48062e7f08536839bd7cf34596807223a17baef7653d86a71b91df10e4815 +size 3135 diff --git a/Assets/UserUI/Materials/Bangers SDF TextureSilver.mat.meta b/Assets/UserUI/Materials/Bangers SDF TextureSilver.mat.meta new file mode 100644 index 0000000..45cde3b --- /dev/null +++ b/Assets/UserUI/Materials/Bangers SDF TextureSilver.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d113888fba9c1724aa425a54b06fc71e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Materials/bronze_texture.png b/Assets/UserUI/Materials/bronze_texture.png new file mode 100644 index 0000000..34789f8 --- /dev/null +++ b/Assets/UserUI/Materials/bronze_texture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c08ccc4ae98111ae475c2b2925f9c29555979917515bde8c475ef8b1cf84bd05 +size 10596 diff --git a/Assets/UserUI/Materials/bronze_texture.png.meta b/Assets/UserUI/Materials/bronze_texture.png.meta new file mode 100644 index 0000000..7287e64 --- /dev/null +++ b/Assets/UserUI/Materials/bronze_texture.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: c726144741e00904fa3a93c2bcacfcee +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Materials/gold_texture.png b/Assets/UserUI/Materials/gold_texture.png new file mode 100644 index 0000000..06411ba --- /dev/null +++ b/Assets/UserUI/Materials/gold_texture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0c8d3f3afa8f8d28fff4628a84a1dac819ee2175529d96eadbac12b426947ed +size 9590 diff --git a/Assets/UserUI/Materials/gold_texture.png.meta b/Assets/UserUI/Materials/gold_texture.png.meta new file mode 100644 index 0000000..3bb975e --- /dev/null +++ b/Assets/UserUI/Materials/gold_texture.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 2a212b6be874952428a4a88677813729 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Materials/silver_texture.png b/Assets/UserUI/Materials/silver_texture.png new file mode 100644 index 0000000..ba2aec6 --- /dev/null +++ b/Assets/UserUI/Materials/silver_texture.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dddde86d85b9443eb78ae4c82450e3a716e5c5f853bb0560c56823b8d54dc406 +size 9959 diff --git a/Assets/UserUI/Materials/silver_texture.png.meta b/Assets/UserUI/Materials/silver_texture.png.meta new file mode 100644 index 0000000..84d6f36 --- /dev/null +++ b/Assets/UserUI/Materials/silver_texture.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 4dd4e87f579662c4ebfe05afa6cc662a +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/ScoreDisplay.cs b/Assets/UserUI/ScoreDisplay.cs new file mode 100644 index 0000000..0149a7e --- /dev/null +++ b/Assets/UserUI/ScoreDisplay.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fe769e1fb3c118090f73286f1631f206228bb8a4a0afcb1891043901ecd8374 +size 1979 diff --git a/Assets/UserUI/ScoreDisplay.cs.meta b/Assets/UserUI/ScoreDisplay.cs.meta new file mode 100644 index 0000000..2f7cacf --- /dev/null +++ b/Assets/UserUI/ScoreDisplay.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d444cccff79b9704b8db87a2ea60f422 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/SpeedDisplay.cs b/Assets/UserUI/SpeedDisplay.cs new file mode 100644 index 0000000..f0dbe5a --- /dev/null +++ b/Assets/UserUI/SpeedDisplay.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0127fc19660e35d92d13361a6c361500e524ad7737bca58a170ee3c2dc8cc21c +size 806 diff --git a/Assets/UserUI/SpeedDisplay.cs.meta b/Assets/UserUI/SpeedDisplay.cs.meta new file mode 100644 index 0000000..cf927f7 --- /dev/null +++ b/Assets/UserUI/SpeedDisplay.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5256b04fa14e6f24e924dd93792e0da7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Sprites.meta b/Assets/UserUI/Sprites.meta new file mode 100644 index 0000000..6f70380 --- /dev/null +++ b/Assets/UserUI/Sprites.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8325e61d1153760409f171a0219278fb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Sprites/Healthbar.png b/Assets/UserUI/Sprites/Healthbar.png new file mode 100644 index 0000000..54ef394 --- /dev/null +++ b/Assets/UserUI/Sprites/Healthbar.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62dc55763c8b91b774a79771ddca7a217b94c017a8717b68230e9fbb46d1f80f +size 629 diff --git a/Assets/UserUI/Sprites/Healthbar.png.meta b/Assets/UserUI/Sprites/Healthbar.png.meta new file mode 100644 index 0000000..0d48ec2 --- /dev/null +++ b/Assets/UserUI/Sprites/Healthbar.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: c5fca3fa204980748b63f5d099c94d1d +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Sprites/Score.png b/Assets/UserUI/Sprites/Score.png new file mode 100644 index 0000000..05a74c0 --- /dev/null +++ b/Assets/UserUI/Sprites/Score.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9cc98425ec22b56798ef61e3f94b45c309c95822a510823eaeadbdb4e864ec4 +size 60714 diff --git a/Assets/UserUI/Sprites/Score.png.meta b/Assets/UserUI/Sprites/Score.png.meta new file mode 100644 index 0000000..6aff41f --- /dev/null +++ b/Assets/UserUI/Sprites/Score.png.meta @@ -0,0 +1,100 @@ +fileFormatVersion: 2 +guid: a99c0351a9b72f140815270e4cd36490 +TextureImporter: + fileIDToRecycleName: + 2186277476908879412: ImportLogs + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Sprites/empty_speed.png b/Assets/UserUI/Sprites/empty_speed.png new file mode 100644 index 0000000..5759733 --- /dev/null +++ b/Assets/UserUI/Sprites/empty_speed.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11ffc355e4c33040bc8847354ff3d723e7cd43f20d5e4528a22d993bf2139552 +size 10217 diff --git a/Assets/UserUI/Sprites/empty_speed.png.meta b/Assets/UserUI/Sprites/empty_speed.png.meta new file mode 100644 index 0000000..32bc3a5 --- /dev/null +++ b/Assets/UserUI/Sprites/empty_speed.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: bbc29a497d637a349a1025935304ead7 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Sprites/fill_speed.png b/Assets/UserUI/Sprites/fill_speed.png new file mode 100644 index 0000000..f886e46 --- /dev/null +++ b/Assets/UserUI/Sprites/fill_speed.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4db2f3fd9f59a4a51c2a201eb17c4c857ca6dfcdc4a983e2bf3fc00621aabe2f +size 34707 diff --git a/Assets/UserUI/Sprites/fill_speed.png.meta b/Assets/UserUI/Sprites/fill_speed.png.meta new file mode 100644 index 0000000..4a8013f --- /dev/null +++ b/Assets/UserUI/Sprites/fill_speed.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 6a105738f9b56f34893e3f31fe44f618 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Sprites/speedometer.png b/Assets/UserUI/Sprites/speedometer.png new file mode 100644 index 0000000..a557fc1 --- /dev/null +++ b/Assets/UserUI/Sprites/speedometer.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:916392e9009221d1a105a6bd24ac63caa434dfed637424c37bb0d99366b6b01a +size 12534 diff --git a/Assets/UserUI/Sprites/speedometer.png.meta b/Assets/UserUI/Sprites/speedometer.png.meta new file mode 100644 index 0000000..d8d69d5 --- /dev/null +++ b/Assets/UserUI/Sprites/speedometer.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: a2ce6ca968895744bb08bda28d7b8503 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Sprites/speedometer_src.xcf b/Assets/UserUI/Sprites/speedometer_src.xcf new file mode 100644 index 0000000..22777ef Binary files /dev/null and b/Assets/UserUI/Sprites/speedometer_src.xcf differ diff --git a/Assets/UserUI/Sprites/speedometer_src.xcf.meta b/Assets/UserUI/Sprites/speedometer_src.xcf.meta new file mode 100644 index 0000000..123cf82 --- /dev/null +++ b/Assets/UserUI/Sprites/speedometer_src.xcf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9707c248be5221a4ebc72bba245e9f6a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/Sprites/timer.png b/Assets/UserUI/Sprites/timer.png new file mode 100644 index 0000000..3c6d283 --- /dev/null +++ b/Assets/UserUI/Sprites/timer.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e89934960140ee92842971dd75b79a7143156e7c90f2de1ea6c12db1841a3a0 +size 21226 diff --git a/Assets/UserUI/Sprites/timer.png.meta b/Assets/UserUI/Sprites/timer.png.meta new file mode 100644 index 0000000..e35a2e8 --- /dev/null +++ b/Assets/UserUI/Sprites/timer.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: ae690daabbf45b44bb5ecf41a6ccfa62 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: -1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UserUI/TimerDisplay.cs b/Assets/UserUI/TimerDisplay.cs new file mode 100644 index 0000000..36989e6 --- /dev/null +++ b/Assets/UserUI/TimerDisplay.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e8a3f31d27a860b2d8a6afa81e2075e6302c19b0a4dd9a98c9699a50b2d39d6 +size 650 diff --git a/Assets/UserUI/TimerDisplay.cs.meta b/Assets/UserUI/TimerDisplay.cs.meta new file mode 100644 index 0000000..ddeca8a --- /dev/null +++ b/Assets/UserUI/TimerDisplay.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 020e0ffec08fa4f49b9a3825ad2e876c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WeaponSystem/Prefabs/Weapons/Projectiles/bullet_ray.prefab b/Assets/WeaponSystem/Prefabs/Weapons/Projectiles/bullet_ray.prefab index 0419c52..09afa6f 100644 --- a/Assets/WeaponSystem/Prefabs/Weapons/Projectiles/bullet_ray.prefab +++ b/Assets/WeaponSystem/Prefabs/Weapons/Projectiles/bullet_ray.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fbef80977165072a988c25848915ce5cd579b90448f6258d98adb1159059573 -size 6569 +oid sha256:bee338356ba83a1776700de91535e4f9e3c3bd62e9e7e9767f3973c21c88724e +size 6570 diff --git a/Assets/WeaponSystem/Prefabs/Weapons/Projectiles/chain_damage.prefab b/Assets/WeaponSystem/Prefabs/Weapons/Projectiles/chain_damage.prefab index 6fef0e8..a96d41a 100644 --- a/Assets/WeaponSystem/Prefabs/Weapons/Projectiles/chain_damage.prefab +++ b/Assets/WeaponSystem/Prefabs/Weapons/Projectiles/chain_damage.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c74929a2ab1e0e4b0e3c9a2bfb14afa781e56e6d3737e4e3c0345067b708c37 -size 116463 +oid sha256:a7515a06397e72dc0f0b58e51839e9db7071d44eb54499fc33b74b5daa0fea70 +size 116464