Merge branch 'dev' of https://github.com/2aurore/Gameton-06 into dev
This commit is contained in:
+2
-12
@@ -2521,12 +2521,7 @@ TextureImporter:
|
|||||||
border: {x: 0, y: 0, z: 0, w: 0}
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape:
|
physicsShape:
|
||||||
- - {x: 3, y: 8}
|
- - {x: -8, y: -8}
|
||||||
- {x: 3, y: 3}
|
|
||||||
- {x: -3, y: 3}
|
|
||||||
- {x: -3, y: -3}
|
|
||||||
- {x: -8, y: -3}
|
|
||||||
- {x: -8, y: -8}
|
|
||||||
- {x: 8, y: -8}
|
- {x: 8, y: -8}
|
||||||
- {x: 8, y: 8}
|
- {x: 8, y: 8}
|
||||||
tessellationDetail: 0
|
tessellationDetail: 0
|
||||||
@@ -2592,14 +2587,9 @@ TextureImporter:
|
|||||||
border: {x: 0, y: 0, z: 0, w: 0}
|
border: {x: 0, y: 0, z: 0, w: 0}
|
||||||
outline: []
|
outline: []
|
||||||
physicsShape:
|
physicsShape:
|
||||||
- - {x: -3, y: 8}
|
- - {x: -8, y: 8}
|
||||||
- {x: -8, y: 8}
|
|
||||||
- {x: -8, y: -8}
|
- {x: -8, y: -8}
|
||||||
- {x: 8, y: -8}
|
- {x: 8, y: -8}
|
||||||
- {x: 8, y: -3}
|
|
||||||
- {x: 3, y: -3}
|
|
||||||
- {x: 3, y: 3}
|
|
||||||
- {x: -3, y: 3}
|
|
||||||
tessellationDetail: 0
|
tessellationDetail: 0
|
||||||
bones: []
|
bones: []
|
||||||
spriteID: d922ddfdbdda968488005655790f3369
|
spriteID: d922ddfdbdda968488005655790f3369
|
||||||
|
|||||||
+10146
-9628
File diff suppressed because it is too large
Load Diff
+195198
-185320
File diff suppressed because it is too large
Load Diff
+9855
-12790
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,7 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: f597f19f656ba56eae4f6a3a7cc528f4
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 48e08dc33330d11e9d4a1b246c52e4f6
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: ed09910c0094cb27be8f3ca264680da3
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: cc355dd4cf1e6173beaeb22c2858cbe1
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
Reference in New Issue
Block a user