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

収穫機挙動調整

This commit is contained in:
kimura 2021-07-27 10:58:01 +09:00
parent b27b0337df
commit f5d83677e0
4 changed files with 130 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
popcorn/Assets/MyGame/Scenes/CornField/CornField.unity
View File

@ -347,7 +347,7 @@ MeshRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 27
m_SortingOrder: 30
--- !u!1 &282523122
GameObject:
m_ObjectHideFlags: 0
@ -397,6 +397,7 @@ MonoBehaviour:
cornCounter: {fileID: 242576840}
harvestedPrefab: {fileID: 2111766585493962378, guid: d52f3514ed7fd461b8ab77a202c122c6,
type: 3}
thrust: 40
--- !u!4 &371589523 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8524901521850801685, guid: e642499b3643dab4ba05b02e8c6bde1c,
@ -1058,7 +1059,10 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 998360038}
- component: {fileID: 998360042}
- component: {fileID: 998360039}
- component: {fileID: 998360040}
- component: {fileID: 998360041}
m_Layer: 0
m_Name: basket
m_TagString: Untagged
@ -1118,7 +1122,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 30
m_SortingOrder: 20
m_Sprite: {fileID: 21300000, guid: b4ef5d853aa5e884f9ff3b7e2e0a8ac0, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -1130,6 +1134,68 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!68 &998360040
EdgeCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 998360037}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 1.87}
m_EdgeRadius: 0.37
m_Points:
- {x: -3.593909, y: -1.0085964}
- {x: -3.549603, y: -1.8782773}
- {x: -2.936795, y: -2.731175}
- {x: -2.100886, y: -3.3311734}
- {x: 2.0765946, y: -3.2938066}
- {x: 2.977969, y: -2.6759577}
- {x: 3.529534, y: -1.7948904}
- {x: 3.6742947, y: -0.97043467}
--- !u!61 &998360041
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 998360037}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0.51748276}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 7.18, y: 2.6}
newSize: {x: 7.18, y: 2.6}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 7.122097, y: 3.7546473}
m_EdgeRadius: 0
--- !u!114 &998360042
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 998360037}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e66a2dbf7e774065832962016627c6d8, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1035142904 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2783350420397184519, guid: 90ea860c4ec589d4aab99bfc127949f4,
@ -1422,6 +1488,31 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8524901522036686274, guid: e642499b3643dab4ba05b02e8c6bde1c,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8524901522036686274, guid: e642499b3643dab4ba05b02e8c6bde1c,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.94
objectReference: {fileID: 0}
- target: {fileID: 8524901522036686274, guid: e642499b3643dab4ba05b02e8c6bde1c,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8524901522036686274, guid: e642499b3643dab4ba05b02e8c6bde1c,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8524901522036686274, guid: e642499b3643dab4ba05b02e8c6bde1c,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e642499b3643dab4ba05b02e8c6bde1c, type: 3}
--- !u!1001 &1466604290
@ -1817,7 +1908,7 @@ GameObject:
m_Component:
- component: {fileID: 2138129848}
- component: {fileID: 2138129849}
- component: {fileID: 2138129850}
- component: {fileID: 2138129851}
m_Layer: 0
m_Name: machine_a
m_TagString: Untagged
@ -1878,7 +1969,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 26
m_SortingOrder: 30
m_Sprite: {fileID: 21300000, guid: d84a9ee1d4e76014aad7de90a383d27d, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
@ -1890,8 +1981,8 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!68 &2138129850
EdgeCollider2D:
--- !u!61 &2138129851
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -1903,15 +1994,19 @@ EdgeCollider2D:
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_EdgeRadius: 0.64
m_Points:
- {x: -3.931622, y: -1.2346358}
- {x: -3.2924247, y: -2.953443}
- {x: -1.7156212, y: -3.625627}
- {x: 1.7783345, y: -3.7068028}
- {x: 3.4502363, y: -2.8666859}
- {x: 3.9558334, y: -1.2588444}
m_Offset: {x: 0, y: 1.1034656}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 8.88, y: 6.38}
newSize: {x: 8.88, y: 6.38}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 8.225426, y: 1.4617157}
m_EdgeRadius: 0
--- !u!1001 &875275074606616260
PrefabInstance:
m_ObjectHideFlags: 0
@ -2157,5 +2252,10 @@ PrefabInstance:
propertyPath: m_Name
value: HarvestedCorn
objectReference: {fileID: 0}
- target: {fileID: 2111766585493962378, guid: d52f3514ed7fd461b8ab77a202c122c6,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d52f3514ed7fd461b8ab77a202c122c6, type: 3}

4
popcorn/Assets/MyGame/Scenes/CornField/Prefabs/corn_harvest.prefab
View File

@ -23,7 +23,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8524901521850801684}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
@ -101,7 +101,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 25
m_SortingOrder: 21
m_Sprite: {fileID: 21300000, guid: 1dbb30abe096f134fade3bf0e41796c6, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0

10
popcorn/Assets/MyGame/Scenes/CornField/Scripts/Basket.cs Normal file
View File

@ -0,0 +1,10 @@
using UnityEngine;
public class Basket : MonoBehaviour
{
private void OnTriggerExit2D(Collider2D other)
{
Debug.Log("exit");
Destroy(other.gameObject, 2f);
}
}

3
popcorn/Assets/MyGame/Scenes/CornField/Scripts/Basket.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: e66a2dbf7e774065832962016627c6d8
timeCreated: 1627350363