Merge branch 'feature/1.6.0' into feature/1.7.0

# Conflicts:
#	popcorn/Assets/MyGame/Resources/Data/BulkOrderData.txt
#	popcorn/Assets/MyGame/Resources/Data/BulkOrderTextData.txt
#	popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt
#	popcorn/Assets/MyGame/Resources/Data/ProductData.txt
#	popcorn/Assets/MyGame/Resources/Data/ScriptData.txt
#	popcorn/Assets/MyGame/Resources/Data/ScrollGamePlaceData.txt
#	popcorn/Assets/MyGame/Resources/Data/ShopCustomizeData.txt
#	popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt
#	popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/ResultManager.cs
This commit is contained in:
kimura 2022-10-20 14:03:46 +09:00
commit 75662b991a
22 changed files with 1457 additions and 79 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

View File

@ -0,0 +1,98 @@
fileFormatVersion: 2
guid: edb2db1992c4e0a49a5fe983513ffbe7
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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

View File

@ -0,0 +1,98 @@
fileFormatVersion: 2
guid: 3bdbf216204f8aa44a06af09e3ed4a42
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:

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -0,0 +1,98 @@
fileFormatVersion: 2
guid: 08fab8564c29f574a8b9fa258c6665e3
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:

View File

@ -0,0 +1,127 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &5350578869291485224
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 228103378089052436, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 3bdbf216204f8aa44a06af09e3ed4a42,
type: 3}
- target: {fileID: 3426746518987915701, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_Name
value: package_strawberry_chocolate
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_SizeDelta.x
value: 92
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_SizeDelta.y
value: 136
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -7.7
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 84aaa57282766408683fbb28f556d547, type: 3}

View File

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

View File

@ -0,0 +1,127 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &856591900145408447
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3497244521747764878, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: edb2db1992c4e0a49a5fe983513ffbe7,
type: 3}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_SizeDelta.x
value: 222
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_SizeDelta.y
value: 325
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5741585859577866755, guid: 7851d17bad9514d0cab3211e1e81bdda,
type: 3}
propertyPath: m_Name
value: package_strawberry_chocolate
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7851d17bad9514d0cab3211e1e81bdda, type: 3}

View File

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

View File

@ -0,0 +1,268 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &719896624375732554
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 5404378831333034711}
m_Modifications:
- target: {fileID: 1797334534968956419, guid: c8a1853c5a41447b09a68a46b13c92cb,
type: 3}
propertyPath: m_Name
value: material_StrawberryPowder
objectReference: {fileID: 0}
- target: {fileID: 1797334534968956419, guid: c8a1853c5a41447b09a68a46b13c92cb,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1797334534968956420, guid: c8a1853c5a41447b09a68a46b13c92cb,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1797334534968956420, guid: c8a1853c5a41447b09a68a46b13c92cb,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1797334534968956420, guid: c8a1853c5a41447b09a68a46b13c92cb,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1797334534968956420, guid: c8a1853c5a41447b09a68a46b13c92cb,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1797334534968956420, guid: c8a1853c5a41447b09a68a46b13c92cb,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1797334534968956420, guid: c8a1853c5a41447b09a68a46b13c92cb,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1797334534968956420, guid: c8a1853c5a41447b09a68a46b13c92cb,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1797334534968956420, guid: c8a1853c5a41447b09a68a46b13c92cb,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1797334534968956420, guid: c8a1853c5a41447b09a68a46b13c92cb,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1797334534968956420, guid: c8a1853c5a41447b09a68a46b13c92cb,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1797334534968956420, guid: c8a1853c5a41447b09a68a46b13c92cb,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c8a1853c5a41447b09a68a46b13c92cb, type: 3}
--- !u!95 &1228633973168983887 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 1797334534968956421, guid: c8a1853c5a41447b09a68a46b13c92cb,
type: 3}
m_PrefabInstance: {fileID: 719896624375732554}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1802444226707745957
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 5404378831333034711}
m_Modifications:
- target: {fileID: 5394121590661799408, guid: 96eb740b6268544a6a8cc533d159a55d,
type: 3}
propertyPath: m_Name
value: material_chocolate
objectReference: {fileID: 0}
- target: {fileID: 5394121590661799423, guid: 96eb740b6268544a6a8cc533d159a55d,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5394121590661799423, guid: 96eb740b6268544a6a8cc533d159a55d,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5394121590661799423, guid: 96eb740b6268544a6a8cc533d159a55d,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5394121590661799423, guid: 96eb740b6268544a6a8cc533d159a55d,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5394121590661799423, guid: 96eb740b6268544a6a8cc533d159a55d,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5394121590661799423, guid: 96eb740b6268544a6a8cc533d159a55d,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5394121590661799423, guid: 96eb740b6268544a6a8cc533d159a55d,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5394121590661799423, guid: 96eb740b6268544a6a8cc533d159a55d,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5394121590661799423, guid: 96eb740b6268544a6a8cc533d159a55d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5394121590661799423, guid: 96eb740b6268544a6a8cc533d159a55d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5394121590661799423, guid: 96eb740b6268544a6a8cc533d159a55d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 96eb740b6268544a6a8cc533d159a55d, type: 3}
--- !u!95 &6041671776956002648 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 5394121590661799421, guid: 96eb740b6268544a6a8cc533d159a55d,
type: 3}
m_PrefabInstance: {fileID: 1802444226707745957}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7695474827614316099
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2435291247113825428, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2435291247113825428, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2435291247113825428, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2435291247113825428, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2435291247113825428, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2435291247113825428, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2435291247113825428, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2435291247113825428, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2435291247113825428, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2435291247113825428, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2435291247113825428, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2435291247113825430, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: m_Name
value: package_strawberry_chocolate
objectReference: {fileID: 0}
- target: {fileID: 2435291247113825430, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2435291247113825431, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: noAnimateFlag
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2435291247113825431, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: toppingSprite
value:
objectReference: {fileID: 21300000, guid: 08fab8564c29f574a8b9fa258c6665e3,
type: 3}
- target: {fileID: 2435291247113825431, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: toppingAnimators.Array.size
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2435291247113825431, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: toppingAnimators.Array.data[0]
value:
objectReference: {fileID: 1228633973168983887}
- target: {fileID: 2435291247113825431, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: toppingAnimators.Array.data[1]
value:
objectReference: {fileID: 6041671776956002648}
- target: {fileID: 2990417425342172831, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 328bd0a0e24fb40119f24fb2007b941e, type: 3}
--- !u!4 &5404378831333034711 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2435291247113825428, guid: 328bd0a0e24fb40119f24fb2007b941e,
type: 3}
m_PrefabInstance: {fileID: 7695474827614316099}
m_PrefabAsset: {fileID: 0}

View File

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

View File

@ -0,0 +1,77 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &7944901940612951782
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9,
type: 3}
propertyPath: m_Name
value: package_strawberry_chocolate
objectReference: {fileID: 0}
- target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 3bdbf216204f8aa44a06af09e3ed4a42,
type: 3}
- target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3}

