From dceafa66e84152f1b687a07cbf0a88735ba233bd Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Tue, 6 Jan 2015 01:17:43 +0600 Subject: [PATCH] new images --- Assembly-CSharp-vs.csproj | 8 +- Assembly-CSharp.csproj | 8 +- Assets/Images/Building1.png | Bin 0 -> 1224 bytes Assets/Images/Building1.png.meta | 47 + Assets/Images/Building7.png | Bin 1029 -> 377 bytes Assets/Images/Building7.png.meta | 2 +- Assets/Images/Floor2.png | Bin 0 -> 289 bytes Assets/Images/Floor2.png.meta | 58 + Assets/Images/Wall.png | Bin 0 -> 408 bytes Assets/Images/Wall.png.meta | 58 + Assets/Images/Wall2.png | Bin 0 -> 391 bytes Assets/Images/Wall2.png.meta | 58 + ...{Building1x1x1.prefab => Building1.prefab} | 29 +- ...x1x1.prefab.meta => Building1.prefab.meta} | 2 +- Assets/Prefabs/Building1x3x1.prefab | 4 +- Assets/Prefabs/Building3x1x1.prefab | 4 +- Assets/Prefabs/Floor.prefab | 5 +- Assets/Prefabs/Floor2.prefab | 79 + Assets/Prefabs/Floor2.prefab.meta | 4 + Assets/Prefabs/Wall.prefab | 79 + Assets/Prefabs/Wall.prefab.meta | 4 + Assets/Prefabs/Wall2.prefab | 79 + Assets/Prefabs/Wall2.prefab.meta | 4 + Assets/Scenes/Scene1.unity | 1602 +---- Assets/Scenes/Scene2.unity | 5928 ++++++++++++----- UnityIso-csharp.sln | 2 +- UnityIso.sln | 2 +- 27 files changed, 4833 insertions(+), 3233 deletions(-) create mode 100644 Assets/Images/Building1.png create mode 100644 Assets/Images/Building1.png.meta create mode 100644 Assets/Images/Floor2.png create mode 100644 Assets/Images/Floor2.png.meta create mode 100644 Assets/Images/Wall.png create mode 100644 Assets/Images/Wall.png.meta create mode 100644 Assets/Images/Wall2.png create mode 100644 Assets/Images/Wall2.png.meta rename Assets/Prefabs/{Building1x1x1.prefab => Building1.prefab} (81%) rename Assets/Prefabs/{Building1x1x1.prefab.meta => Building1.prefab.meta} (58%) create mode 100644 Assets/Prefabs/Floor2.prefab create mode 100644 Assets/Prefabs/Floor2.prefab.meta create mode 100644 Assets/Prefabs/Wall.prefab create mode 100644 Assets/Prefabs/Wall.prefab.meta create mode 100644 Assets/Prefabs/Wall2.prefab create mode 100644 Assets/Prefabs/Wall2.prefab.meta diff --git a/Assembly-CSharp-vs.csproj b/Assembly-CSharp-vs.csproj index 8a9dbf1..901df00 100644 --- a/Assembly-CSharp-vs.csproj +++ b/Assembly-CSharp-vs.csproj @@ -19,7 +19,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_4_6_0;UNITY_4_6;UNITY_STANDALONE_OSX;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_UNITYEVENTS;ENABLE_NEW_HIERARCHY ;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_TERRAIN;ENABLE_SUBSTANCE;ENABLE_GENERICS;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_4_6_FEATURES;INCLUDE_WP_BLUE_SUPPORT;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_GAMECENTER;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_OSX;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE + DEBUG;TRACE;UNITY_4_6_1;UNITY_4_6;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_UNITYEVENTS;ENABLE_NEW_HIERARCHY ;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_TERRAIN;ENABLE_SUBSTANCE;ENABLE_GENERICS;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_4_6_FEATURES;INCLUDE_WP_BLUE_SUPPORT;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE prompt 4 0169 @@ -39,10 +39,10 @@ - /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEngine.dll + C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll - /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.dll + C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll @@ -51,7 +51,7 @@ - /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/4.6.0/UnityEngine.UI.dll + C:/Program Files (x86)/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/4.6.1/UnityEngine.UI.dll diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 8a9dbf1..901df00 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -19,7 +19,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_4_6_0;UNITY_4_6;UNITY_STANDALONE_OSX;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_UNITYEVENTS;ENABLE_NEW_HIERARCHY ;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_TERRAIN;ENABLE_SUBSTANCE;ENABLE_GENERICS;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_4_6_FEATURES;INCLUDE_WP_BLUE_SUPPORT;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_GAMECENTER;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_OSX;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE + DEBUG;TRACE;UNITY_4_6_1;UNITY_4_6;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_UNITYEVENTS;ENABLE_NEW_HIERARCHY ;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_TERRAIN;ENABLE_SUBSTANCE;ENABLE_GENERICS;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_4_6_FEATURES;INCLUDE_WP_BLUE_SUPPORT;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE prompt 4 0169 @@ -39,10 +39,10 @@ - /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEngine.dll + C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll - /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.dll + C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll @@ -51,7 +51,7 @@ - /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/4.6.0/UnityEngine.UI.dll + C:/Program Files (x86)/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/4.6.1/UnityEngine.UI.dll diff --git a/Assets/Images/Building1.png b/Assets/Images/Building1.png new file mode 100644 index 0000000000000000000000000000000000000000..191357d3e6747df4d25c040f5970f05a5ae55171 GIT binary patch literal 1224 zcmV;(1ULJMP)00001b5ch_0Itp) z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;Eegmrwuz1UX4WK~#8N?Uc!F8&MDi6@wDc#R2%@5PWn7 z4#LjB0XR5kB%_5c@S*4ZWjNes#0Clw`Fkxue0jzL$G<@YoLZJ*jv{EZFG5y}0p4LW@ZOB}t3rVH)G`(WMF zwI8IG<-d|9>GvbZXK-tQ(ZQp4aL4y>J%YMtYH9z*@O|sOLY_)dv{z6CRBC?h4>%~AT&kc2GFDJ#-1iU*5iuMXz zFNM6+GB2hzu;#g;J)%a%xEzH!Dna2LTn`8Nsb#&G)&k&$_K2EGh~ay1wLPdyE$52? z-oXv+5j9)H@VVk@dr+5Jwu=Gszzugq?m1#AbzfK8gSymm5(6ql2RRuI?G?Bsl*rj4 zrnRrDb!e|3wJgOz9pohR&|ZOCDu}lkG1@Co84B;NhoZfd)N&FtDsacoQ2Xd|%x<9kq77f@78 zMVFs}y4L=#Cg44_jKu(X;3PQ6Z!HoyF*Sb{?V-3_g}l^qz8G*a6!P3MLAv>^u8@~nwu=GY;o4&8 z3vTCtch^H9FSVS+fNLJ`?wW%3skrRSEs?DbI_>CzQ)dJBTqI5C>5 zxZXW#eV(;FYGW36kmD8v?FA~PvZl8~dj)yc<%0n#2MerOUWxomh~Yigx__{c;udca`CG*BJ>*)C7c5v0Xc4*Rh~aaN zef(fyPzjF6StF*BWA_&v;G_icwnj|0-G6WptQDiRLAE_!aNtM`d0BS+;9y0?RI=>z mMI5hU^6O_j#q1_tUj75>-&_QU`I$ff0000AjbiBL{Q4GJ0x0000DNk~Le0000Y0000X2nGNE0KC(AY>_S-3c>&Y z4#EKyC`y2lQzm}^_en%SR9Hvt&e5&IAP_`R+Di@TB44Q_)ucBEL`Ei)vAu=`|FF_U zPkERZa!0FVnLH6h%Da1+A0L0T~_ z5bQ6e9#jJn0G{)pGY|uS#}2YUDgZpkpgo8KfM*+|ARPca|DX~w0Kl_?*5yM1JPv>m ZJ|rpCHw6!5ZHfQ@002ovPDHLkV1h&xd}{yz delta 984 zcmey#)XJgP8Q|y6%O%Cdz`(%k>ERLtq+Nj6iGvMDzVj+r52P52gWR1M)}51iIZ;uX z>o5ZY-(kk%`72T;x~bJOmwCE4hE&A8o$)&FmV-d+N7bpb?A(7V$5%|yG<*y`s+79W$;Y~4Lgdcu<~7*;qc9QfF~OrtAp`)$+D zKleoHh@DN_{O}QvlfuIeZ5GXY|MuQKz#wsI=OYfr19kiDAF?p!^~Nu@t(SSS<8^~V zl1BE6z9xm`%zdY=E<9;$(DuvOe*1C)U-padEEo4E2V8qt+M?znP{rmbu;WOe;NIih zjNx+*Gz+dPh-l8#6Ft(Dl~u)mal+Lt{Q`~!L6)aBx$qZos#hKmOuzQ}>&qP_5x&1U z1YMkMGbgocWSCx^I-}`;s?4j6VJ!8>joJGiMEI7fE>nZUF%2i$t#&tnH|B9Af&O98c zH=SuuOX*SGIm#xR-Si@6zhixU_`;bq+9wC<$4SIFSpZ%Y16p<@7HsF*_aBpv1;G5=kksF{7$q!?!TYJymw#MYt31G znjH1L45fiWMUX7dkNr{{CqD}oDV8+?!%kFnuGEhZ#;jC*j+iEyzE}VIP14sa zyv@@2mczHm(PX;CvmnQPwskN6^n7?I$})e$){jvN25kioBA$FL2zj*hG-uO$vp-dD z>P#x?1wL1`#Ox?#&TXps`$yvL###4R3;hcJU+0y5aplqX<;%()O`641N;=vvDlT@u zB`IrUwPY?5^9}1pv!yEAf3?JHz)iE5-u3UOy&8UkH9OcVz}Vceq(gd*is8%Mau4gl z5juI_Yr(nBDjT|53SR$lDd=bkyC{%1cYcT5qK2z3;z7@qA<3ro%FmA3?HLEMHuc{4 z-FeU1B*pZu+nc{GWr|W;+8(sr^G}gql$fpI_u}u7yR8xj%on`3D*Ud<_KEk+Zoirx u8`^RnA8t1-k#6oj$h|;W*->qBeWvi?Diy^w=eGcJDTAl0pUXO@geCxQ^S)RB diff --git a/Assets/Images/Building7.png.meta b/Assets/Images/Building7.png.meta index da8ea49..c1bcb17 100644 --- a/Assets/Images/Building7.png.meta +++ b/Assets/Images/Building7.png.meta @@ -35,7 +35,7 @@ TextureImporter: spriteExtrude: 1 spriteMeshType: 1 alignment: 9 - spritePivot: {x: .495999992, y: .252999991} + spritePivot: {x: .5, y: .254999995} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 1 alphaIsTransparency: 1 diff --git a/Assets/Images/Floor2.png b/Assets/Images/Floor2.png new file mode 100644 index 0000000000000000000000000000000000000000..7675958a9b7eba06ae5d3e4d245abafd9336d14e GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^Na~60+7BevL9R^{>)hAIyZ*NdLrr1HRdepfZ8=!b>z?NK?RA0E!*I~>R; z|IVAGkE_tXJvv8pQG9z9r|2U8qnmX&KgPQT@^Efk-@p5ZNYc8a!68n2OlKTAGi_1V f?q{|4#J$Dec6gYC2B{nZx{krq)z4*}Q$iB}lnrR> literal 0 HcmV?d00001 diff --git a/Assets/Images/Floor2.png.meta b/Assets/Images/Floor2.png.meta new file mode 100644 index 0000000..2d0288f --- /dev/null +++ b/Assets/Images/Floor2.png.meta @@ -0,0 +1,58 @@ +fileFormatVersion: 2 +guid: acb19fa5475385a47a614d3a2f318ed1 +TextureImporter: + fileIDToRecycleName: + 21300000: Floor2_0 + 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: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 1 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: + - name: Floor2_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 34 + height: 17 + alignment: 9 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + spritePackingTag: + userData: diff --git a/Assets/Images/Wall.png b/Assets/Images/Wall.png new file mode 100644 index 0000000000000000000000000000000000000000..ebd62a336d063442c358b0faf676875295e91fb2 GIT binary patch literal 408 zcmeAS@N?(olHy`uVBq!ia0vp^iXhCv1|-9u9Lfh$jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ>#Bd(*uBpa(cQrhD5kO?PKI?QQ%>zmHPjG%JjFTzDJdGn|3}?i!}7wy}5V8``xpj zRxB-_$v1tQ*PHU$nJLrU-!GMj&3L|PGkbrVY|!tt>CroO@7!OVXcTwf`Yc}32f^MfyZeVGSJiFmQGAGODO;5yC8e*jqJ6Srrbfz*$3R>=cdNCnxn}v(ZH1CFa zC;odd__N%XP&&P5Qe4Tl(<|3#t@k|r!be=}{?zL&sbBJhqvr{3C`tX&clz?DS<8C< zStp)O=Zw%Z`sEuD8&`bdLCxwdtsXV;?l-sbizdgLGA;6)01P+=Pgg&ebxsLQ0H2Da A9{>OV literal 0 HcmV?d00001 diff --git a/Assets/Images/Wall.png.meta b/Assets/Images/Wall.png.meta new file mode 100644 index 0000000..fe65bbd --- /dev/null +++ b/Assets/Images/Wall.png.meta @@ -0,0 +1,58 @@ +fileFormatVersion: 2 +guid: 94ee4968df8f08d47a494b66b54e1987 +TextureImporter: + fileIDToRecycleName: + 21300000: Wall_0 + 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: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 1 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: + - name: Wall_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 33 + height: 33 + alignment: 9 + pivot: {x: .485000014, y: .254999995} + border: {x: 0, y: 0, z: 0, w: 0} + spritePackingTag: + userData: diff --git a/Assets/Images/Wall2.png b/Assets/Images/Wall2.png new file mode 100644 index 0000000000000000000000000000000000000000..ec54c530b097a5bdde1205348932b00834599397 GIT binary patch literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^iXhCv1|-9u9Lfh$jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ>#Bd(*uBNet5b#hD5l(o#4&a?7-t}DfNB7$kD(iAH$jQhr87G>b0qC+x2Bb?(Ma~ zfsHf!7xrzx)oZmZo0fN>7`JO>ERjyJPn6|I{T@c-nqE>pPg5*L8+F{a<&>xjO}| i8lU2JG