Geri/TRORB
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main' into main

Browse source
This commit is contained in:
Gerard Gascón 2023-02-28 20:24:13 +01:00
commit 8d7e92f801
8 changed files with 44650 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29667
Assets/Scenes/SampleScene 1.unity Normal file
View file

File diff suppressed because it is too large Load diff

7
Assets/Scenes/SampleScene 1.unity.meta Normal file
View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 796e803d673f9c241b23e3e5e709d920
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

14951
Assets/Scenes/SampleScene 2.unity Normal file
View file

File diff suppressed because it is too large Load diff

7
Assets/Scenes/SampleScene 2.unity.meta Normal file
View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 306d5c112e4840d43bcc696445c502a6
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Sprites/Tilesets/Hielo.png.meta
View file

@ -141,7 +141,8 @@ TextureImporter:
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape:
- - {x: -16, y: 16}
- - {x: -6.0993757, y: 16}
- {x: -16, y: 10}
- {x: -16, y: -16}
- {x: 16, y: -16}
- {x: 16, y: 16}
@ -187,10 +188,11 @@ TextureImporter:
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape:
- - {x: -16, y: 16}
- - {x: 5, y: 16}
- {x: -16, y: 16}
- {x: -16, y: -16}
- {x: 16, y: -16}
- {x: 16, y: 16}
- {x: 16, y: 10}
tessellationDetail: 0
bones: []
spriteID: 3592bc93839941143bc73543f402cd5f

8
Assets/Sprites/Tilesets/Roca.png.meta
View file

@ -141,7 +141,8 @@ TextureImporter:
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape:
- - {x: -16, y: 16}
- - {x: -5, y: 16}
- {x: -16, y: 10}
- {x: -16, y: -16}
- {x: 16, y: -16}
- {x: 16, y: 16}
@ -187,10 +188,11 @@ TextureImporter:
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape:
- - {x: -16, y: 16}
- - {x: 5.1948166, y: 16}
- {x: -16, y: 16}
- {x: -16, y: -16}
- {x: 16, y: -16}
- {x: 16, y: 16}
- {x: 16, y: 10}
tessellationDetail: 0
bones: []
spriteID: 16ed9fba20d26d9498326bbdd096a99a

8
Assets/Sprites/Tilesets/Rocanevada.png.meta
View file

@ -141,7 +141,8 @@ TextureImporter:
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape:
- - {x: -16, y: 16}
- - {x: -3.8072176, y: 16}
- {x: -16, y: 9}
- {x: -16, y: -16}
- {x: 16, y: -16}
- {x: 16, y: 16}
@ -187,10 +188,11 @@ TextureImporter:
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape:
- - {x: -16, y: 16}
- - {x: 3.3380508, y: 16}
- {x: -16, y: 16}
- {x: -16, y: -16}
- {x: 16, y: -16}
- {x: 16, y: 16}
- {x: 16, y: 9}
tessellationDetail: 0
bones: []
spriteID: 68db94e487951b540aee607ac1beb718

3
UserSettings/EditorUserSettings.asset
View file

@ -20,6 +20,9 @@ EditorUserSettings:
RecentlyUsedSceneGuid-4:
value: 020957555d000f5f580c087715200a4444164a292d717e6179791832e1b7623e
flags: 0
RecentlyUsedSceneGuid-2:
value: 540802035d055a5f5b595f2449200d4447154a79297b2365287e4d6ae6b96668
flags: 0
UnityEditor.ShaderGraph.Blackboard:
value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b5968a8ff0a2a4a0bea1a0a2f3acfefbad98e6edf38e9ccbddc18390ac86d4849395ea8a9f8bee8382838a86d0878ed28f8395cfb9cff8c4f7f4ddf1b98b
flags: 0