View File

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

View File

@ -116,10 +116,9 @@ namespace MyGame.Scenes.MiniGame.Scripts
var customizeDataList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopCustomizeData>(Const.ShopCustomizeDataSheet);
var sortedPlaceList = placeList.Where(data => data.itemId == 0).OrderBy(data => data.NeedScore).ToList();
// 最新のスコアで獲得可能な範囲の報酬を取得
var achievedList = sortedPlaceList
.Where(data => data.NeedScore > prevPlaceScore)
.Where(data => data.NeedScore <= placeScoreData.Score);
var prevNeedScore = sortedPlaceList.LastOrDefault(data => data.NeedScore <= prevPlaceScore)?.NeedScore ?? 0;
var progressList = new List<(string name, Transform prefab, int needScore, bool isRecipe)>();
foreach (var placeData in achievedList)
@ -131,36 +130,61 @@ namespace MyGame.Scenes.MiniGame.Scripts
{
continue;
}
var shopData = shopDataList.FirstOrDefault(data => data.itemId == placeData.recipeId && data.Category == ItemCategory.Recipe);
if (shopData is null)
{
continue;
}
globalGameData.MyRecipes = new List<int>(globalGameData.MyRecipes){placeData.recipeId}.ToArray();
globalGameData.DailyRecipeGetCount++;
var shopData = shopDataList.First(data => data.itemId == placeData.recipeId && data.Category == ItemCategory.Recipe);
// progressList.Add((shopData.Name, shopData.GetPrefab(), placeData.NeedScore, true));
progressList.Add((shopData.Name, recipeMalaImagePrefab, placeData.NeedScore, true));
}
else if (placeData.customizeId != 0)
{
var customizeData = customizeDataList.First(data => data.id == placeData.customizeId);
if (gameData.ShopCustomizeMyItems.Contains(placeData.customizeId))
{
continue;
}
var customizeData = customizeDataList.FirstOrDefault(data => data.id == placeData.customizeId);
if (customizeData is null)
{
continue;
}
ShopCustomize.GetItem(customizeData);
progressList.Add((customizeData.Name, customizeData.GetIconPrefab(), placeData.NeedScore, false));
}
}
// 前回獲得時の必要スコアを取得
var prevNeedScore = 0;
if (progressList.Count > 0)
{
prevNeedScore = sortedPlaceList.LastOrDefault(data => data.NeedScore < progressList[0].needScore)?.NeedScore ?? 0;
}
// 次回報酬
var nextAchievement = sortedPlaceList.FirstOrDefault(data => data.NeedScore > placeScoreData.Score);
if (nextAchievement != null)
{
if (nextAchievement.recipeId != 0 && !globalGameData.MyRecipes.Contains(nextAchievement.recipeId))
{
var shopData = shopDataList.First(data => data.itemId == nextAchievement.recipeId && data.Category == ItemCategory.Recipe);
// progressList.Add((shopData.Name, shopData.GetPrefab(), nextAchievement.NeedScore, true));
progressList.Add((shopData.Name, recipeMalaImagePrefab, nextAchievement.NeedScore, true));
}
else if (nextAchievement.customizeId != 0)
var shopData = shopDataList.FirstOrDefault(data => data.itemId == nextAchievement.recipeId && data.Category == ItemCategory.Recipe);
if (shopData != null)
{
// progressList.Add((shopData.Name, shopData.GetPrefab(), placeData.NeedScore, true));
progressList.Add((shopData.Name, recipeMalaImagePrefab, nextAchievement.NeedScore, true));
}
} else if (nextAchievement.customizeId != 0)
{
var customizeData = customizeDataList.First(data => data.id == nextAchievement.customizeId);
progressList.Add((customizeData.Name, customizeData.GetIconPrefab(), nextAchievement.NeedScore, false));
var customizeData = customizeDataList.FirstOrDefault(data => data.id == nextAchievement.customizeId);
if (customizeData != null)
{
progressList.Add((customizeData.Name, customizeData.GetIconPrefab(), nextAchievement.NeedScore, false));
}
}
}
GameDataManager.SaveGameData();
// view
@ -171,15 +195,26 @@ namespace MyGame.Scenes.MiniGame.Scripts
meterObject.SetActive(progressList.Count > 0);
var basePlaceScore = prevNeedScore;
/*
*
*
* 0
*/
var prevScore = 0;
if (progressList.Count > 0 && basePlaceScore < prevPlaceScore && prevPlaceScore < progressList[0].needScore)
{
prevScore = prevPlaceScore - basePlaceScore;
}
var nextItemSubject = new Subject<Unit>().AddTo(this);
progressList.ToObservable()
.Zip(nextItemSubject.StartWith(Unit.Default).Take(progressList.Count), (x, _) => x)
.ForEachAsync(x =>
{
SetSilhouette(x.prefab, x.isRecipe);
var prevScore = prevPlaceScore > basePlaceScore ? prevPlaceScore - basePlaceScore : 0;
var needScore = x.needScore == basePlaceScore ? 1 : x.needScore - basePlaceScore;
var newScore = x.needScore == basePlaceScore ? 1 : placeScoreData.Score - basePlaceScore;
// オフセット計算
var needScore = x.needScore <= basePlaceScore ? 1 : x.needScore - basePlaceScore;
var newScore = x.needScore <= basePlaceScore ? 1 : placeScoreData.Score - basePlaceScore;
basePlaceScore = x.needScore;
SetProgress((float)prevScore / needScore, false).ToObservable()
.Delay(TimeSpan.FromSeconds(waitProgress))
@ -195,6 +230,8 @@ namespace MyGame.Scenes.MiniGame.Scripts
}
ShopItemExchangeView.ShowDialog(x.name, x.prefab, x.isRecipe, () => nextItemSubject.OnNext(Unit.Default));
}).AddTo(this);
// 初回のみ0以外の値が入るため・・・
prevScore = 0;
})
.SelectMany(nextItemSubject)
.Delay(TimeSpan.FromSeconds(waitButtonActive))

