yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/stagetest' into feature/1.5.1

This commit is contained in:
kimura 2022-08-01 15:26:53 +09:00
parent 41651e9155 7fba095ca5
commit 8597ef9c7a
7 changed files with 1770 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt
View File

@ -1 +1 @@
m+NPnie3y2wW01gnR0Yj1VwUc3hSiyhoKdASU5LTQwcYqHVzl4Ov+Xc6Wo//7Shz 8a3L0QukFXaMAtflBlra+4y99663C1ttLBYgSA8O5VVXhcfDU9g6GqdahlEjAyEo

2
popcorn/Assets/MyGame/Resources/Data/ScrollGameStageData.txt
View File

@ -1 +1 @@
0Zf2/DAVJ29GXcrKsDMlGs1nPPW/nmgXHEZwxz97FlA7HeyIl/k/X8BILwzvX7R5P1Sk2S4QukfFw6IpGP2O2n9oGaMWKKvRdnQk/NpC0uj/7PeWL4J++N4wZhxVMQ/MNVkqTE69DWu7OurE35Ox0Lu+swkkHrCtdweBdKE+vxcVUT9Cu39QqWZa3gt+GPISVGXLH4hd3W4lTd3A0kNc/6QnC3GwZMLenyElSa/2EljhfFQZ8lSUvD9t++3UlWyDm17kHlQb7xecfXzlASi+nIHDQefEd7rrgEtVdVN0t83DrFYwWJtuaheESKu210efD3dneehGf7BP6BQwKuqOTm3kcfoxcfdyuzzq/hacrUojiZl+jRu2C3j201426JpQIu0JLMx1ERKByjzAkj2COjVYTjRozqvBQgVE8VyjHXg1ZzfTVFxZaBvkcN6ruZasS0BjDF0/spYDSLEm8eyeNatVlvPT2YVdLsgwgCrOGOJVALNVVD7PPPjkqZSD/Mftb05JW6aOcbceSi2QneJvuCAjC1HFh6W32h6GoHJ6qy4= YYpXQEGxHZd7W1oP5k7ncP66DnKcTLpHuzgL6Hqe3Y3oOVKw7LmgJ/N7vzpXWneAVlnoDjEtljoaLP5UHmUkGAJP1Z0KwVidFFjFw8xWYuqJdR8UXSCsjB189I7Qrf3d556y79cL1+4z6JQixjcLnTgd3Fkw0+0AKA4dwBDUn8Ta08ULThLApz7lUpbVoCw3TYvXMOJXb+0cBOEI/ggHMG2v759edT0u7Z9L6X6Z5YMcmy9NfToaNvhf6MjpeCoJRGX/Zqm3afr7dJ1LDfBHMV0fc+kI5th3ZTnz2shyLF485x90wdxJNwfoDfNwswPTElyDatsDraOQi1QZ9K4PcBCDKAHwaUKZQ1TsP+dB76yto23pdb2qEl1T6tK0akDDczdCgrkocvn/inHrIVA/1kj6ThCU+Uj1XvirwKq69Sr/xutGPZhw/oZcjaBE7JNUp0t9wH6Z7F/sjzAo3zZBth96Hf8K4mD/many8Qy4QkqS4uSNcIu6KqVIFqIoMOdaBWX3/0rWF4ETc2VWx7UYug==

2
popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage1a.prefab
View File

@ -1156,7 +1156,7 @@ PrefabInstance:
- target: {fileID: 3171027538450552477, guid: 4d9cf56629464933924296f3980217ce, - target: {fileID: 3171027538450552477, guid: 4d9cf56629464933924296f3980217ce,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4399194635901482749, guid: 4d9cf56629464933924296f3980217ce, - target: {fileID: 4399194635901482749, guid: 4d9cf56629464933924296f3980217ce,
type: 3} type: 3}

12
popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage1b.prefab
View File

@ -80,7 +80,7 @@ PrefabInstance:
- target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 12 value: 7
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
type: 3} type: 3}
@ -436,12 +436,12 @@ PrefabInstance:
- target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 0.14 value: 0.03
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, - target: {fileID: 4826568820401640802, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: -0.75 value: -0.97
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4826568820401640803, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, - target: {fileID: 4826568820401640803, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
type: 3} type: 3}
@ -476,7 +476,7 @@ PrefabInstance:
- target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 18 value: 13.8
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
type: 3} type: 3}
@ -753,7 +753,7 @@ PrefabInstance:
- target: {fileID: 5140115440945204540, guid: 4d9cf56629464933924296f3980217ce, - target: {fileID: 5140115440945204540, guid: 4d9cf56629464933924296f3980217ce,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Stage1y value: Stage1b
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4d9cf56629464933924296f3980217ce, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4d9cf56629464933924296f3980217ce, type: 3}
@ -1214,7 +1214,7 @@ PrefabInstance:
- target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a, - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 27.6 value: 26.3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a, - target: {fileID: 6091183625377926242, guid: b82d5b841abe54f95aee9a8a5a023f6a,
type: 3} type: 3}

6
popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage1c.prefab
View File

@ -80,7 +80,7 @@ PrefabInstance:
- target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: 12 value: 7.5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09, - target: {fileID: 7170547486884922313, guid: 9909b8ac6fba54dcd98d1a129a7c8c09,
type: 3} type: 3}
@ -822,7 +822,7 @@ PrefabInstance:
- target: {fileID: 3171027538450552477, guid: 4d9cf56629464933924296f3980217ce, - target: {fileID: 3171027538450552477, guid: 4d9cf56629464933924296f3980217ce,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4399194635901482749, guid: 4d9cf56629464933924296f3980217ce, - target: {fileID: 4399194635901482749, guid: 4d9cf56629464933924296f3980217ce,
type: 3} type: 3}
@ -832,7 +832,7 @@ PrefabInstance:
- target: {fileID: 5140115440945204540, guid: 4d9cf56629464933924296f3980217ce, - target: {fileID: 5140115440945204540, guid: 4d9cf56629464933924296f3980217ce,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Stage1x value: Stage1c
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4d9cf56629464933924296f3980217ce, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4d9cf56629464933924296f3980217ce, type: 3}

1751
popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage1d.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
popcorn/Assets/MyGame/Resources/ScrollGame/Stages/Stage1d.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 44a51870726ce4220ba63507d0ab59c7
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: