diff --git a/JAPA/Assembly-CSharp.csproj b/JAPA/Assembly-CSharp.csproj index 54e62d7a2fb26db3df11c8f176c883e32a4478b4..1d17e468f866a8708ed5fb22762d8ba7463b1f54 100644 --- a/JAPA/Assembly-CSharp.csproj +++ b/JAPA/Assembly-CSharp.csproj @@ -74,6 +74,9 @@ <Compile Include="Assets\Scripts\MoveBarco\rotate.cs" /> <Compile Include="Assets\Scripts\MoveBarco\spawn.cs" /> <Compile Include="Assets\Scripts\MoveBarco\spawncapanga.cs" /> + <Reference Include="UnityEngine.Advertisements"> + <HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath> + </Reference> <Reference Include="UnityEngine.UI"> <HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath> </Reference> @@ -89,6 +92,9 @@ <Reference Include="UnityEngine.HoloLens"> <HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath> </Reference> + <Reference Include="UnityEngine.Purchasing"> + <HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath> + </Reference> <Reference Include="UnityEngine.VR"> <HintPath>/opt/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/RuntimeEditor/UnityEngine.VR.dll</HintPath> </Reference> diff --git a/JAPA/Assets/Prefabs/MoveBarco/Capanga.prefab b/JAPA/Assets/Prefabs/MoveBarco/Capanga.prefab index f32ca3ade995a9981d52a7918321bd47b623199c..0e0b84f79853963f864fd7aba58841bc42b1821e 100644 Binary files a/JAPA/Assets/Prefabs/MoveBarco/Capanga.prefab and b/JAPA/Assets/Prefabs/MoveBarco/Capanga.prefab differ diff --git a/JAPA/Assets/Sprites/MoveBarco/barril topo.png b/JAPA/Assets/Sprites/MoveBarco/barril topo.png new file mode 100644 index 0000000000000000000000000000000000000000..f21a101813cac77ec1e7d893de08636c0b7e0762 Binary files /dev/null and b/JAPA/Assets/Sprites/MoveBarco/barril topo.png differ diff --git a/JAPA/Assets/Sprites/MoveBarco/barril topo.png.meta b/JAPA/Assets/Sprites/MoveBarco/barril topo.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..0fdb8482bb6186e372e6843c1dcf9758b959bfcf --- /dev/null +++ b/JAPA/Assets/Sprites/MoveBarco/barril topo.png.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: 36d8761c6f81349ad96c05b2dd0465ed +timeCreated: 1538742659 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Tizen + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Samsung TV + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/JAPA/Library/CurrentLayout.dwlt b/JAPA/Library/CurrentLayout.dwlt index e1362d23517a14989eec13582e0c40843f6b829c..1f0534a5cbb81a77c6cb2761d3aece85da547e13 100644 Binary files a/JAPA/Library/CurrentLayout.dwlt and b/JAPA/Library/CurrentLayout.dwlt differ diff --git a/JAPA/Library/LastSceneManagerSetup.txt b/JAPA/Library/LastSceneManagerSetup.txt index a9cf2b81235efa852dbfed6ca2fd67d6077c0df0..9282092f3cdce8f0216a477feaf15f1c78674208 100644 --- a/JAPA/Library/LastSceneManagerSetup.txt +++ b/JAPA/Library/LastSceneManagerSetup.txt @@ -1,4 +1,4 @@ sceneSetups: -- path: Assets/Scenes/MenuFases.unity +- path: Assets/Scenes/MoveBarco.unity isLoaded: 1 isActive: 1 diff --git a/JAPA/Library/assetDatabase3 b/JAPA/Library/assetDatabase3 index e2f85274d65cb86337f0e85e6b35834c7ccd05ce..d6c9b86b5b44c16828d3366185b74c71d76806af 100644 Binary files a/JAPA/Library/assetDatabase3 and b/JAPA/Library/assetDatabase3 differ diff --git a/JAPA/Library/expandedItems b/JAPA/Library/expandedItems index bd0b41e4a5d532fb803d14d88d4e23997e724fb4..7ecf4e993d652a43dac3b77fa725797e77b7d474 100644 Binary files a/JAPA/Library/expandedItems and b/JAPA/Library/expandedItems differ diff --git a/JAPA/Library/metadata/00/00000000000000005000000000000000 b/JAPA/Library/metadata/00/00000000000000005000000000000000 index 83162c99d01352e181827e2a22bdf870abec0e93..b941dfc390f9faf8a45f784e47a46104e70ec43b 100644 Binary files a/JAPA/Library/metadata/00/00000000000000005000000000000000 and b/JAPA/Library/metadata/00/00000000000000005000000000000000 differ diff --git a/JAPA/Library/metadata/02/024e825da916b4034a4e0252cf95f03e.info b/JAPA/Library/metadata/02/024e825da916b4034a4e0252cf95f03e.info index 8fba390f9f5353c6690c45d86fc182707c9fc90f..984f685c0e8462909fdbc04c3bb7117a75cc8499 100644 Binary files a/JAPA/Library/metadata/02/024e825da916b4034a4e0252cf95f03e.info and b/JAPA/Library/metadata/02/024e825da916b4034a4e0252cf95f03e.info differ diff --git a/JAPA/Library/metadata/36/36d8761c6f81349ad96c05b2dd0465ed b/JAPA/Library/metadata/36/36d8761c6f81349ad96c05b2dd0465ed new file mode 100644 index 0000000000000000000000000000000000000000..9fb870bfbd25f1407f00a6ba8170b45325a15b8f Binary files /dev/null and b/JAPA/Library/metadata/36/36d8761c6f81349ad96c05b2dd0465ed differ diff --git a/JAPA/Library/metadata/36/36d8761c6f81349ad96c05b2dd0465ed.info b/JAPA/Library/metadata/36/36d8761c6f81349ad96c05b2dd0465ed.info new file mode 100644 index 0000000000000000000000000000000000000000..a4ce437387909882b76695e1fd7aa8c7708cdce9 Binary files /dev/null and b/JAPA/Library/metadata/36/36d8761c6f81349ad96c05b2dd0465ed.info differ