View File

@ -23,11 +23,11 @@ namespace MyGame.Scenes.MiniGame.Scripts
private ScrollGamePlaceData[] sortedPlaceDataListByNeedScore;
public IObservable<Unit> OnClick => selectButton.OnClickAsObservable().TakeUntilDestroy(this);
public void SetStageHiScore(int num) => stageHiScore.text = $"{LocalizationManager.GetTranslation("UI/HiScore")}{num}";
public void SetTotalScore(int num)
public void SetTotalScore(int newScore)
{
totalScore.text = $"{LocalizationManager.GetTranslation("UI/TotalScore")}{num}";
achievementObject.SetActive(num < sortedPlaceDataListByNeedScore.Max(data => data.NeedScore));
UpdateAchievement(num);
totalScore.text = $"{LocalizationManager.GetTranslation("UI/TotalScore")}{newScore}";
var hasUpdate = UpdateAchievement();
achievementObject.SetActive(hasUpdate);
}
public void SetPlaceData(ScrollGamePlaceData[] placeDataList)
@ -40,23 +40,45 @@ namespace MyGame.Scenes.MiniGame.Scripts
itemText.text = $"{LocalizationManager.GetTranslation("UI/EarnItem")}{shopData.Name}";
}
private void UpdateAchievement(int score)
private bool UpdateAchievement()
{
var placeData = GetCurrentAchievement(sortedPlaceDataListByNeedScore, score, true);
var placeData = GetCurrentAchievement(sortedPlaceDataListByNeedScore, true);
if (placeData is null)
{
return;
return false;
}
SetAchievement(placeData);
return true;
}
private static ScrollGamePlaceData GetCurrentAchievement(ScrollGamePlaceData[] placeDataList, int score, bool sorted = false)
private static ScrollGamePlaceData GetCurrentAchievement(IEnumerable<ScrollGamePlaceData> placeDataList, bool sorted = false)
{
if (sorted)
if (!sorted)
{
return placeDataList.FirstOrDefault(data => data.itemId == 0 && data.NeedScore > score);
placeDataList = placeDataList.OrderBy(data => data.NeedScore);
}
return placeDataList.OrderBy(data => data.NeedScore).FirstOrDefault(data => data.itemId == 0 && data.NeedScore > score);
var productDataList = SpreadsheetDataManager.Instance.GetBaseDataList<ProductData>(Const.ProductDataSheet);
var customizeDataList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopCustomizeData>(Const.ShopCustomizeDataSheet);
foreach (var placeData in placeDataList)
{
if (placeData.recipeId != 0 && !GameDataManager.GameData.MyRecipes.Contains(placeData.recipeId))
{
if (productDataList.Exists(data => data.id == placeData.recipeId))
{
return placeData;
}
}
if (placeData.customizeId != 0 && !GameDataManager.GameData.ShopCustomizeMyItems.Contains(placeData.customizeId))
{
if (customizeDataList.Exists(data => data.id == placeData.customizeId))
{
return placeData;
}
}
}
return null;
}
private void SetAchievement(ScrollGamePlaceData placeData)
@ -67,7 +89,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
var customizeDataList = SpreadsheetDataManager.Instance.GetBaseDataList<ShopCustomizeData>(Const.ShopCustomizeDataSheet);
if (placeData.recipeId != 0)
{
var productData = productDataList.FirstOrDefault(data => data.id == placeData.recipeId);
var productData = productDataList.First(data => data.id == placeData.recipeId);
SetAchievementText(productData.Name, placeData.NeedScore);
var rt = recipeObject.transform;
rt.DestroyAllChildrens();
@ -75,7 +97,7 @@ namespace MyGame.Scenes.MiniGame.Scripts
}
else if (placeData.customizeId != 0)
{
var customizeData = customizeDataList.FirstOrDefault(data => data.id == placeData.customizeId);
var customizeData = customizeDataList.First(data => data.id == placeData.customizeId);
SetAchievementText(customizeData.Name, placeData.NeedScore);
var ct = customizeObject.transform;
ct.DestroyAllChildrens();

View File

@ -850,8 +850,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 19.7, y: -2.8}
m_SizeDelta: {x: 100, y: 46}
m_AnchoredPosition: {x: 13.8, y: -2.8}
m_SizeDelta: {x: 120, y: 46}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9136989294777611128
CanvasRenderer:
@ -883,10 +883,10 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 40
m_FontSize: 35
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_BestFit: 1
m_MinSize: 35
m_MaxSize: 40
m_Alignment: 5
m_AlignByGeometry: 0
@ -894,7 +894,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 100
m_Text: 1000
--- !u!1 &9136989294876732286
GameObject:
m_ObjectHideFlags: 0
@ -922,7 +922,7 @@ RectTransform:
m_GameObject: {fileID: 9136989294876732286}
m_LocalRotation: {x: -0, y: -0, z: 0.092305, w: 0.9957308}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.9, y: 0.9, z: 0.9}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9136989295926434681}
@ -930,7 +930,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 10.592001}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 34, y: -27.99997}
m_AnchoredPosition: {x: 30.7, y: -27.99997}
m_SizeDelta: {x: 54, y: 42}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9136989294876732275

