Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
koko 2024-07-21 00:36:17 +09:00
commit c0b5bfc422
25 changed files with 21452 additions and 557 deletions

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c25b14d44affa4f4fa69879c12d5eafe
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -4435,7 +4435,7 @@ Transform:
m_GameObject: {fileID: 545850347}
serializedVersion: 2
m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
m_LocalPosition: {x: -11.55, y: 25.711504, z: -22.12178}
m_LocalPosition: {x: -10.64, y: 25.711504, z: -21.151781}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -6856,7 +6856,7 @@ Transform:
m_GameObject: {fileID: 873223985}
serializedVersion: 2
m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
m_LocalPosition: {x: -11.55, y: 25.711504, z: -22.12178}
m_LocalPosition: {x: -10.64, y: 25.711504, z: -21.151781}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -7725,6 +7725,7 @@ MonoBehaviour:
<MainCanvas>k__BackingField: {fileID: 1049919591}
<TycoonUpgradeUi>k__BackingField: {fileID: 1496452083}
<TycoonManagementUi>k__BackingField: {fileID: 102499729}
<GoldUi>k__BackingField: {fileID: 0}
--- !u!1 &1070845212
GameObject:
m_ObjectHideFlags: 0
@ -11236,19 +11237,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 29ee900ba52849b49bfc33631b1e74a0, type: 3}
m_Name:
m_EditorClassIdentifier:
_fryingPanFoodSlotLocation: {fileID: 989840354}
_soupFoodSlotLocation: {fileID: 908699584}
_grillFoodSlotLocation: {fileID: 989840354}
_skewerFoodSlotLocation: {fileID: 1884162516}
_dessertFoodSlotLocation: {fileID: 1378992847}
_dailyFoodSlotUi: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3}
_fryingPanFoodSlotUis:
- {fileID: 1381452133}
- {fileID: 1711926403}
- {fileID: 1043781522}
_soupFoodSlotUis:
- {fileID: 1924794517}
- {fileID: 1757198067}
- {fileID: 566176542}
_grillFoodSlotUis:
- {fileID: 1381452133}
- {fileID: 1711926403}
- {fileID: 1043781522}
_skewerFoodSlotUis:
- {fileID: 781558286}
- {fileID: 667539663}
@ -11259,6 +11260,8 @@ MonoBehaviour:
- {fileID: 2041095998}
<DailyFoodSlotUis>k__BackingField: []
_pots: []
_grills: []
_skewers: []
--- !u!1 &1471090205
GameObject:
m_ObjectHideFlags: 0
@ -17495,7 +17498,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
propertyPath: m_LocalPosition.x
value: -11.55
value: -10.64
objectReference: {fileID: 0}
- target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
propertyPath: m_LocalPosition.y
@ -17503,7 +17506,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
propertyPath: m_LocalPosition.z
value: 8.52
value: 9.49
objectReference: {fileID: 0}
- target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3}
propertyPath: m_LocalRotation.w
@ -18902,6 +18905,14 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 559653068212947238, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
propertyPath: m_LocalPosition.x
value: 10.1
objectReference: {fileID: 0}
- target: {fileID: 559653068212947238, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
propertyPath: m_LocalPosition.z
value: 6.12
objectReference: {fileID: 0}
- target: {fileID: 582435561938650247, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
propertyPath: m_IsActive
value: 1
@ -18910,6 +18921,14 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2564673134173107012, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
propertyPath: m_LocalPosition.x
value: 10.89
objectReference: {fileID: 0}
- target: {fileID: 2564673134173107012, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
propertyPath: m_LocalPosition.z
value: 6.32
objectReference: {fileID: 0}
- target: {fileID: 2700294535905665279, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@ -18950,12 +18969,42 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3329476778901633229, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
propertyPath: m_LocalPosition.y
value: 2.75
objectReference: {fileID: 0}
- target: {fileID: 3329476778901633229, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
propertyPath: m_LocalPosition.z
value: 15.1
objectReference: {fileID: 0}
- target: {fileID: 3439588124162538232, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 4042882136038217772, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
propertyPath: m_LocalPosition.x
value: 7.04
objectReference: {fileID: 0}
- target: {fileID: 4042882136038217772, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
propertyPath: m_LocalPosition.z
value: 5.28
objectReference: {fileID: 0}
- target: {fileID: 4626291241256252485, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
propertyPath: m_LocalPosition.x
value: -19.83
objectReference: {fileID: 0}
- target: {fileID: 5495878135406933953, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9041926907780427371, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
propertyPath: m_Name
value: TycoonMap
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_RemovedGameObjects:
- {fileID: 5028675398581375375, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
- {fileID: 8790267552825112902, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 981817fdc4897a34bafc0040f15656b9, type: 3}

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 KiB

View File

@ -0,0 +1,141 @@
fileFormatVersion: 2
guid: 4fd4ec246d4e26642bf91830e74f9ef6
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 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: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WindowsStoreApps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

View File

@ -0,0 +1,141 @@
fileFormatVersion: 2
guid: 0c470f8a9a8034d4f96bcfa257914584
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 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: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WindowsStoreApps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

View File

@ -0,0 +1,141 @@
fileFormatVersion: 2
guid: 12bdec439c6b71d469c227209db6c7c9
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 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: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WindowsStoreApps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

View File

@ -0,0 +1,141 @@
fileFormatVersion: 2
guid: 2a0226b856048c840aa1e8166b651277
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 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: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WindowsStoreApps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -46,7 +46,7 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
alignment: 7
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}

View File

@ -39,6 +39,7 @@ Material:
disabledShaderPasses:
- MOTIONVECTORS
- DepthOnly
- SHADOWCASTER
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,75 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &1810536512625289201
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 4fd4ec246d4e26642bf91830e74f9ef6, type: 3}
- target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Name
value: BaseTycoonProp Variant
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 4fd4ec246d4e26642bf91830e74f9ef6, type: 3}
- target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}

View File

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

View File

@ -0,0 +1,75 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &5852029273904485528
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 0c470f8a9a8034d4f96bcfa257914584, type: 3}
- target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Name
value: BaseTycoonProp Variant
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 0c470f8a9a8034d4f96bcfa257914584, type: 3}
- target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}

View File

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

View File

@ -0,0 +1,75 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &2727363714303041666
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 03883258fe987bd479ef089c6cc49dd0, type: 3}
- target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Name
value: KitchenKnife
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 03883258fe987bd479ef089c6cc49dd0, type: 3}
- target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}

View File

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

View File

@ -0,0 +1,75 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &1712706884710976427
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 12bdec439c6b71d469c227209db6c7c9, type: 3}
- target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Name
value: BaseTycoonProp Variant
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 12bdec439c6b71d469c227209db6c7c9, type: 3}
- target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}

View File

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

View File

@ -0,0 +1,75 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &664852067909854347
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 2a0226b856048c840aa1e8166b651277, type: 3}
- target: {fileID: 3580758810857167321, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3764902268943045601, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Name
value: TrashCan
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7986070582027999988, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 2a0226b856048c840aa1e8166b651277, type: 3}
- target: {fileID: 9047629830516719732, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}
propertyPath: m_WasSpriteAssigned
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 06b1e69255a5cf549a66772b84f05858, type: 3}

View File

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