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

Merge remote-tracking branch 'origin/feature/unity_update_2022.3.3f1' into feature/1.5.1

This commit is contained in:
kimura 2022-07-12 14:11:28 +09:00
parent 25d8f5474d dc2c36208a
commit 747e3e9a0e
16 changed files with 15891 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1569
popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_a.psb.meta
View File

File diff suppressed because one or more lines are too long

4520
popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_b.psb.meta
View File

File diff suppressed because one or more lines are too long

3804
popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_c.psb.meta
View File

File diff suppressed because one or more lines are too long

2486
popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_three_d.psb.meta
View File

File diff suppressed because one or more lines are too long

1601
popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_a.psb.meta
View File

File diff suppressed because one or more lines are too long

8
popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_b.psb.meta
View File

@ -96,8 +96,8 @@ ScriptedImporter:
rigSpriteImportData:
- name: CornFieldImage
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
pivot: {x: 0.48481458, y: 0.016620785}
alignment: 9
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2
@ -177,7 +177,7 @@ ScriptedImporter:
- position: {x: 82.644, y: 11.418999}
boneWeight:
weight0: 0.54065484
weight1: 0.45934516
weight1: 0.4593452
weight2: 0
weight3: 0
boneIndex0: 0
@ -1177,7 +1177,7 @@ ScriptedImporter:
- position: {x: 63.923004, y: 6.4000015}
boneWeight:
weight0: 0.8127356
weight1: 0.18726438
weight1: 0.18726441
weight2: 0
weight3: 0
boneIndex0: 0

4
popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_c.psb.meta
View File

@ -96,8 +96,8 @@ ScriptedImporter:
rigSpriteImportData:
- name: CornFieldImage
originalName:
pivot: {x: 0.5, y: 0.5}
alignment: 0
pivot: {x: 0.5356945, y: 0.01698123}
alignment: 9
border: {x: 0, y: 0, z: 0, w: 0}
rect:
serializedVersion: 2

1853
popcorn/Assets/MyGame/Resource/Material/CornField/CornField/CornField_Seedling_two_d.psb.meta
View File

File diff suppressed because one or more lines are too long

12
popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_Three_lv1.prefab
View File