View File

@ -28,6 +28,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: 0.4193403, w: 0.90782917}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012874794846574}
m_RootOrder: 2
@ -60,6 +61,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.19607843}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -102,6 +104,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3856012875694233263}
m_Father: {fileID: 3856012874861365792}
@ -135,6 +138,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -177,6 +181,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: 0.15055302, w: 0.9886019}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012874794846574}
m_RootOrder: 1
@ -209,6 +214,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.19607843}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -251,6 +257,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012875378235477}
m_RootOrder: 0
@ -283,6 +290,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -326,6 +334,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012875358022748}
m_RootOrder: 0
@ -358,6 +367,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 0.9372549, a: 0.19607843}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -374,7 +384,7 @@ MonoBehaviour:
m_PixelsPerUnitMultiplier: 1
--- !u!95 &3856012874473253804
Animator:
serializedVersion: 3
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -387,6 +397,7 @@ Animator:
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
@ -419,6 +430,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3084478268397759140}
- {fileID: 3613327424014868448}
@ -504,6 +516,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3856012875614048344}
- {fileID: 1504859057866268918}
@ -567,6 +580,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3856012876379087770}
- {fileID: 3856012876249380571}
@ -624,6 +638,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012875199795011}
m_RootOrder: 0
@ -656,6 +671,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -702,6 +718,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012875338803179}
m_RootOrder: 0
@ -734,6 +751,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -777,6 +795,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012875378235477}
m_RootOrder: 1
@ -809,6 +828,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -891,6 +911,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3856012874977579075}
m_Father: {fileID: 3856012874861365792}
@ -924,6 +945,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -964,6 +986,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3856012875007359860}
- {fileID: 3856012875805691667}
@ -1004,6 +1027,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012876494266538}
m_RootOrder: 1
@ -1036,6 +1060,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1122,6 +1147,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3856012874473253805}
- {fileID: 3856012874794846574}
@ -1176,6 +1202,7 @@ MonoBehaviour:
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 0
--- !u!114 &3856012875358022747
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1219,6 +1246,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4111097017210071838}
- {fileID: 3856012875109116651}
@ -1259,6 +1287,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012876494266538}
m_RootOrder: 0
@ -1291,6 +1320,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1333,6 +1363,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.8999999, y: 0.8999999, z: 0.8999999}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3050691075110241529}
m_Father: {fileID: 3856012876432300748}
@ -1366,6 +1397,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1408,6 +1440,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012874794846574}
m_RootOrder: 0
@ -1440,6 +1473,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1483,6 +1517,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012876379087770}
m_RootOrder: 0
@ -1515,6 +1550,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1598,6 +1634,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012876249380571}
m_RootOrder: 0
@ -1630,6 +1667,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
@ -1716,6 +1754,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4383640794170159703}
m_RootOrder: 0
@ -1748,6 +1787,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1834,6 +1874,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012875338803179}
m_RootOrder: 1
@ -1866,6 +1907,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1951,6 +1993,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.38, y: 0.38, z: 0.38}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012876121778113}
m_RootOrder: 0
@ -1983,6 +2026,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2025,6 +2069,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012876249380571}
m_RootOrder: 1
@ -2057,6 +2102,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2099,6 +2145,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3856012875863308981}
- {fileID: 3856012876438822078}
@ -2133,6 +2180,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2173,6 +2221,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3856012875645848064}
- {fileID: 3856012875903494665}
@ -2214,6 +2263,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3856012875620007257}
m_Father: {fileID: 3856012874861365792}
@ -2247,6 +2297,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2275,6 +2326,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -2346,6 +2398,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3856012875488019547}
- {fileID: 3856012876121778113}
@ -2385,6 +2438,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012876121778113}
m_RootOrder: 1
@ -2417,6 +2471,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2461,6 +2516,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3856012875447652421}
- {fileID: 3856012875338846984}
@ -2500,6 +2556,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012875488019547}
m_RootOrder: 0
@ -2532,6 +2589,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2574,6 +2632,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: 0.32324833, w: 0.9463142}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3856012874794846574}
m_RootOrder: 3
@ -2606,6 +2665,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.19607843}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -3540,7 +3600,7 @@ PrefabInstance:
- target: {fileID: 68604352306250142, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
@ -3565,7 +3625,7 @@ PrefabInstance:
- target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
@ -3575,17 +3635,17 @@ PrefabInstance:
- target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
propertyPath: m_SizeDelta.x
value: 198
value: 0
objectReference: {fileID: 0}
- target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
propertyPath: m_SizeDelta.y
value: 50
value: 0
objectReference: {fileID: 0}
- target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
@ -3625,12 +3685,12 @@ PrefabInstance:
- target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 312
value: 0
objectReference: {fileID: 0}
- target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -155
value: 0
objectReference: {fileID: 0}
- target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
@ -3684,6 +3744,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 769012ad2d933ed439e798970ef29fdd, type: 3}
--- !u!224 &3613327422686341716 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
m_PrefabInstance: {fileID: 3856012876160759828}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5799495140018518241 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd,
@ -3696,9 +3762,3 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b0dc9cb18f7548c6a51cf39c843c54ef, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &3613327422686341716 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd,
type: 3}
m_PrefabInstance: {fileID: 3856012876160759828}
m_PrefabAsset: {fileID: 0}

