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

Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop

This commit is contained in:
koya_15 2021-09-30 16:27:27 +09:00
parent 87bd45a8a5 93fe90c318
commit 2de99edb73
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity
View File

@ -3625,7 +3625,7 @@ MonoBehaviour:
temperature: 0 temperature: 0
temperatureSpeed: 0 temperatureSpeed: 0
panSpeed: 0.1369657 panSpeed: 0.1369657
panFactor: 0.00145 panFactor: 0.001475
deadZone: 0.0045 deadZone: 0.0045
baseIncreaseSpeed: 0.15 baseIncreaseSpeed: 0.15
coldIncreaseSpeed: 0.5 coldIncreaseSpeed: 0.5

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

@ -868,7 +868,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dadd48ac419c440959ddb48337e48d9f, type: 3} m_Script: {fileID: 11500000, guid: dadd48ac419c440959ddb48337e48d9f, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
animationDuration: 0.3 animationDuration: 0.5
promoteGrowthButton: {fileID: 730756546} promoteGrowthButton: {fileID: 730756546}
upgradeButton: {fileID: 1992043646} upgradeButton: {fileID: 1992043646}
harvestEffectPrefab: {fileID: 3900911687800301846, guid: e9a7e2b2f003d44fab5926ca6ec6d728, harvestEffectPrefab: {fileID: 3900911687800301846, guid: e9a7e2b2f003d44fab5926ca6ec6d728,

2
popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv1.prefab
View File

@ -4727,7 +4727,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: 801a9571f147c4af68baf678410b386f, type: 2} - {fileID: 2100000, guid: 9fbd78a786ea24e5a974480685f51c5e, type: 2}
- {fileID: 0} - {fileID: 0}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0

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

@ -801,7 +801,7 @@ ParticleSystem:
donutRadius: 0.2 donutRadius: 0.2
m_Position: {x: 0, y: 0, z: 0} m_Position: {x: 0, y: 0, z: 0}
m_Rotation: {x: 0, y: 0, z: 0} m_Rotation: {x: 0, y: 0, z: 0}
m_Scale: {x: 0.85, y: 1.52, z: 1} m_Scale: {x: 0.85, y: 1.31, z: 1}
placementMode: 0 placementMode: 0
m_MeshMaterialIndex: 0 m_MeshMaterialIndex: 0
m_MeshNormalOffset: 0 m_MeshNormalOffset: 0
@ -4861,7 +4861,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: 801a9571f147c4af68baf678410b386f, type: 2} - {fileID: 2100000, guid: 9fbd78a786ea24e5a974480685f51c5e, type: 2}
- {fileID: 0} - {fileID: 0}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0

2
popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv3.prefab
View File

@ -4861,7 +4861,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: 801a9571f147c4af68baf678410b386f, type: 2} - {fileID: 2100000, guid: 9fbd78a786ea24e5a974480685f51c5e, type: 2}
- {fileID: 0} - {fileID: 0}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0

8
popcorn/Assets/MyGame/Scenes/CornField/Prefabs/CornField/Corn_one_lv4.prefab
View File

@ -17,7 +17,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!4 &8565919771951872518 --- !u!4 &8565919771951872518
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -107,7 +107,7 @@ ParticleSystem:
m_RotationOrder: 4 m_RotationOrder: 4
moveWithTransform: 1 moveWithTransform: 1
moveWithCustomTransform: {fileID: 0} moveWithCustomTransform: {fileID: 0}
scalingMode: 1 scalingMode: 0
randomSeed: 0 randomSeed: 0
InitialModule: InitialModule:
serializedVersion: 3 serializedVersion: 3
@ -4727,7 +4727,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: 801a9571f147c4af68baf678410b386f, type: 2} - {fileID: 2100000, guid: 9fbd78a786ea24e5a974480685f51c5e, type: 2}
- {fileID: 0} - {fileID: 0}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
@ -9692,7 +9692,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: 801a9571f147c4af68baf678410b386f, type: 2} - {fileID: 2100000, guid: 9fbd78a786ea24e5a974480685f51c5e, type: 2}
- {fileID: 0} - {fileID: 0}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0