@ -62,11 +62,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4560102481533899226, guid: 29ad64acc5cd34684bb30b97ddc077ae,
type: 3}
propertyPath: m_Size.x
value: 0.86
objectReference: {fileID: 0}
- target: {fileID: 4560102481533899226, guid: 29ad64acc5cd34684bb30b97ddc077ae,
type: 3}
propertyPath: m_Size.y
value: 0.7
objectReference: {fileID: 0}
- target: {fileID: 4560102481533899226, guid: 29ad64acc5cd34684bb30b97ddc077ae,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -4174993405117188911, guid: 51e2ccaae85d84cb9896b5ba4dfa3db2,
objectReference: {fileID: 1036522556656841937, guid: 51e2ccaae85d84cb9896b5ba4dfa3db2,
type: 3}
- target: {fileID: 5664250209077557596, guid: 29ad64acc5cd34684bb30b97ddc077ae,
type: 3}

12
popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_Three_lv2.prefab
View File

@ -92,11 +92,21 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: -1.605
objectReference: {fileID: 0}
- target: {fileID: 6531675794590897747, guid: 69479a942167f499382e0114aed64476,
type: 3}
propertyPath: m_Size.x
value: 1.63
objectReference: {fileID: 0}
- target: {fileID: 6531675794590897747, guid: 69479a942167f499382e0114aed64476,
type: 3}
propertyPath: m_Size.y
value: 2.7
objectReference: {fileID: 0}
- target: {fileID: 6531675794590897747, guid: 69479a942167f499382e0114aed64476,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -8081369559182651804, guid: 7cc1fdf9915ec42e6bfaf9a3bd6fdd4f,
objectReference: {fileID: 6248142457605646647, guid: 7cc1fdf9915ec42e6bfaf9a3bd6fdd4f,
type: 3}
- target: {fileID: 7710888547271871327, guid: 69479a942167f499382e0114aed64476,
type: 3}

12
popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_Three_lv3.prefab
View File

@ -87,11 +87,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8236076457840413330, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
type: 3}
propertyPath: m_Size.x
value: 1.64
objectReference: {fileID: 0}
- target: {fileID: 8236076457840413330, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
type: 3}
propertyPath: m_Size.y
value: 3.38
objectReference: {fileID: 0}
- target: {fileID: 8236076457840413330, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -5086249993576404211, guid: 160fc9ca4858749fb824503a3c68dd7a,
objectReference: {fileID: -4464286927178392294, guid: 160fc9ca4858749fb824503a3c68dd7a,
type: 3}
- target: {fileID: 8590825953928804796, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
type: 3}

12
popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_Three_lv4.prefab
View File

@ -7,11 +7,21 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2058162943160287868, guid: 3d9074ff9e2da4fca8b472ae71154e17,
type: 3}
propertyPath: m_Size.x
value: 1.64
objectReference: {fileID: 0}
- target: {fileID: 2058162943160287868, guid: 3d9074ff9e2da4fca8b472ae71154e17,
type: 3}
propertyPath: m_Size.y
value: 3.83
objectReference: {fileID: 0}
- target: {fileID: 2058162943160287868, guid: 3d9074ff9e2da4fca8b472ae71154e17,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -1705911687890340612, guid: f64fb79f910fe4b18a8cddd4f549ae58,
objectReference: {fileID: 3703616844984423758, guid: f64fb79f910fe4b18a8cddd4f549ae58,
type: 3}
- target: {fileID: 3017134973016255854, guid: 3d9074ff9e2da4fca8b472ae71154e17,
type: 3}

12
popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_two_lv1.prefab
View File

@ -67,11 +67,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4560102481533899226, guid: 29ad64acc5cd34684bb30b97ddc077ae,
type: 3}
propertyPath: m_Size.x
value: 0.8
objectReference: {fileID: 0}
- target: {fileID: 4560102481533899226, guid: 29ad64acc5cd34684bb30b97ddc077ae,
type: 3}
propertyPath: m_Size.y
value: 0.74
objectReference: {fileID: 0}
- target: {fileID: 4560102481533899226, guid: 29ad64acc5cd34684bb30b97ddc077ae,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 4039279221222200952, guid: 54411815524f343fd8615001f589f48f,
objectReference: {fileID: 1036522556656841937, guid: 54411815524f343fd8615001f589f48f,
type: 3}
- target: {fileID: 5664250209077557596, guid: 29ad64acc5cd34684bb30b97ddc077ae,
type: 3}

12
popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_two_lv2.prefab
View File

@ -87,11 +87,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6531675794590897747, guid: 69479a942167f499382e0114aed64476,
type: 3}
propertyPath: m_Size.x
value: 1.49
objectReference: {fileID: 0}
- target: {fileID: 6531675794590897747, guid: 69479a942167f499382e0114aed64476,
type: 3}
propertyPath: m_Size.y
value: 2.2
objectReference: {fileID: 0}
- target: {fileID: 6531675794590897747, guid: 69479a942167f499382e0114aed64476,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -1510915362446667486, guid: 63284ce80daef45f1b85fc368d819bc1,
objectReference: {fileID: -3199788078724489113, guid: 63284ce80daef45f1b85fc368d819bc1,
type: 3}
- target: {fileID: 7710888547271871327, guid: 69479a942167f499382e0114aed64476,
type: 3}

12
popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_two_lv3.prefab
View File

@ -87,11 +87,21 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8236076457840413330, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
type: 3}
propertyPath: m_Size.x
value: 1.63
objectReference: {fileID: 0}
- target: {fileID: 8236076457840413330, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
type: 3}
propertyPath: m_Size.y
value: 2.65
objectReference: {fileID: 0}
- target: {fileID: 8236076457840413330, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 4970532240456704257, guid: db0018d67c9e64f2ca2641e362ccd734,
objectReference: {fileID: -6242594561462804900, guid: db0018d67c9e64f2ca2641e362ccd734,
type: 3}
- target: {fileID: 8590825953928804796, guid: 2c7c89d1c9c7a4ddab79278effae1bee,
type: 3}

12
popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_two_lv4.prefab
View File

@ -7,11 +7,21 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2058162943160287868, guid: 3d9074ff9e2da4fca8b472ae71154e17,
type: 3}
propertyPath: m_Size.x
value: 1.63
objectReference: {fileID: 0}
- target: {fileID: 2058162943160287868, guid: 3d9074ff9e2da4fca8b472ae71154e17,
type: 3}
propertyPath: m_Size.y
value: 2.99
objectReference: {fileID: 0}
- target: {fileID: 2058162943160287868, guid: 3d9074ff9e2da4fca8b472ae71154e17,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: -4054243359679145067, guid: 077dea7a0907f42fa96d23e134d74b3c,
objectReference: {fileID: 7572722813892821047, guid: 077dea7a0907f42fa96d23e134d74b3c,
type: 3}
- target: {fileID: 3017134973016255854, guid: 3d9074ff9e2da4fca8b472ae71154e17,
type: 3}