View File

@ -15,7 +15,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2887575335600208513
RectTransform:
m_ObjectHideFlags: 0
@ -26,15 +26,16 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2964155949864541427}
- {fileID: 5364282598340632292}
m_Father: {fileID: 135021159977205431}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 339, y: -2}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &83536216591997874
@ -65,6 +66,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 295254682879803719}
m_RootOrder: 0
@ -97,6 +99,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -137,6 +140,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1498850267901365223}
- {fileID: 3965152143434253054}
@ -176,6 +180,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6153581475224441021}
m_Father: {fileID: 7340080036641221667}
@ -209,6 +214,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -251,6 +257,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8225030417461912078}
m_Father: {fileID: 6403505569804138876}
@ -284,6 +291,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -326,6 +334,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4519309666120766310}
m_RootOrder: 0
@ -358,6 +367,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -398,6 +408,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6042194771594100481}
- {fileID: 7737179592591481255}
@ -437,6 +448,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3402981373595049223}
m_RootOrder: 0
@ -469,6 +481,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -511,6 +524,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7340080036641221667}
m_RootOrder: 0
@ -543,6 +557,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -585,6 +600,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7428997426145977575}
m_RootOrder: 0
@ -617,6 +633,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -657,6 +674,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6965101275812814870}
- {fileID: 2520922652578556911}
@ -696,6 +714,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8598182029348026001}
m_Father: {fileID: 295254682879803719}
@ -729,6 +748,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -771,6 +791,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6232319562521736227}
m_Father: {fileID: 8175998082953259673}
@ -804,6 +825,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -846,6 +868,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9, y: 0.9, z: 0.9}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3402981373595049223}
- {fileID: 7340080036641221667}
@ -900,6 +923,7 @@ MonoBehaviour:
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &4753476481036792322
GameObject:
m_ObjectHideFlags: 0
@ -929,6 +953,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 135021159977205431}
m_Father: {fileID: 8175998084231429043}
@ -962,6 +987,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1028,6 +1054,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6403505569804138876}
m_RootOrder: 0
@ -1060,6 +1087,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1100,6 +1128,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2449483858882360425}
- {fileID: 6145851249119610261}
@ -1139,6 +1168,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2887575335600208513}
m_RootOrder: 0
@ -1171,6 +1201,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1211,6 +1242,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3138829615348946960}
- {fileID: 4033200549685371713}
@ -1250,6 +1282,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8175998082947913934}
m_RootOrder: 2
@ -1282,6 +1315,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1324,6 +1358,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8175998084231429043}
m_RootOrder: 2
@ -1356,6 +1391,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.43137258, g: 0.29803923, b: 0.19215688, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1402,6 +1438,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8175998082542538481}
- {fileID: 8175998083146003102}
@ -1436,6 +1473,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1478,6 +1516,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8175998082377058392}
m_RootOrder: 0
@ -1510,6 +1549,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1551,6 +1591,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8175998082947913934}
- {fileID: 8175998082953259673}
@ -1617,6 +1658,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8175998082654142962}
m_RootOrder: 2
@ -1649,6 +1691,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1691,6 +1734,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8175998084231429043}
m_RootOrder: 0
@ -1723,6 +1767,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1763,6 +1808,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8175998084231429043}
- {fileID: 8175998082998279040}
@ -1801,6 +1847,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8175998084184389992}
- {fileID: 8175998083657673475}
@ -1841,6 +1888,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8175998083657673475}
m_RootOrder: 0
@ -1873,6 +1921,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1917,6 +1966,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8175998082947913934}
m_RootOrder: 1
@ -1949,6 +1999,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -1977,6 +2028,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -2050,6 +2102,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8175998082377058392}
m_RootOrder: 1
@ -2082,6 +2135,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2126,6 +2180,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8175998082377058392}
m_Father: {fileID: 8175998084184389992}
@ -2164,6 +2219,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8175998084184389992}
m_RootOrder: 0
@ -2196,6 +2252,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.43137258, g: 0.29803923, b: 0.19215688, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2243,6 +2300,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8175998084231429043}
m_RootOrder: 3
@ -2275,6 +2333,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2362,6 +2421,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8175998082971778654}
m_Father: {fileID: 8175998082953259673}
@ -2395,6 +2455,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2423,6 +2484,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
@ -2496,6 +2558,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3111157988928424479}
m_Father: {fileID: 8175998084231429043}
@ -2529,6 +2592,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2571,6 +2635,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8175998083386752691}
- {fileID: 8175998083243239620}
@ -2605,6 +2670,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2647,6 +2713,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8175998082903555690}
- {fileID: 8175998084009524128}
@ -2684,6 +2751,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2726,6 +2794,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7145994137012183431}
m_Father: {fileID: 2887575335600208513}
@ -2759,6 +2828,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2801,6 +2871,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3310281078179982626}
m_Father: {fileID: 7428997426145977575}
@ -2834,6 +2905,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2876,6 +2948,7 @@ RectTransform:
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3402981373595049223}
m_RootOrder: 1
@ -2908,6 +2981,7 @@ MonoBehaviour:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:

