材料演出追加

2022-10-28 17:04:35 +09:00 · 2022-10-28 17:04:35 +09:00 · fac8a69711
parent d461f916d8
commit fac8a69711
13 changed files with 5280 additions and 645 deletions
--- a/popcorn/Assets/MyGame/Resource/Material/cooking/MaterialDirecting/cooking_material_ApplePowder_Dither.png
+++ b/popcorn/Assets/MyGame/Resource/Material/cooking/MaterialDirecting/cooking_material_ApplePowder_Dither.png
--- a/popcorn/Assets/MyGame/Resource/Material/cooking/MaterialDirecting/cooking_material_ApplePowder_Dither.png.meta
+++ b/popcorn/Assets/MyGame/Resource/Material/cooking/MaterialDirecting/cooking_material_ApplePowder_Dither.png.meta
@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: de7c4d9f2a49e4844a6aa20517561264
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/popcorn/Assets/MyGame/Resource/Material/cooking/MaterialDirecting/cooking_material_ApplePowder_open_Dither.png
+++ b/popcorn/Assets/MyGame/Resource/Material/cooking/MaterialDirecting/cooking_material_ApplePowder_open_Dither.png
--- a/popcorn/Assets/MyGame/Resource/Material/cooking/MaterialDirecting/cooking_material_ApplePowder_open_Dither.png.meta
+++ b/popcorn/Assets/MyGame/Resource/Material/cooking/MaterialDirecting/cooking_material_ApplePowder_open_Dither.png.meta
@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: c35bc1bb6d77313439cfc9c226d7b657
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/popcorn/Assets/MyGame/Resource/Material/cooking/MaterialDirecting/cooking_material_ApplePowder_powder.png
+++ b/popcorn/Assets/MyGame/Resource/Material/cooking/MaterialDirecting/cooking_material_ApplePowder_powder.png
--- a/popcorn/Assets/MyGame/Resource/Material/cooking/MaterialDirecting/cooking_material_ApplePowder_powder.png.meta
+++ b/popcorn/Assets/MyGame/Resource/Material/cooking/MaterialDirecting/cooking_material_ApplePowder_powder.png.meta
@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: 6a2066048636c424c98a8408c21a2f19
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/popcorn/Assets/MyGame/Resources/MaterialIcons/apple.prefab
+++ b/popcorn/Assets/MyGame/Resources/MaterialIcons/apple.prefab
@ -121,7 +121,7 @@ PrefabInstance:
        type: 3}
      propertyPath: m_Sprite
      value: 
-      objectReference: {fileID: 21300000, guid: cbadd850aec184a1c8ac39250ecb48d9,
+      objectReference: {fileID: 21300000, guid: fc046d3a453361840b8782bacc22a46f,
        type: 3}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 21933a027d6844d1b8213bf5192430ac, type: 3}
--- a/popcorn/Assets/MyGame/Resources/Materials/apple.prefab
+++ b/popcorn/Assets/MyGame/Resources/Materials/apple.prefab
@ -16,7 +16,7 @@ PrefabInstance:
        type: 3}
      propertyPath: m_Sprite
      value: 
-      objectReference: {fileID: 21300000, guid: 7b7d875a8637a40498028ca225e3c51b,
+      objectReference: {fileID: 21300000, guid: 099753c92d0efe7469f8defc57ccdb5a,
        type: 3}
    - target: {fileID: 3416971083107644787, guid: 09cb22d8826ff4c4391577ba60b04ad6,
        type: 3}
--- a/popcorn/Assets/MyGame/Resources/PopcornIcons/package_apple.prefab
+++ b/popcorn/Assets/MyGame/Resources/PopcornIcons/package_apple.prefab
@ -11,7 +11,7 @@ PrefabInstance:
        type: 3}
      propertyPath: m_Sprite
      value: 
-      objectReference: {fileID: 21300000, guid: b0a937d312ed045ec815fe7c8abfdd7d,
+      objectReference: {fileID: 21300000, guid: 7e8647a007e6e12428f4ab97fee41b43,
        type: 3}
    - target: {fileID: 3426746518987915701, guid: 84aaa57282766408683fbb28f556d547,
        type: 3}
--- a/popcorn/Assets/MyGame/Resources/PopcornLargeIcons/package_apple.prefab
+++ b/popcorn/Assets/MyGame/Resources/PopcornLargeIcons/package_apple.prefab
@ -11,7 +11,7 @@ PrefabInstance:
        type: 3}
      propertyPath: m_Sprite
      value: 
-      objectReference: {fileID: 21300000, guid: dd73e59c297244b1fb121585efa7760c,
+      objectReference: {fileID: 21300000, guid: 5bb38c76a2436ed48b4213c6ac8b7219,
        type: 3}
    - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
        type: 3}
--- a/popcorn/Assets/MyGame/Resources/Popcorns/package_apple.prefab
+++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_apple.prefab
@ -16,7 +16,7 @@ PrefabInstance:
        type: 3}
      propertyPath: m_Sprite
      value: 
-      objectReference: {fileID: 21300000, guid: b0a937d312ed045ec815fe7c8abfdd7d,
+      objectReference: {fileID: 21300000, guid: 7e8647a007e6e12428f4ab97fee41b43,
        type: 3}
    - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9,
        type: 3}
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity
@ -3411,8 +3411,88 @@ Transform:
  - {fileID: 1208759823}
  - {fileID: 1933828730}
  m_Father: {fileID: 1448897407}
-  m_RootOrder: 3
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1306295626
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1528220821}
+    m_Modifications:
+    - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 13
+      objectReference: {fileID: 0}
+    - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7320563079046373319, guid: 3eb70ea30ec3b4054a50927bf5afc85d,
+        type: 3}
+      propertyPath: m_Name
+      value: material_Apple
+      objectReference: {fileID: 0}
+    - target: {fileID: 7320563079046373319, guid: 3eb70ea30ec3b4054a50927bf5afc85d,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3eb70ea30ec3b4054a50927bf5afc85d, type: 3}
+--- !u!4 &1306295627 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d,
+    type: 3}
+  m_PrefabInstance: {fileID: 1306295626}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &1348759672 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 5394121590661799423, guid: 96eb740b6268544a6a8cc533d159a55d,
@ -3536,8 +3616,8 @@ Transform:
  m_Children:
  - {fileID: 1095273985}
  - {fileID: 1129457738}
-  - {fileID: 162168170}
  - {fileID: 1295632043}
+  - {fileID: 162168170}
  - {fileID: 1528220821}
  m_Father: {fileID: 0}
  m_RootOrder: 4
@ -3736,6 +3816,7 @@ Transform:
  - {fileID: 228758271}
  - {fileID: 1085288354}
  - {fileID: 8324835}
+  - {fileID: 1306295627}
  m_Father: {fileID: 1448897407}
  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_Apple.prefab
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Topping/material_Apple.prefab