diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/No Name.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/No Name.mat index e3b2576..951a1be 100644 Binary files a/IronToad_UnityProject/Assets/Art/Models/Materials/No Name.mat and b/IronToad_UnityProject/Assets/Art/Models/Materials/No Name.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/boat_LOW_defaultMat_C.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/boat_LOW_defaultMat_C.mat index 8a84dc3..228cb39 100644 Binary files a/IronToad_UnityProject/Assets/Art/Models/Materials/boat_LOW_defaultMat_C.mat and b/IronToad_UnityProject/Assets/Art/Models/Materials/boat_LOW_defaultMat_C.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/light-gradient.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/light-gradient.mat index 8883f4e..4da3a6f 100644 Binary files a/IronToad_UnityProject/Assets/Art/Models/Materials/light-gradient.mat and b/IronToad_UnityProject/Assets/Art/Models/Materials/light-gradient.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/mat_Lighthouse.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_Lighthouse.mat index 4e99c1e..0ce906a 100644 Binary files a/IronToad_UnityProject/Assets/Art/Models/Materials/mat_Lighthouse.mat and b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_Lighthouse.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/mat_Pier.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_Pier.mat index 80e3465..d1e4750 100644 Binary files a/IronToad_UnityProject/Assets/Art/Models/Materials/mat_Pier.mat and b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_Pier.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat index cd6cd2c..a2f4fa3 100644 Binary files a/IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat and b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/toonROCKS.mat b/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/toonROCKS.mat index b97e329..262a19d 100644 Binary files a/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/toonROCKS.mat and b/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/toonROCKS.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/huts/Materials/mat_hut.mat b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/mat_hut.mat index 8565014..1a24a52 100644 Binary files a/IronToad_UnityProject/Assets/Art/Models/huts/Materials/mat_hut.mat and b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/mat_hut.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/pier.obj b/IronToad_UnityProject/Assets/Art/Models/pier.obj new file mode 100755 index 0000000..bdaaf42 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/pier.obj @@ -0,0 +1,531 @@ +# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware +# File Created: 22.01.2017 01:19:15 + +mtllib pier_Low.mtl + +# +# object pCylinder3 +# + +v -8.273293 -1.337962 -2.891515 +v -8.548146 -1.344215 -3.166298 +v -8.923603 -1.346503 -3.266875 +v -9.299059 -1.344215 -3.166298 +v -9.573913 -1.337962 -2.891515 +v -9.674517 -1.329421 -2.516156 +v -9.573913 -1.320881 -2.140796 +v -9.299059 -1.314628 -1.866014 +v -8.923603 -1.312340 -1.765436 +v -8.548146 -1.314628 -1.866014 +v -8.273293 -1.320881 -2.140796 +v -8.172689 -1.329421 -2.516156 +v -8.273293 4.345032 -3.020824 +v -8.548146 4.338779 -3.295606 +v -8.923603 4.336491 -3.396184 +v -9.299059 4.338779 -3.295606 +v -9.573913 4.345032 -3.020824 +v -9.674517 4.353572 -2.645464 +v -9.573913 4.362113 -2.270105 +v -9.299059 4.368365 -1.995322 +v -8.923603 4.370654 -1.894745 +v -8.548146 4.368365 -1.995322 +v -8.273293 4.362113 -2.270105 +v -8.172689 4.353572 -2.645464 +v -8.923603 4.353572 -2.645464 +v 2.856649 2.201051 3.693646 +v 3.991534 2.201017 3.691912 +v 2.856649 2.529436 3.687111 +v 3.991534 2.529401 3.685377 +v 2.846209 2.393436 -3.146799 +v 3.981094 2.393401 -3.148533 +v 2.846209 2.065051 -3.140264 +v 3.981094 2.065017 -3.141998 +v 1.517888 2.012017 3.550521 +v 2.652765 2.011857 3.555190 +v 1.517888 2.340273 3.561800 +v 2.652765 2.340112 3.566468 +v 1.546023 2.574989 -3.269382 +v 2.680901 2.574829 -3.264713 +v 1.546023 2.246733 -3.280661 +v 2.680901 2.246573 -3.275992 +v 0.160171 2.048619 3.475774 +v 1.295047 2.048507 3.480444 +v 0.160171 2.376974 3.483677 +v 1.295047 2.376861 3.488347 +v 0.188306 2.541441 -3.349557 +v 1.323183 2.541328 -3.344887 +v 0.188306 2.213086 -3.357460 +v 1.323183 2.212974 -3.352790 +v 6.854704 2.130749 3.538149 +v 7.989454 2.130749 3.555686 +v 6.854704 2.459198 3.538149 +v 7.989454 2.459198 3.555686 +v 6.960329 2.459199 -3.296305 +v 8.095079 2.459199 -3.278768 +v 6.960329 2.130749 -3.296305 +v 8.095079 2.130749 -3.278768 +v -2.569141 2.130749 3.424644 +v -1.434349 2.130749 3.410044 +v -2.569141 2.459198 3.424644 +v -1.434349 2.459198 3.410044 +v -2.657073 2.459199 -3.410062 +v -1.522280 2.459199 -3.424661 +v -2.657073 2.130749 -3.410062 +v -1.522280 2.130749 -3.424661 +v -1.282552 2.130749 3.337830 +v -0.147802 2.130749 3.355368 +v -1.282552 2.459198 3.337830 +v -0.147802 2.459198 3.355368 +v -1.176928 2.459199 -3.496624 +v -0.042177 2.459199 -3.479087 +v -1.176928 2.130749 -3.496624 +v -0.042177 2.130749 -3.479087 +v 4.215331 2.130749 3.480714 +v 5.350207 2.130749 3.485386 +v 4.215331 2.459198 3.480714 +v 5.350207 2.459198 3.485386 +v 4.243466 2.459199 -3.354499 +v 5.378344 2.459199 -3.349828 +v 4.243466 2.130749 -3.354499 +v 5.378344 2.130749 -3.349828 +v -3.986905 2.082557 3.412587 +v -2.852028 2.082490 3.417258 +v -3.986905 2.410972 3.417333 +v -2.852028 2.410905 3.422003 +v -3.958769 2.509723 -3.417167 +v -2.823892 2.509656 -3.412496 +v -3.958769 2.181308 -3.421912 +v -2.823892 2.181241 -3.417242 +v -5.454344 2.131696 3.616781 +v -4.319593 2.131696 3.634318 +v -5.454344 2.460146 3.616781 +v -4.319593 2.460146 3.634318 +v -5.348719 2.460146 -3.217674 +v -4.213968 2.460146 -3.200136 +v -5.348719 2.131697 -3.217674 +v -4.213968 2.131697 -3.200136 +v -6.676205 1.989326 3.480380 +v -5.541413 1.989929 3.465793 +v -6.676205 2.317495 3.493957 +v -5.541413 2.318098 3.479370 +v -6.764137 2.600018 -3.334907 +v -5.629344 2.600622 -3.349494 +v -6.764137 2.271850 -3.348484 +v -5.629344 2.272453 -3.363071 +v -8.095533 2.130749 3.655143 +v -6.960657 2.130749 3.659814 +v -8.095533 2.459198 3.655143 +v -6.960657 2.459198 3.659814 +v -8.067397 2.459199 -3.180070 +v -6.932521 2.459199 -3.175399 +v -8.067397 2.130749 -3.180070 +v -6.932521 2.130749 -3.175399 +v 5.574599 2.130749 3.344643 +v 6.709475 2.130749 3.349314 +v 5.574599 2.459198 3.344643 +v 6.709475 2.459198 3.349314 +v 5.602735 2.459199 -3.490571 +v 6.737611 2.459199 -3.485899 +v 5.602735 2.130749 -3.490571 +v 6.737611 2.130749 -3.485899 +v -8.273293 -1.324204 2.351530 +v -8.548146 -1.319793 2.076711 +v -8.923603 -1.318178 1.976121 +v -9.299059 -1.319793 2.076711 +v -9.573913 -1.324204 2.351530 +v -9.674517 -1.330231 2.726938 +v -9.573913 -1.336258 3.102346 +v -9.299059 -1.340670 3.377165 +v -8.923603 -1.342285 3.477755 +v -8.548146 -1.340670 3.377165 +v -8.273293 -1.336258 3.102346 +v -8.172689 -1.330231 2.726938 +v -8.273293 4.359528 2.442775 +v -8.548146 4.363939 2.167957 +v -8.923603 4.365555 2.067367 +v -9.299059 4.363939 2.167957 +v -9.573913 4.359528 2.442775 +v -9.674517 4.353501 2.818183 +v -9.573913 4.347474 3.193592 +v -9.299059 4.343062 3.468410 +v -8.923603 4.341448 3.569000 +v -8.548146 4.343062 3.468410 +v -8.273293 4.347474 3.193592 +v -8.172689 4.353501 2.818183 +v -8.923603 4.353501 2.818183 +v -8.411210 1.700595 3.014707 +v 7.905429 1.700595 3.014707 +v -8.411210 2.145800 3.014707 +v 7.905429 2.145800 3.014707 +v -8.411210 2.145800 2.569502 +v 7.905429 2.145800 2.569502 +v -8.411210 1.700595 2.569502 +v 7.905429 1.700595 2.569502 +v -8.411210 1.700595 -2.308717 +v 7.905429 1.700595 -2.308717 +v -8.411210 2.145800 -2.308717 +v 7.905429 2.145800 -2.308717 +v -8.411210 2.145800 -2.753922 +v 7.905429 2.145800 -2.753922 +v -8.411210 1.700595 -2.753922 +v 7.905429 1.700595 -2.753922 +# 162 vertices + +vt 0.679957 0.370510 0.000000 +vt 0.679957 0.392842 0.000000 +vt 0.341837 0.392842 0.000000 +vt 0.341837 0.370510 0.000000 +vt 0.679957 0.415175 0.000000 +vt 0.341837 0.415175 0.000000 +vt 0.679957 0.354161 0.000000 +vt 0.341837 0.354161 0.000000 +vt 0.679957 0.431524 0.000000 +vt 0.341837 0.431524 0.000000 +vt 0.679957 0.492538 0.000000 +vt 0.679957 0.514870 0.000000 +vt 0.341837 0.270814 0.000000 +vt 0.341837 0.492538 0.000000 +vt 0.679957 0.293147 0.000000 +vt 0.341837 0.293147 0.000000 +vt 0.679957 0.476189 0.000000 +vt 0.341837 0.476189 0.000000 +vt 0.679957 0.309496 0.000000 +vt 0.341837 0.309496 0.000000 +vt 0.729397 0.444041 0.000000 +vt 0.714064 0.428708 0.000000 +vt 0.750343 0.407762 0.000000 +vt 0.708451 0.407762 0.000000 +vt 0.750343 0.449654 0.000000 +vt 0.714064 0.386817 0.000000 +vt 0.771289 0.444041 0.000000 +vt 0.729397 0.371483 0.000000 +vt 0.786622 0.428708 0.000000 +vt 0.750343 0.365871 0.000000 +vt 0.792234 0.407762 0.000000 +vt 0.771289 0.371483 0.000000 +vt 0.786622 0.386817 0.000000 +vt 0.679957 0.331828 0.000000 +vt 0.341837 0.331828 0.000000 +vt 0.679957 0.453856 0.000000 +vt 0.341837 0.453856 0.000000 +vt 0.679957 0.270814 0.000000 +vt 0.341837 0.514870 0.000000 +vt 0.022736 0.215788 0.000000 +vt 0.022736 0.152482 0.000000 +vt 0.041068 0.152480 0.000000 +vt 0.041068 0.215791 0.000000 +vt 0.422381 0.152480 0.000000 +vt 0.422381 0.215791 0.000000 +vt 0.440712 0.152482 0.000000 +vt 0.440712 0.215788 0.000000 +vt 0.041083 0.134155 0.000000 +vt 0.422366 0.134155 0.000000 +vt 0.422366 0.234116 0.000000 +vt 0.041083 0.234116 0.000000 +vt 0.001953 0.598268 0.000000 +vt 0.001953 0.534962 0.000000 +vt 0.020284 0.534960 0.000000 +vt 0.020284 0.598271 0.000000 +vt 0.401598 0.534960 0.000000 +vt 0.401598 0.598271 0.000000 +vt 0.419929 0.534962 0.000000 +vt 0.419929 0.598268 0.000000 +vt 0.020300 0.516635 0.000000 +vt 0.401583 0.516635 0.000000 +vt 0.401583 0.616596 0.000000 +vt 0.020300 0.616596 0.000000 +vt 0.421694 0.598268 0.000000 +vt 0.421694 0.534962 0.000000 +vt 0.440025 0.534960 0.000000 +vt 0.440025 0.598271 0.000000 +vt 0.821338 0.534960 0.000000 +vt 0.821338 0.598271 0.000000 +vt 0.839670 0.534962 0.000000 +vt 0.839670 0.598268 0.000000 +vt 0.440040 0.516635 0.000000 +vt 0.821323 0.516635 0.000000 +vt 0.821323 0.616596 0.000000 +vt 0.440040 0.616596 0.000000 +vt 0.001953 0.903444 0.000000 +vt 0.001953 0.840138 0.000000 +vt 0.020284 0.840136 0.000000 +vt 0.020284 0.903447 0.000000 +vt 0.401598 0.840136 0.000000 +vt 0.401598 0.903446 0.000000 +vt 0.419929 0.840138 0.000000 +vt 0.419929 0.903444 0.000000 +vt 0.020300 0.821811 0.000000 +vt 0.401583 0.821811 0.000000 +vt 0.401583 0.921771 0.000000 +vt 0.020300 0.921771 0.000000 +vt 0.001953 0.699993 0.000000 +vt 0.001953 0.636688 0.000000 +vt 0.020284 0.636685 0.000000 +vt 0.020284 0.699996 0.000000 +vt 0.401598 0.636685 0.000000 +vt 0.401598 0.699996 0.000000 +vt 0.419929 0.636687 0.000000 +vt 0.419929 0.699993 0.000000 +vt 0.020300 0.618360 0.000000 +vt 0.401583 0.618360 0.000000 +vt 0.401583 0.718321 0.000000 +vt 0.020300 0.718321 0.000000 +vt 0.558820 0.144082 0.000000 +vt 0.558820 0.080776 0.000000 +vt 0.577151 0.080774 0.000000 +vt 0.577151 0.144085 0.000000 +vt 0.958464 0.080774 0.000000 +vt 0.958464 0.144085 0.000000 +vt 0.976796 0.080776 0.000000 +vt 0.976796 0.144082 0.000000 +vt 0.577166 0.062449 0.000000 +vt 0.958449 0.062449 0.000000 +vt 0.958449 0.162409 0.000000 +vt 0.577166 0.162410 0.000000 +vt 0.444013 0.247956 0.000000 +vt 0.444013 0.184650 0.000000 +vt 0.462345 0.184648 0.000000 +vt 0.462345 0.247959 0.000000 +vt 0.843658 0.184648 0.000000 +vt 0.843658 0.247959 0.000000 +vt 0.861989 0.184650 0.000000 +vt 0.861989 0.247956 0.000000 +vt 0.462360 0.166323 0.000000 +vt 0.843643 0.166323 0.000000 +vt 0.843643 0.266284 0.000000 +vt 0.462360 0.266284 0.000000 +vt 0.022737 0.114063 0.000000 +vt 0.022737 0.050757 0.000000 +vt 0.041068 0.050755 0.000000 +vt 0.041068 0.114066 0.000000 +vt 0.422381 0.050755 0.000000 +vt 0.422381 0.114066 0.000000 +vt 0.440713 0.050757 0.000000 +vt 0.440713 0.114063 0.000000 +vt 0.041083 0.032430 0.000000 +vt 0.422366 0.032430 0.000000 +vt 0.422366 0.132390 0.000000 +vt 0.041083 0.132391 0.000000 +vt 0.001953 0.801719 0.000000 +vt 0.001953 0.738413 0.000000 +vt 0.020284 0.738410 0.000000 +vt 0.020284 0.801721 0.000000 +vt 0.401598 0.738410 0.000000 +vt 0.401598 0.801721 0.000000 +vt 0.419929 0.738413 0.000000 +vt 0.419929 0.801719 0.000000 +vt 0.020300 0.720085 0.000000 +vt 0.401583 0.720085 0.000000 +vt 0.401583 0.820046 0.000000 +vt 0.020300 0.820046 0.000000 +vt 0.421693 0.801719 0.000000 +vt 0.421693 0.738413 0.000000 +vt 0.440025 0.738410 0.000000 +vt 0.440025 0.801721 0.000000 +vt 0.821338 0.738410 0.000000 +vt 0.821338 0.801721 0.000000 +vt 0.839669 0.738413 0.000000 +vt 0.839669 0.801719 0.000000 +vt 0.440040 0.720085 0.000000 +vt 0.821323 0.720085 0.000000 +vt 0.821323 0.820046 0.000000 +vt 0.440040 0.820046 0.000000 +vt 0.421694 0.699993 0.000000 +vt 0.421694 0.636688 0.000000 +vt 0.440025 0.636685 0.000000 +vt 0.440025 0.699996 0.000000 +vt 0.821338 0.636685 0.000000 +vt 0.821338 0.699996 0.000000 +vt 0.839670 0.636687 0.000000 +vt 0.839670 0.699993 0.000000 +vt 0.440040 0.618360 0.000000 +vt 0.821323 0.618360 0.000000 +vt 0.821323 0.718321 0.000000 +vt 0.440040 0.718321 0.000000 +vt 0.421693 0.903444 0.000000 +vt 0.421693 0.840138 0.000000 +vt 0.440025 0.840136 0.000000 +vt 0.440025 0.903447 0.000000 +vt 0.821338 0.840136 0.000000 +vt 0.821338 0.903446 0.000000 +vt 0.839669 0.840138 0.000000 +vt 0.839669 0.903444 0.000000 +vt 0.440040 0.821811 0.000000 +vt 0.821323 0.821811 0.000000 +vt 0.821323 0.921771 0.000000 +vt 0.440040 0.921771 0.000000 +vt 0.340073 0.293147 0.000000 +vt 0.340073 0.309496 0.000000 +vt 0.001953 0.309496 0.000000 +vt 0.001953 0.293147 0.000000 +vt 0.340073 0.331828 0.000000 +vt 0.001953 0.331828 0.000000 +vt 0.340073 0.354161 0.000000 +vt 0.001953 0.354161 0.000000 +vt 0.340073 0.370510 0.000000 +vt 0.001953 0.370510 0.000000 +vt 0.340073 0.392842 0.000000 +vt 0.001953 0.392842 0.000000 +vt 0.340073 0.415175 0.000000 +vt 0.001953 0.415175 0.000000 +vt 0.340073 0.431524 0.000000 +vt 0.001953 0.431524 0.000000 +vt 0.340073 0.453856 0.000000 +vt 0.001953 0.453856 0.000000 +vt 0.340073 0.476189 0.000000 +vt 0.001953 0.476189 0.000000 +vt 0.340073 0.492538 0.000000 +vt 0.001953 0.492538 0.000000 +vt 0.340073 0.514870 0.000000 +vt 0.001953 0.514870 0.000000 +vt 0.340073 0.270814 0.000000 +vt 0.001953 0.270814 0.000000 +vt 0.493087 0.124601 0.000000 +vt 0.477754 0.109267 0.000000 +vt 0.514033 0.088321 0.000000 +vt 0.472141 0.088321 0.000000 +vt 0.477754 0.067376 0.000000 +vt 0.493087 0.052042 0.000000 +vt 0.514033 0.046430 0.000000 +vt 0.534979 0.052042 0.000000 +vt 0.550312 0.067376 0.000000 +vt 0.555924 0.088321 0.000000 +vt 0.550312 0.109267 0.000000 +vt 0.534979 0.124601 0.000000 +vt 0.514033 0.130213 0.000000 +vt 0.997764 0.998047 0.000000 +vt 0.087501 0.998047 0.000000 +vt 0.087501 0.973210 0.000000 +vt 0.997764 0.973210 0.000000 +vt 0.087501 0.948373 0.000000 +vt 0.997765 0.948373 0.000000 +vt 0.087501 0.923536 0.000000 +vt 0.997765 0.923536 0.000000 +vt 0.472199 0.740171 0.000000 +vt 0.002872 0.740171 0.000000 +vt 0.002872 0.727365 0.000000 +vt 0.472200 0.727365 0.000000 +vt 0.002872 0.714560 0.000000 +vt 0.472200 0.714560 0.000000 +vt 0.002872 0.701754 0.000000 +vt 0.472200 0.701754 0.000000 +# 238 texture coords + +g pCylinder3 +usemtl pierMat +f 1/15 2/19 14/20 13/16 +f 2/19 3/34 15/35 14/20 +f 3/34 4/7 16/8 15/35 +f 4/7 5/1 17/4 16/8 +f 5/1 6/2 18/3 17/4 +f 6/2 7/5 19/6 18/3 +f 7/5 8/9 20/10 19/6 +f 8/9 9/36 21/37 20/10 +f 9/36 10/17 22/18 21/37 +f 10/17 11/11 23/14 22/18 +f 11/11 12/12 24/39 23/14 +f 12/38 1/15 13/16 24/13 +f 13/21 14/22 25/23 +f 14/22 15/24 25/23 +f 15/24 16/26 25/23 +f 16/26 17/28 25/23 +f 17/28 18/30 25/23 +f 18/30 19/32 25/23 +f 19/32 20/33 25/23 +f 20/33 21/31 25/23 +f 21/31 22/29 25/23 +f 22/29 23/27 25/23 +f 23/27 24/25 25/23 +f 24/25 13/21 25/23 +f 26/40 27/41 29/42 28/43 +f 28/43 29/42 31/44 30/45 +f 30/45 31/44 33/46 32/47 +f 27/48 33/49 31/44 29/42 +f 32/50 26/51 28/43 30/45 +f 34/52 35/53 37/54 36/55 +f 36/55 37/54 39/56 38/57 +f 38/57 39/56 41/58 40/59 +f 35/60 41/61 39/56 37/54 +f 40/62 34/63 36/55 38/57 +f 42/64 43/65 45/66 44/67 +f 44/67 45/66 47/68 46/69 +f 46/69 47/68 49/70 48/71 +f 43/72 49/73 47/68 45/66 +f 48/74 42/75 44/67 46/69 +f 50/76 51/77 53/78 52/79 +f 52/79 53/78 55/80 54/81 +f 54/81 55/80 57/82 56/83 +f 51/84 57/85 55/80 53/78 +f 56/86 50/87 52/79 54/81 +f 58/88 59/89 61/90 60/91 +f 60/91 61/90 63/92 62/93 +f 62/93 63/92 65/94 64/95 +f 59/96 65/97 63/92 61/90 +f 64/98 58/99 60/91 62/93 +f 66/100 67/101 69/102 68/103 +f 68/103 69/102 71/104 70/105 +f 70/105 71/104 73/106 72/107 +f 67/108 73/109 71/104 69/102 +f 72/110 66/111 68/103 70/105 +f 74/112 75/113 77/114 76/115 +f 76/115 77/114 79/116 78/117 +f 78/117 79/116 81/118 80/119 +f 75/120 81/121 79/116 77/114 +f 80/122 74/123 76/115 78/117 +f 82/124 83/125 85/126 84/127 +f 84/127 85/126 87/128 86/129 +f 86/129 87/128 89/130 88/131 +f 83/132 89/133 87/128 85/126 +f 88/134 82/135 84/127 86/129 +f 90/136 91/137 93/138 92/139 +f 92/139 93/138 95/140 94/141 +f 94/141 95/140 97/142 96/143 +f 91/144 97/145 95/140 93/138 +f 96/146 90/147 92/139 94/141 +f 98/148 99/149 101/150 100/151 +f 100/151 101/150 103/152 102/153 +f 102/153 103/152 105/154 104/155 +f 99/156 105/157 103/152 101/150 +f 104/158 98/159 100/151 102/153 +f 106/160 107/161 109/162 108/163 +f 108/163 109/162 111/164 110/165 +f 110/165 111/164 113/166 112/167 +f 107/168 113/169 111/164 109/162 +f 112/170 106/171 108/163 110/165 +f 114/172 115/173 117/174 116/175 +f 116/175 117/174 119/176 118/177 +f 118/177 119/176 121/178 120/179 +f 115/180 121/181 119/176 117/174 +f 120/182 114/183 116/175 118/177 +f 122/184 123/185 135/186 134/187 +f 123/185 124/188 136/189 135/186 +f 124/188 125/190 137/191 136/189 +f 125/190 126/192 138/193 137/191 +f 126/192 127/194 139/195 138/193 +f 127/194 128/196 140/197 139/195 +f 128/196 129/198 141/199 140/197 +f 129/198 130/200 142/201 141/199 +f 130/200 131/202 143/203 142/201 +f 131/202 132/204 144/205 143/203 +f 132/204 133/206 145/207 144/205 +f 133/208 122/184 134/187 145/209 +f 134/210 135/211 146/212 +f 135/211 136/213 146/212 +f 136/213 137/214 146/212 +f 137/214 138/215 146/212 +f 138/215 139/216 146/212 +f 139/216 140/217 146/212 +f 140/217 141/218 146/212 +f 141/218 142/219 146/212 +f 142/219 143/220 146/212 +f 143/220 144/221 146/212 +f 144/221 145/222 146/212 +f 145/222 134/210 146/212 +f 147/223 148/224 150/225 149/226 +f 149/226 150/225 152/227 151/228 +f 151/228 152/227 154/229 153/230 +f 155/231 156/232 158/233 157/234 +f 157/234 158/233 160/235 159/236 +f 159/236 160/235 162/237 161/238 +# 90 polygons - 24 triangles + diff --git a/IronToad_UnityProject/Assets/Art/Models/pier.obj.meta b/IronToad_UnityProject/Assets/Art/Models/pier.obj.meta new file mode 100755 index 0000000..92a0183 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/pier.obj.meta @@ -0,0 +1,82 @@ +fileFormatVersion: 2 +guid: 37549450629db464abffe54861590cf3 +timeCreated: 1485008673 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: pCylinder3 + 100002: //RootNode + 400000: pCylinder3 + 400002: //RootNode + 2300000: pCylinder3 + 3300000: pCylinder3 + 4300000: pCylinder3 + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Scripts/VictoryScript.cs b/IronToad_UnityProject/Assets/Scripts/VictoryScript.cs index 82c63ea..529263e 100644 --- a/IronToad_UnityProject/Assets/Scripts/VictoryScript.cs +++ b/IronToad_UnityProject/Assets/Scripts/VictoryScript.cs @@ -41,6 +41,8 @@ public class VictoryScript : MonoBehaviour public void victoryClicked() { + NotificationServer.notify("hide VictoryButton"); + NotificationServer.notify("switch off", null); NotificationServer.notify("fade bgm"); NotificationServer.notify("play sfx", "shipSpotted_2:0.5"); NotificationServer.notify("show VictoryPanel"); diff --git a/IronToad_UnityProject/Assets/_Scenes/IGDA_Lighthouse.unity b/IronToad_UnityProject/Assets/_Scenes/IGDA_Lighthouse.unity index 2c9b024..d6b93e0 100644 Binary files a/IronToad_UnityProject/Assets/_Scenes/IGDA_Lighthouse.unity and b/IronToad_UnityProject/Assets/_Scenes/IGDA_Lighthouse.unity differ diff --git a/IronToad_UnityProject/ProjectSettings/GraphicsSettings.asset b/IronToad_UnityProject/ProjectSettings/GraphicsSettings.asset index 5bbdb35..3dbd62f 100644 Binary files a/IronToad_UnityProject/ProjectSettings/GraphicsSettings.asset and b/IronToad_UnityProject/ProjectSettings/GraphicsSettings.asset differ diff --git a/IronToad_UnityProject/ProjectSettings/ProjectSettings.asset b/IronToad_UnityProject/ProjectSettings/ProjectSettings.asset index 98bef78..d6b5d9f 100644 Binary files a/IronToad_UnityProject/ProjectSettings/ProjectSettings.asset and b/IronToad_UnityProject/ProjectSettings/ProjectSettings.asset differ