View File

@ -12,7 +12,7 @@ public static class Const {
public static readonly int DefaultPanId = 1;
public static readonly int DefaultCityId = 1;
public static readonly int ShopTankId = 20;
public static readonly int MaxShopLevel = 18;
public static readonly int MaxShopLevel = 19; // Max 店舗レベル
public static readonly int TankCapacity = 20;
public static readonly int SpecialShopLevel = 9999;
public static readonly int SpecialCategory = 9999;

View File

@ -8600,6 +8600,72 @@ MonoBehaviour:
- yep~
Flags: 0000000000
Languages_Touch: []
- Term: Script/BrotherScript10097
TermType: 0
Description:
Languages:
- "\u300C\u3064\u3044\u3053\u306E\u524D\u307E\u3067\u7121\u540D\u3060\u3063\u305F\u306E\u306B\u3001\u4ECA\u3084\u56FD\u6C11\u7684\u306A\n\u304A\u5E97\u306B\u306A\u3063\u3061\u3083\u3046\u306A\u3093\u3066\u3001\u51C4\u304F\u9811\u5F35\u3063\u305F\u306D\uFF01\u300D\n\u3063\u3066\u3055\u3063\u304D\u306E\u304A\u5BA2\u3055\u3093\u304C\u8912\u3081\u3066\u304F\u308C\u305F\u3088\uFF01"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Script/BrotherScript10098
TermType: 0
Description:
Languages:
- "\u306A\u3093\u3060\u304B\u7167\u308C\u304F\u3055\u3044\u3051\u3069"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Script/BrotherScript10099
TermType: 0
Description:
Languages:
- "\u305D\u3046\u8A00\u3063\u3066\u8CB0\u3048\u308B\u304F\u3089\u3044\u56FD\u3058\u3085\u3046\u306E\u4EBA\u306B\n\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306E\u9B45\u529B\u304C\u4F1D\u308F\u3063\u305F\u3063\u3066\u3053\u3068\u3060\u3088\u306D\uFF01"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Script/BrotherScript10100
TermType: 0
Description:
Languages:
- "\u307F\u3093\u306A\u306B\u559C\u3093\u3067\u3082\u3089\u3048\u3066\u5B09\u3057\u3044\u306D"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Script/BrotherScript10101
TermType: 0
Description:
Languages:
- "\uFF08\u3067\u3082\u2026\u305D\u308C\u3067\u3082\u307E\u3060\u307E\u3060\u2026\uFF09"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Script/BrotherScript10102
TermType: 0
Description:
Languages:
- "\uFF08\u3082\u3063\u3068\u3082\u3063\u3068\u6CA2\u5C71\u306E\u4EBA\u306B\u7F8E\u5473\u3057\u3044\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\n\u3092\u98DF\u3079\u3066\u3082\u3089\u3046\u306B\u306F\u3001\u3069\u3046\u3059\u308C\u3070\u826F\u3044\u304B\u306A\u2026\uFF1F\uFF09"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Script/BrotherScript20001
TermType: 0
Description:
@ -10052,6 +10118,105 @@ MonoBehaviour:
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderRequestText0094
TermType: 0
Description:
Languages:
- "\u7D76\u5BFE\u306B\u697D\u3057\u3044\u30D1\u30FC\u30C6\u30A3\u30FC\u306B\u306A\u308B\u3088\u306D\uFF01"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderRequestText0095
TermType: 0
Description:
Languages:
- "\u91CE\u7403\u5834\u3067\u8CA9\u58F2\u3055\u305B\u3066\u6B32\u3057\u3044\u306D\u3093\uFF01"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderRequestText0096
TermType: 0
Description:
Languages:
- "\u79C1\u305F\u3061\u306E\u30B5\u30FC\u30AB\u30B9\u306B\u3082\u304A\u9858\u3044\u3057\u305F\u3044\u3093\u3058\u3083"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderRequestText0097
TermType: 0
Description:
Languages:
- "\u98DB\u884C\u6A5F\u306E\u4E2D\u3067\u3082\u98DF\u3079\u3089\u308C\u305F\u3089\u7D20\u6575\u3060\u3068\u601D\u3046\u306E\uFF01"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderRequestText0098
TermType: 0
Description:
Languages:
- "\u6700\u9AD8\u306E\u304A\u796D\u308A\u306B\u3057\u305F\u3044\u3093\u3067\u3059\uFF01"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderRequestText0099
TermType: 0
Description:
Languages:
- "\u6C34\u65CF\u9928\u306E\u304A\u4F9B\u306B\u3082\u826F\u3044\u3068\u805E\u304D\u307E\u3057\u3066"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderRequestText0100
TermType: 0
Description:
Languages:
- "\u30C7\u30D1\u30FC\u30C8\u3067\u304A\u83D3\u5B50\u306E\u30A4\u30D9\u30F3\u30C8\u3092\u3057\u305F\u3044\u3063\u3059\uFF01"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderRequestText0101
TermType: 0
Description:
Languages:
- "\u6620\u753B\u9928\u7528\u306B\u304A\u9858\u3044\u3057\u305F\u3044\u306E"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderRequestText0102
TermType: 0
Description:
Languages:
- "\u5546\u5E97\u8857\u3092\u76DB\u308A\u4E0A\u3052\u3066\u307B\u3057\u3044\u3093\u3060\u301C"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderThanksText0001
TermType: 0
Description:
@ -11375,6 +11540,105 @@ MonoBehaviour:
popcorn for us!
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderThanksText0094
TermType: 0
Description:
Languages:
- "\u3068\u3063\u3066\u3082\u697D\u3057\u3044\u30D1\u30FC\u30C6\u30A3\u30FC\u306B\u306A\u3063\u305F\u3088\uFF01\n\u672C\u5F53\u306B\u3042\u308A\u304C\u3068\u3046\u306D\uFF01"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderThanksText0095
TermType: 0
Description:
Languages:
- "\u91CE\u7403\u5834\u306F\u30B0\u30EB\u30E1\u3082\u697D\u3057\u307F\u306E1\u3064\u3084\u304B\u3089\u306D\uFF01\n\u7F8E\u5473\u3057\u3044\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u3042\u308A\u304C\u3068\u3046\uFF01"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderThanksText0096
TermType: 0
Description:
Languages:
- "\u304A\u304B\u3052\u3055\u307E\u3067\u5927\u597D\u8A55\u3060\u3063\u305F\u306E\u3058\u3083\uFF01\n\u7D20\u6674\u3089\u3057\u3044\u6642\u9593\u3092\u3042\u308A\u304C\u3068\u3046\u306A\u306E\u3058\u3083\uFF01"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderThanksText0097
TermType: 0
Description:
Languages:
- "\u601D\u3063\u305F\u901A\u308A\u7D20\u6575\u306A\u7A7A\u306E\u65C5\u3092\u63D0\u4F9B\u3067\u304D\u305F\u306E\uFF01\n\u7D20\u6575\u306A\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u3042\u308A\u304C\u3068\u3046\uFF01"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderThanksText0098
TermType: 0
Description:
Languages:
- "\u6700\u9AD8\u306E\u304A\u796D\u308A\u306B\u306A\u308A\u307E\u3057\u305F\uFF01\n\u6700\u9AD8\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3057\u305F\uFF01"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderThanksText0099
TermType: 0
Description:
Languages:
- "\u304A\u5BA2\u3055\u3093\u306E\u7B11\u9854\u304C\u6CA2\u5C71\u898B\u308C\u307E\u3057\u305F\uFF01\n\u3053\u306E\u5EA6\u306F\u672C\u5F53\u306B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3057\u305F\uFF01"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderThanksText0100
TermType: 0
Description:
Languages:
- "\u30A4\u30D9\u30F3\u30C8\u306F\u5927\u76DB\u6CC1\u3060\u3063\u305F\u3063\u3059\uFF01\n\u7F8E\u5473\u3057\u304F\u6CA2\u5C71\u4F5C\u3063\u3066\u304F\u308C\u3066\u3042\u308A\u304C\u3068\u3046\u3063\u3059\uFF01"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderThanksText0101
TermType: 0
Description:
Languages:
- "\u6700\u9AD8\u306E\u6620\u753B\u306B\u6700\u9AD8\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\uFF01\n\u6700\u9AD8\u306E\u6642\u9593\u3092\u3042\u308A\u304C\u3068\u3046\u306A\u306E\uFF01"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/BulkOrderThanksText0102
TermType: 0
Description:
Languages:
- "\u307F\u3093\u306A\u5927\u559C\u3073\u3067\u3068\u3063\u3066\u3082\u76DB\u308A\u4E0A\u304C\u3063\u305F\u3088\u301C\n\u7F8E\u5473\u3057\u3044\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3092\u3042\u308A\u304C\u3068\u3046\u306D\u301C"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/MaterialName0001
TermType: 0
Description:
@ -12002,7 +12266,7 @@ MonoBehaviour:
TermType: 0
Description:
Languages:
-
- "\u82B1\u6912\u3068\u5510\u8F9B\u5B50\u306E\u30CF\u30FC\u30E2\u30CB\u30FC\u304C\u751F\u307F\u51FA\u3059\n\u7D76\u5999\u306A\u8F9B\u3055\u304C\u3084\u307F\u3064\u304D\u306B\u306A\u308B\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3"
-
-
-
@ -13077,6 +13341,17 @@ MonoBehaviour:
- Flower stand sign
Flags: 0000000000
Languages_Touch: []
- Term: Item/ShopCustomizeName0017
TermType: 0
Description:
Languages:
- "\u4E2D\u83EF\u98A8\u306E\u770B\u677F"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/ShopCustomizeText0001
TermType: 0
Description:
@ -13354,6 +13629,17 @@ MonoBehaviour:
Appearance +40 by purchase'
Flags: 0000000000
Languages_Touch: []
- Term: Item/ShopCustomizeText0017
TermType: 0
Description:
Languages:
- "\u4E2D\u83EF\u98A8\u306E\u914D\u8272\u3092\u53D6\u308A\u5165\u308C\u305F\u770B\u677F\n\u8F1D\u304F\u3088\u3046\u306A\u91D1\u8272\u304C\u304A\u5E97\u3092\u8C6A\u83EF\u306B\u898B\u305B\u3066\u304F\u308C\u308B\n\u7372\u5F97\u3067\u5916\u89B3\uFF0B25"
-
-
-
-
Flags: 0000000000
Languages_Touch: []
- Term: Item/ShopHistoryText0001
TermType: 0
Description:
@ -13654,7 +13940,7 @@ MonoBehaviour:
Google_WebServiceURL: https://script.google.com/a/macros/usaya.jp/s/AKfycbzSBhEFwZVCfg1dkGwVNsYBgv460KeK1X-gKOxsu89c8EkzjZmPR3kOWC_EVVyii6Xt4w/exec
Google_SpreadsheetKey: 1jfQDKhWF5LDrIA_xkhvBOVczqi-7YMQFd-wlN2BIqI8
Google_SpreadsheetName: I2Loc popcorn Localization
Google_LastUpdatedVersion: 1661437544186
Google_LastUpdatedVersion: 1662425583769
Google_Password: change_this
GoogleUpdateFrequency: 1
GoogleInEditorCheckFrequency: 1

View File

@ -1,28 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<projectSettings>
<projectSetting name="com.google.external-dependency-managerAnalyticsEnabled" value="False" />
<projectSetting name="Google.IOSResolver.AutoPodToolInstallInEditor" value="True" />
<projectSetting name="Google.IOSResolver.CocoapodsIntegrationMethod" value="1" />
<projectSetting name="Google.IOSResolver.PodfileAddUseFrameworks" value="True" />
<projectSetting name="Google.IOSResolver.PodfileAllowPodsInMultipleTargets" value="True" />
<projectSetting name="Google.IOSResolver.PodfileAlwaysAddMainTarget" value="True" />
<projectSetting name="Google.IOSResolver.PodfileEnabled" value="True" />
<projectSetting name="Google.IOSResolver.PodfileStaticLinkFrameworks" value="False" />
<projectSetting name="Google.IOSResolver.PodToolExecutionViaShellEnabled" value="True" />
<projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
<projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
<projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />
<projectSetting name="GooglePlayServices.AndroidPackageInstallationEnabled" value="True" />
<projectSetting name="GooglePlayServices.AutoResolutionDisabledWarning" value="True" />
<projectSetting name="GooglePlayServices.AutoResolveOnBuild" value="True" />
<projectSetting name="GooglePlayServices.AutoResolverEnabled" value="False" />
<projectSetting name="GooglePlayServices.ExplodeAars" value="True" />
<projectSetting name="GooglePlayServices.LocalMavenRepoDir" value="Assets/GeneratedLocalRepo" />
<projectSetting name="GooglePlayServices.PatchAndroidManifest" value="True" />
<projectSetting name="GooglePlayServices.PatchMainTemplateGradle" value="True" />
<projectSetting name="GooglePlayServices.PatchPropertiesTemplateGradle" value="True" />
<projectSetting name="GooglePlayServices.PromptBeforeAutoResolution" value="False" />
<projectSetting name="GooglePlayServices.UseGradleDaemon" value="False" />
<projectSetting name="GooglePlayServices.UseJetifier" value="True" />
<projectSetting name="GooglePlayServices.VerboseLogging" value="False" />
</projectSettings>